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

(Portage version: 2.1.2.5)

10 files changed, 34 insertions, 46 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 0c242d2589d3..1a16f46249f0 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.78 2007/03/10 19:40:18 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.79 2007/04/28 17:34:27 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> bitlbee-0.92.ebuild,
+  bitlbee-0.92-r1.ebuild, bitlbee-0.92-r2.ebuild, bitlbee-0.92-r3.ebuild,
+  bitlbee-0.99.ebuild, bitlbee-1.0.ebuild, bitlbee-1.0.1.ebuild,
+  bitlbee-1.0.2.ebuild, bitlbee-1.0.3.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   10 Mar 2007; Peter Weller <welp@gentoo.org> bitlbee-1.0.3.ebuild:
   Keyworded ~x86-fbsd
diff --git a/net-im/bitlbee/bitlbee-0.92-r1.ebuild b/net-im/bitlbee/bitlbee-0.92-r1.ebuild
index e4d7037e9aa9..cf2051c566df 100644
--- a/net-im/bitlbee/bitlbee-0.92-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-0.92-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/net-im/bitlbee/bitlbee-0.92-r1.ebuild,v 1.3 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92-r1.ebuild,v 1.4 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -95,11 +95,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-0.92-r2.ebuild b/net-im/bitlbee/bitlbee-0.92-r2.ebuild
index 65d5cf185d4a..bf36a0e5e09d 100644
--- a/net-im/bitlbee/bitlbee-0.92-r2.ebuild
+++ b/net-im/bitlbee/bitlbee-0.92-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-im/bitlbee/bitlbee-0.92-r2.ebuild,v 1.3 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92-r2.ebuild,v 1.4 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -119,11 +119,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-0.92-r3.ebuild b/net-im/bitlbee/bitlbee-0.92-r3.ebuild
index 378e4ca06013..459b9788b730 100644
--- a/net-im/bitlbee/bitlbee-0.92-r3.ebuild
+++ b/net-im/bitlbee/bitlbee-0.92-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-im/bitlbee/bitlbee-0.92-r3.ebuild,v 1.3 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92-r3.ebuild,v 1.4 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -131,11 +131,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-0.92.ebuild b/net-im/bitlbee/bitlbee-0.92.ebuild
index 374075d20b1c..f8e08bc85fc3 100644
--- a/net-im/bitlbee/bitlbee-0.92.ebuild
+++ b/net-im/bitlbee/bitlbee-0.92.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-im/bitlbee/bitlbee-0.92.ebuild,v 1.8 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92.ebuild,v 1.9 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -89,11 +89,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-0.99.ebuild b/net-im/bitlbee/bitlbee-0.99.ebuild
index 20cc12b323ac..b5645e356043 100644
--- a/net-im/bitlbee/bitlbee-0.99.ebuild
+++ b/net-im/bitlbee/bitlbee-0.99.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-im/bitlbee/bitlbee-0.99.ebuild,v 1.4 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.99.ebuild,v 1.5 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -106,11 +106,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-1.0.1.ebuild b/net-im/bitlbee/bitlbee-1.0.1.ebuild
index e8a857ce9c15..02fc5b400b87 100644
--- a/net-im/bitlbee/bitlbee-1.0.1.ebuild
+++ b/net-im/bitlbee/bitlbee-1.0.1.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-im/bitlbee/bitlbee-1.0.1.ebuild,v 1.11 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.1.ebuild,v 1.12 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -109,11 +109,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-1.0.2.ebuild b/net-im/bitlbee/bitlbee-1.0.2.ebuild
index d916bd2f4acc..6d495d341d46 100644
--- a/net-im/bitlbee/bitlbee-1.0.2.ebuild
+++ b/net-im/bitlbee/bitlbee-1.0.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-im/bitlbee/bitlbee-1.0.2.ebuild,v 1.3 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.2.ebuild,v 1.4 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -109,11 +109,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-1.0.3.ebuild b/net-im/bitlbee/bitlbee-1.0.3.ebuild
index 8fcaf7432335..77f5e9b0272c 100644
--- a/net-im/bitlbee/bitlbee-1.0.3.ebuild
+++ b/net-im/bitlbee/bitlbee-1.0.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-im/bitlbee/bitlbee-1.0.3.ebuild,v 1.10 2007/03/10 19:40:18 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.3.ebuild,v 1.11 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -124,11 +124,9 @@ src_install() {
 		newins doc/bitlbee.xinetd bitlbee
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed
diff --git a/net-im/bitlbee/bitlbee-1.0.ebuild b/net-im/bitlbee/bitlbee-1.0.ebuild
index c93dee5ae0a3..d090d09368ee 100644
--- a/net-im/bitlbee/bitlbee-1.0.ebuild
+++ b/net-im/bitlbee/bitlbee-1.0.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-im/bitlbee/bitlbee-1.0.ebuild,v 1.4 2007/01/05 17:48:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.ebuild,v 1.5 2007/04/28 17:34:27 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -106,11 +106,9 @@ src_install() {
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+	newinitd ${FILESDIR}/bitlbeed.init bitlbeed || die
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+	newconfd ${FILESDIR}/bitlbeed.confd bitlbeed || die
 
 	dodir /var/run/bitlbeed
 	keepdir /var/run/bitlbeed