Fix *initd, *confd and *envd calls (#17388, #174266)

(Portage version: 2.1.2.5)

5 files changed, 21 insertions, 21 deletions

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 <swegener@gentoo.org> 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 <jokey@gentoo.org> 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
 }