From c2424aa4810b455bc99a4ea1fd7be3a6680a416e Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 28 Apr 2007 17:04:51 +0000 Subject: [PATCH] Fix *initd, *confd and *envd calls (#17388, #174266) Package-Manager: portage-2.1.2.5 --- sys-apps/855resolution/855resolution-0.4.ebuild | 8 +++----- sys-apps/855resolution/ChangeLog | 5 ++++- sys-apps/apmd/ChangeLog | 6 +++++- sys-apps/apmd/apmd-3.0.2-r3.ebuild | 8 ++++---- sys-apps/apmd/apmd-3.2.0.ebuild | 8 ++++---- sys-apps/apmd/apmd-3.2.1_p4.ebuild | 10 ++++------ sys-apps/apmd/apmd-3.2.2_p5.ebuild | 10 ++++------ sys-apps/coldplug/ChangeLog | 6 +++++- sys-apps/coldplug/coldplug-20040920-r1.ebuild | 7 +++---- sys-apps/coldplug/coldplug-20040920.ebuild | 7 +++---- 10 files changed, 39 insertions(+), 36 deletions(-) diff --git a/sys-apps/855resolution/855resolution-0.4.ebuild b/sys-apps/855resolution/855resolution-0.4.ebuild index 716f69a568ac..660c9394af50 100644 --- a/sys-apps/855resolution/855resolution-0.4.ebuild +++ b/sys-apps/855resolution/855resolution-0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/855resolution-0.4.ebuild,v 1.2 2007/01/25 04:30:25 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/855resolution-0.4.ebuild,v 1.3 2007/04/28 17:03:55 swegener Exp $ S="${WORKDIR}/${PN}" @@ -25,8 +25,6 @@ src_install() { dodoc README.txt - insinto /etc/conf.d - newins ${FILESDIR}/${PV}/conf 855resolution - exeinto /etc/init.d - newexe ${FILESDIR}/${PV}/init 855resolution + newconfd ${FILESDIR}/${PV}/conf 855resolution + newinitd ${FILESDIR}/${PV}/init 855resolution } diff --git a/sys-apps/855resolution/ChangeLog b/sys-apps/855resolution/ChangeLog index 88cb9897d1ad..b9b8b6073e35 100644 --- a/sys-apps/855resolution/ChangeLog +++ b/sys-apps/855resolution/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/855resolution # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/ChangeLog,v 1.3 2007/01/25 04:30:25 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/ChangeLog,v 1.4 2007/04/28 17:03:55 swegener Exp $ + + 28 Apr 2007; Sven Wegener 855resolution-0.4.ebuild: + Fix *initd, *confd and *envd calls (#17388, #174266) 25 Jan 2007; Steve Dibb 855resolution-0.4.ebuild: Add ~amd64 and add strip to RESTRICT, bug 153871 diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog index 51536b9212a6..1c5d6f5e7046 100644 --- a/sys-apps/apmd/ChangeLog +++ b/sys-apps/apmd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/apmd # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.36 2007/02/22 01:02:09 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.37 2007/04/28 17:02:53 swegener Exp $ + + 28 Apr 2007; Sven Wegener apmd-3.0.2-r3.ebuild, + apmd-3.2.0.ebuild, apmd-3.2.1_p4.ebuild, apmd-3.2.2_p5.ebuild: + Fix *initd, *confd and *envd calls (#17388, #174266) 22 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/sys-apps/apmd/apmd-3.0.2-r3.ebuild b/sys-apps/apmd/apmd-3.0.2-r3.ebuild index d78385ed8c90..f9784d313f67 100644 --- a/sys-apps/apmd/apmd-3.0.2-r3.ebuild +++ b/sys-apps/apmd/apmd-3.0.2-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.20 2006/02/12 08:50:00 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.21 2007/04/28 17:02:53 swegener Exp $ inherit eutils @@ -65,8 +65,8 @@ src_install() { exeinto /etc/apm ; doexe debian/apmd_proxy dodoc ANNOUNCE BUGS.apmsleep COPYING* README* ChangeLog LSM - insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd - exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd + newconfd ${FILESDIR}/apmd.confd apmd + newinitd ${FILESDIR}/apmd.rc6 apmd if use X ; then make DESTDIR=${D} xinstall || die "xinstall failed" diff --git a/sys-apps/apmd/apmd-3.2.0.ebuild b/sys-apps/apmd/apmd-3.2.0.ebuild index 6cc64e2c1606..752cf08e6111 100644 --- a/sys-apps/apmd/apmd-3.2.0.ebuild +++ b/sys-apps/apmd/apmd-3.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.13 2006/02/12 08:50:00 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.14 2007/04/28 17:02:53 swegener Exp $ inherit eutils @@ -63,8 +63,8 @@ src_install() { exeinto /etc/apm ; doexe apmd_proxy dodoc ANNOUNCE BUGS.apmsleep COPYING* README* ChangeLog LSM - insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd - exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd + newconfd ${FILESDIR}/apmd.confd apmd + newinitd ${FILESDIR}/apmd.rc6 apmd if use X ; then make DESTDIR=${D} xinstall || die "xinstall failed" diff --git a/sys-apps/apmd/apmd-3.2.1_p4.ebuild b/sys-apps/apmd/apmd-3.2.1_p4.ebuild index 8189d8f988ee..103060210b48 100644 --- a/sys-apps/apmd/apmd-3.2.1_p4.ebuild +++ b/sys-apps/apmd/apmd-3.2.1_p4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.18 2006/10/16 22:42:44 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.19 2007/04/28 17:02:53 swegener Exp $ inherit eutils multilib toolchain-funcs @@ -67,10 +67,8 @@ src_install() { # note: apmd_proxy.conf is currently disabled and not used, thus # not installed - liquidx (01 Mar 2004) - insinto /etc/conf.d - newins "${FILESDIR}"/apmd.confd apmd || die "newins failed" - exeinto /etc/init.d - newexe "${FILESDIR}"/apmd.rc6 apmd || die "newexe failed" + newconfd "${FILESDIR}"/apmd.confd apmd || die "newconfd failed" + newinitd "${FILESDIR}"/apmd.rc6 apmd || die "newinitd failed" use nls || rm -rf "${D}"/usr/share/man/fr } diff --git a/sys-apps/apmd/apmd-3.2.2_p5.ebuild b/sys-apps/apmd/apmd-3.2.2_p5.ebuild index f95a892af874..5c7ab75d4f33 100644 --- a/sys-apps/apmd/apmd-3.2.2_p5.ebuild +++ b/sys-apps/apmd/apmd-3.2.2_p5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.2_p5.ebuild,v 1.9 2006/10/16 22:42:44 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.2_p5.ebuild,v 1.10 2007/04/28 17:02:53 swegener Exp $ inherit eutils multilib toolchain-funcs @@ -73,10 +73,8 @@ src_install() { # note: apmd_proxy.conf is currently disabled and not used, thus # not installed - liquidx (01 Mar 2004) - insinto /etc/conf.d - newins "${FILESDIR}"/apmd.confd apmd || die "newins failed" - exeinto /etc/init.d - newexe "${FILESDIR}"/apmd.rc6 apmd || die "newexe failed" + newconfd "${FILESDIR}"/apmd.confd apmd || die "newconfd failed" + newinitd "${FILESDIR}"/apmd.rc6 apmd || die "newinitd failed" use nls || rm -rf "${D}"/usr/share/man/fr } diff --git a/sys-apps/coldplug/ChangeLog b/sys-apps/coldplug/ChangeLog index 3abe2d7ffcab..a0169e5fe19f 100644 --- a/sys-apps/coldplug/ChangeLog +++ b/sys-apps/coldplug/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/coldplug # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/ChangeLog,v 1.16 2007/02/22 01:05:14 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/ChangeLog,v 1.17 2007/04/28 17:04:51 swegener Exp $ + + 28 Apr 2007; Sven Wegener coldplug-20040920.ebuild, + coldplug-20040920-r1.ebuild: + Fix *initd, *confd and *envd calls (#17388, #174266) 22 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/sys-apps/coldplug/coldplug-20040920-r1.ebuild b/sys-apps/coldplug/coldplug-20040920-r1.ebuild index 3d1fd9890033..9d812d7db989 100644 --- a/sys-apps/coldplug/coldplug-20040920-r1.ebuild +++ b/sys-apps/coldplug/coldplug-20040920-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/coldplug-20040920-r1.ebuild,v 1.1 2006/05/19 23:43:38 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/coldplug-20040920-r1.ebuild,v 1.2 2007/04/28 17:04:51 swegener Exp $ inherit eutils @@ -22,6 +22,5 @@ DEPEND=">=sys-apps/hotplug-20040920" RDEPEND="!>=sys-fs/udev-089" src_install() { - exeinto /etc/init.d - newexe ${FILESDIR}/coldplug.rc coldplug + newinitd ${FILESDIR}/coldplug.rc coldplug } diff --git a/sys-apps/coldplug/coldplug-20040920.ebuild b/sys-apps/coldplug/coldplug-20040920.ebuild index ba3d902a3ef1..3169f50ac0be 100644 --- a/sys-apps/coldplug/coldplug-20040920.ebuild +++ b/sys-apps/coldplug/coldplug-20040920.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/coldplug-20040920.ebuild,v 1.11 2006/05/12 10:02:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/coldplug-20040920.ebuild,v 1.12 2007/04/28 17:04:51 swegener Exp $ inherit eutils @@ -20,6 +20,5 @@ IUSE="" DEPEND=">=sys-apps/hotplug-20040920" src_install() { - exeinto /etc/init.d - newexe ${FILESDIR}/coldplug.rc coldplug + newinitd ${FILESDIR}/coldplug.rc coldplug } -- 2.26.2