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

Package-Manager: portage-2.1.2.5

16 files changed, 39 insertions, 46 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 507015ce8752..4074d413ab09 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.158 2007/04/22 18:43:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.159 2007/04/28 17:21:04 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> bind-9.2.6.ebuild,
+  bind-9.2.6-r3.ebuild, bind-9.2.6-r4.ebuild, bind-9.2.6-r5.ebuild,
+  bind-9.2.7.ebuild, bind-9.2.8.ebuild, bind-9.2.8-r2.ebuild,
+  bind-9.3.2.ebuild, bind-9.3.2-r3.ebuild, bind-9.3.2-r4.ebuild,
+  bind-9.3.2-r5.ebuild, bind-9.3.3.ebuild, bind-9.3.4.ebuild,
+  bind-9.3.4-r2.ebuild, bind-9.4.0-r2.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   22 Apr 2007; Raúl Porcel <armin76@gentoo.org> bind-9.3.4-r2.ebuild:
   ia64 stable
diff --git a/net-dns/bind/bind-9.2.6-r3.ebuild b/net-dns/bind/bind-9.2.6-r3.ebuild
index a3b0715bedf1..dd257a9d0275 100644
--- a/net-dns/bind/bind-9.2.6-r3.ebuild
+++ b/net-dns/bind/bind-9.2.6-r3.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/net-dns/bind/bind-9.2.6-r3.ebuild,v 1.5 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.6-r3.ebuild,v 1.6 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -157,8 +157,7 @@ src_install() {
 		contrib/nanny/nanny.pl
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	# some handy-dandy dynamic dns examples
 	cd ${D}/usr/share/doc/${PF}
diff --git a/net-dns/bind/bind-9.2.6-r4.ebuild b/net-dns/bind/bind-9.2.6-r4.ebuild
index 4ad8b94d2741..84de5fe1e546 100644
--- a/net-dns/bind/bind-9.2.6-r4.ebuild
+++ b/net-dns/bind/bind-9.2.6-r4.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/net-dns/bind/bind-9.2.6-r4.ebuild,v 1.11 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.6-r4.ebuild,v 1.12 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -161,8 +161,7 @@ src_install() {
 		contrib/nanny/nanny.pl
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	# some handy-dandy dynamic dns examples
 	cd ${D}/usr/share/doc/${PF}
diff --git a/net-dns/bind/bind-9.2.6-r5.ebuild b/net-dns/bind/bind-9.2.6-r5.ebuild
index 91f05e386cee..721c63c2cabc 100644
--- a/net-dns/bind/bind-9.2.6-r5.ebuild
+++ b/net-dns/bind/bind-9.2.6-r5.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/net-dns/bind/bind-9.2.6-r5.ebuild,v 1.4 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.6-r5.ebuild,v 1.5 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -166,8 +166,7 @@ src_install() {
 		contrib/nanny/nanny.pl
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	# some handy-dandy dynamic dns examples
 	cd ${D}/usr/share/doc/${PF}
diff --git a/net-dns/bind/bind-9.2.6.ebuild b/net-dns/bind/bind-9.2.6.ebuild
index 1fd849f69a0f..1c2a66ac7b12 100644
--- a/net-dns/bind/bind-9.2.6.ebuild
+++ b/net-dns/bind/bind-9.2.6.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/net-dns/bind/bind-9.2.6.ebuild,v 1.17 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.6.ebuild,v 1.18 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool
 
@@ -157,8 +157,7 @@ src_install() {
 		contrib/nanny/nanny.pl
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	# some handy-dandy dynamic dns examples
 	cd ${D}/usr/share/doc/${PF}
diff --git a/net-dns/bind/bind-9.2.7.ebuild b/net-dns/bind/bind-9.2.7.ebuild
index 03fefb6cd8b6..005417339a51 100644
--- a/net-dns/bind/bind-9.2.7.ebuild
+++ b/net-dns/bind/bind-9.2.7.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/net-dns/bind/bind-9.2.7.ebuild,v 1.7 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.7.ebuild,v 1.8 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -162,8 +162,7 @@ src_install() {
 		contrib/nanny/nanny.pl
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	# some handy-dandy dynamic dns examples
 	cd ${D}/usr/share/doc/${PF}
diff --git a/net-dns/bind/bind-9.2.8-r2.ebuild b/net-dns/bind/bind-9.2.8-r2.ebuild
index af7e4c506956..630d440fcbf4 100644
--- a/net-dns/bind/bind-9.2.8-r2.ebuild
+++ b/net-dns/bind/bind-9.2.8-r2.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/net-dns/bind/bind-9.2.8-r2.ebuild,v 1.1 2007/03/12 18:08:58 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8-r2.ebuild,v 1.2 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -153,8 +153,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.2.8.ebuild b/net-dns/bind/bind-9.2.8.ebuild
index 1f829d0b554f..36370e5eea57 100644
--- a/net-dns/bind/bind-9.2.8.ebuild
+++ b/net-dns/bind/bind-9.2.8.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/net-dns/bind/bind-9.2.8.ebuild,v 1.9 2007/02/14 13:41:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8.ebuild,v 1.10 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -149,8 +149,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.3.2-r3.ebuild b/net-dns/bind/bind-9.3.2-r3.ebuild
index 0836083940e9..a350673b450b 100644
--- a/net-dns/bind/bind-9.3.2-r3.ebuild
+++ b/net-dns/bind/bind-9.3.2-r3.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/net-dns/bind/bind-9.3.2-r3.ebuild,v 1.5 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2-r3.ebuild,v 1.6 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -149,8 +149,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.3.2-r4.ebuild b/net-dns/bind/bind-9.3.2-r4.ebuild
index 8d4171bdd869..ea18568e48d8 100644
--- a/net-dns/bind/bind-9.3.2-r4.ebuild
+++ b/net-dns/bind/bind-9.3.2-r4.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/net-dns/bind/bind-9.3.2-r4.ebuild,v 1.16 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2-r4.ebuild,v 1.17 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -154,8 +154,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.3.2-r5.ebuild b/net-dns/bind/bind-9.3.2-r5.ebuild
index 669201bb9632..37c56dd9a601 100644
--- a/net-dns/bind/bind-9.3.2-r5.ebuild
+++ b/net-dns/bind/bind-9.3.2-r5.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/net-dns/bind/bind-9.3.2-r5.ebuild,v 1.4 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2-r5.ebuild,v 1.5 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -158,8 +158,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.3.2.ebuild b/net-dns/bind/bind-9.3.2.ebuild
index 85afbb693883..806b20afb141 100644
--- a/net-dns/bind/bind-9.3.2.ebuild
+++ b/net-dns/bind/bind-9.3.2.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/net-dns/bind/bind-9.3.2.ebuild,v 1.16 2007/02/07 22:48:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2.ebuild,v 1.17 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool
 
@@ -151,8 +151,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.3.3.ebuild b/net-dns/bind/bind-9.3.3.ebuild
index fb2eb6a480d2..19339bcb217b 100644
--- a/net-dns/bind/bind-9.3.3.ebuild
+++ b/net-dns/bind/bind-9.3.3.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/net-dns/bind/bind-9.3.3.ebuild,v 1.10 2007/02/11 10:45:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.3.ebuild,v 1.11 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -155,8 +155,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.3.4-r2.ebuild b/net-dns/bind/bind-9.3.4-r2.ebuild
index 00c29651182c..31a5903b17e7 100644
--- a/net-dns/bind/bind-9.3.4-r2.ebuild
+++ b/net-dns/bind/bind-9.3.4-r2.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/net-dns/bind/bind-9.3.4-r2.ebuild,v 1.7 2007/04/22 18:43:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r2.ebuild,v 1.8 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -151,8 +151,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.3.4.ebuild b/net-dns/bind/bind-9.3.4.ebuild
index 1a421346a275..31f02c2ddfa0 100644
--- a/net-dns/bind/bind-9.3.4.ebuild
+++ b/net-dns/bind/bind-9.3.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/net-dns/bind/bind-9.3.4.ebuild,v 1.11 2007/02/14 13:41:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4.ebuild,v 1.12 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools
 
@@ -147,8 +147,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
diff --git a/net-dns/bind/bind-9.4.0-r2.ebuild b/net-dns/bind/bind-9.4.0-r2.ebuild
index fb356ece1dcc..4e7c43a4aea9 100644
--- a/net-dns/bind/bind-9.4.0-r2.ebuild
+++ b/net-dns/bind/bind-9.4.0-r2.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/net-dns/bind/bind-9.4.0-r2.ebuild,v 1.1 2007/03/12 18:02:16 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.0-r2.ebuild,v 1.2 2007/04/28 17:21:04 swegener Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -153,8 +153,7 @@ src_install() {
 		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
 	}
 
-	insinto /etc/env.d
-	newins ${FILESDIR}/10bind.env 10bind
+	newenvd ${FILESDIR}/10bind.env 10bind
 
 	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec