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

(Portage version: 2.1.2.5)

10 files changed, 49 insertions, 52 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 30007efa06e8..342ccd5c812e 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.36 2007/04/25 05:38:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.37 2007/04/28 17:27:04 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> nut-2.0.0.ebuild,
+  nut-2.0.0-r1.ebuild, nut-2.0.1_pre4.ebuild, nut-2.0.3.ebuild,
+  nut-2.0.3-r1.ebuild, nut-2.0.4.ebuild, nut-2.0.4-r1.ebuild,
+  nut-2.0.5.ebuild, nut-2.0.5-r1.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   25 Apr 2007; Daniel Black <dragonheart@gentoo.org> files/upsd.rc6:
   added reload to upsd init script. bug #175928
diff --git a/sys-power/nut/nut-2.0.0-r1.ebuild b/sys-power/nut/nut-2.0.0-r1.ebuild
index 711c8fd3b718..f797745ceb7b 100644
--- a/sys-power/nut/nut-2.0.0-r1.ebuild
+++ b/sys-power/nut/nut-2.0.0-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-power/nut/nut-2.0.0-r1.ebuild,v 1.2 2006/10/03 22:13:21 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.0-r1.ebuild,v 1.3 2007/04/28 17:27:04 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -105,10 +105,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	keepdir /var/lib/nut
 
diff --git a/sys-power/nut/nut-2.0.0.ebuild b/sys-power/nut/nut-2.0.0.ebuild
index a89e83f73322..f3d04fa6b579 100644
--- a/sys-power/nut/nut-2.0.0.ebuild
+++ b/sys-power/nut/nut-2.0.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-power/nut/nut-2.0.0.ebuild,v 1.1 2006/05/15 23:43:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.0.ebuild,v 1.2 2007/04/28 17:27:05 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -105,10 +105,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	keepdir /var/lib/nut
 
diff --git a/sys-power/nut/nut-2.0.1_pre4.ebuild b/sys-power/nut/nut-2.0.1_pre4.ebuild
index c4afad918e24..07856017218f 100644
--- a/sys-power/nut/nut-2.0.1_pre4.ebuild
+++ b/sys-power/nut/nut-2.0.1_pre4.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-power/nut/nut-2.0.1_pre4.ebuild,v 1.1 2006/05/15 23:43:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.1_pre4.ebuild,v 1.2 2007/04/28 17:27:04 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -111,10 +111,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	keepdir /var/lib/nut
 
diff --git a/sys-power/nut/nut-2.0.3-r1.ebuild b/sys-power/nut/nut-2.0.3-r1.ebuild
index 57a39e085849..13f4d70f2f43 100644
--- a/sys-power/nut/nut-2.0.3-r1.ebuild
+++ b/sys-power/nut/nut-2.0.3-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-power/nut/nut-2.0.3-r1.ebuild,v 1.10 2006/07/22 04:48:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.3-r1.ebuild,v 1.11 2007/04/28 17:27:05 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -133,10 +133,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	# This sets up permissions for nut to access a UPS
 	insinto /etc/udev/rules.d/
diff --git a/sys-power/nut/nut-2.0.3.ebuild b/sys-power/nut/nut-2.0.3.ebuild
index c9fd44b803ee..9af30628c738 100644
--- a/sys-power/nut/nut-2.0.3.ebuild
+++ b/sys-power/nut/nut-2.0.3.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-power/nut/nut-2.0.3.ebuild,v 1.1 2006/05/18 06:05:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.3.ebuild,v 1.2 2007/04/28 17:27:04 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -122,10 +122,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	# This sets up permissions for nut to access a UPS
 	insinto /etc/udev/rules.d/
diff --git a/sys-power/nut/nut-2.0.4-r1.ebuild b/sys-power/nut/nut-2.0.4-r1.ebuild
index 64d9aaae63fa..8d778f2fd157 100644
--- a/sys-power/nut/nut-2.0.4-r1.ebuild
+++ b/sys-power/nut/nut-2.0.4-r1.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-power/nut/nut-2.0.4-r1.ebuild,v 1.12 2007/03/18 20:24:58 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.4-r1.ebuild,v 1.13 2007/04/28 17:27:04 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -135,10 +135,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	# This sets up permissions for nut to access a UPS
 	insinto /etc/udev/rules.d/
diff --git a/sys-power/nut/nut-2.0.4.ebuild b/sys-power/nut/nut-2.0.4.ebuild
index b6d3a4fa36bf..1daa1bdc563f 100644
--- a/sys-power/nut/nut-2.0.4.ebuild
+++ b/sys-power/nut/nut-2.0.4.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-power/nut/nut-2.0.4.ebuild,v 1.1 2006/07/30 04:09:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.4.ebuild,v 1.2 2007/04/28 17:27:04 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -133,10 +133,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	# This sets up permissions for nut to access a UPS
 	insinto /etc/udev/rules.d/
diff --git a/sys-power/nut/nut-2.0.5-r1.ebuild b/sys-power/nut/nut-2.0.5-r1.ebuild
index 9abbe454a554..19f0f95ddbaf 100644
--- a/sys-power/nut/nut-2.0.5-r1.ebuild
+++ b/sys-power/nut/nut-2.0.5-r1.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-power/nut/nut-2.0.5-r1.ebuild,v 1.6 2007/04/22 13:48:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.5-r1.ebuild,v 1.7 2007/04/28 17:27:04 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -138,10 +138,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	# This sets up permissions for nut to access a UPS
 	insinto /etc/udev/rules.d/
diff --git a/sys-power/nut/nut-2.0.5.ebuild b/sys-power/nut/nut-2.0.5.ebuild
index 43a5e4b3459f..f120fbdf4232 100644
--- a/sys-power/nut/nut-2.0.5.ebuild
+++ b/sys-power/nut/nut-2.0.5.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-power/nut/nut-2.0.5.ebuild,v 1.2 2007/02/25 11:09:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.5.ebuild,v 1.3 2007/04/28 17:27:04 tove Exp $
 
 inherit eutils fixheadtails
 
@@ -137,10 +137,9 @@ src_install() {
 	dodoc docs/cables/*
 
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
+	newinitd "${FILESDIR}/upsd.rc6" upsd
+	newinitd "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newinitd "${FILESDIR}/upsmon.rc6" upsmon
 
 	# This sets up permissions for nut to access a UPS
 	insinto /etc/udev/rules.d/