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

Package-Manager: portage-2.1.2.5

24 files changed, 89 insertions, 83 deletions

diff --git a/net-analyzer/mwcollect/ChangeLog b/net-analyzer/mwcollect/ChangeLog
index 20cf34cade8b..f4ac82243872 100644
--- a/net-analyzer/mwcollect/ChangeLog
+++ b/net-analyzer/mwcollect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/mwcollect
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.13 2007/04/28 12:20:46 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.14 2007/04/28 17:40:20 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> mwcollect-2.1.1.ebuild,
+  mwcollect-2.1.2.ebuild, mwcollect-3.0.0.ebuild, mwcollect-3.0.1.ebuild,
+  mwcollect-3.0.2.ebuild, mwcollect-3.0.3.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> mwcollect-3.0.4.ebuild:
   Use newconfd (#174266)
diff --git a/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild b/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild
index 1383f0d94f28..c925aa5ed68c 100644
--- a/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild,v 1.1 2005/07/09 09:09:13 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild,v 1.2 2007/04/28 17:40:20 swegener Exp $
 
 DESCRIPTION="mwcollect collects worms and other autonomous spreading malware"
 HOMEPAGE="http://www.mwcollect.org/"
@@ -45,6 +45,5 @@ src_install() {
 	dodoc README*
 
 	newinitd ${FILESDIR}/initd mwcollectd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/confd mwcollectd
+	newconfd ${FILESDIR}/confd mwcollectd
 }
diff --git a/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild b/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild
index 6ffa02cf3dfe..fefbece781b9 100644
--- a/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild,v 1.1 2005/09/23 03:35:07 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild,v 1.2 2007/04/28 17:40:20 swegener Exp $
 
 DESCRIPTION="mwcollect collects worms and other autonomous spreading malware"
 HOMEPAGE="http://www.mwcollect.org/"
@@ -45,6 +45,5 @@ src_install() {
 	dodoc README*
 
 	newinitd ${FILESDIR}/initd mwcollectd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/confd mwcollectd
+	newconfd ${FILESDIR}/confd mwcollectd
 }
diff --git a/net-analyzer/mwcollect/mwcollect-3.0.0.ebuild b/net-analyzer/mwcollect/mwcollect-3.0.0.ebuild
index 41bc69b39fe5..81dfde2559be 100644
--- a/net-analyzer/mwcollect/mwcollect-3.0.0.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-3.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.0.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.0.ebuild,v 1.2 2007/04/28 17:40:20 swegener Exp $
 
 inherit eutils
 
@@ -59,6 +59,5 @@ src_install() {
 	doman doc/mwcollectd.1
 
 	newinitd ${FILESDIR}/initd mwcollectd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/confd mwcollectd
+	newconfd ${FILESDIR}/confd mwcollectd
 }
diff --git a/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild b/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
index 271939e5f5ab..3b7d2038d629 100644
--- a/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild,v 1.2 2005/12/12 10:54:27 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.1.ebuild,v 1.3 2007/04/28 17:40:20 swegener Exp $
 
 inherit eutils
 
@@ -70,6 +70,5 @@ src_install() {
 	doman doc/mwcollectd.1
 
 	newinitd ${FILESDIR}/initd mwcollectd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/confd mwcollectd
+	newconfd ${FILESDIR}/confd mwcollectd
 }
diff --git a/net-analyzer/mwcollect/mwcollect-3.0.2.ebuild b/net-analyzer/mwcollect/mwcollect-3.0.2.ebuild
index 46747c4ff187..6f9beba06d3a 100644
--- a/net-analyzer/mwcollect/mwcollect-3.0.2.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.2.ebuild,v 1.1 2005/12/20 16:44:06 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.2.ebuild,v 1.2 2007/04/28 17:40:20 swegener Exp $
 
 inherit eutils
 
@@ -58,6 +58,5 @@ src_install() {
 	doman doc/mwcollectd.1
 
 	newinitd ${FILESDIR}/initd mwcollectd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/confd mwcollectd
+	newconfd ${FILESDIR}/confd mwcollectd
 }
diff --git a/net-analyzer/mwcollect/mwcollect-3.0.3.ebuild b/net-analyzer/mwcollect/mwcollect-3.0.3.ebuild
index 3d2c1adc5e6d..563727688321 100644
--- a/net-analyzer/mwcollect/mwcollect-3.0.3.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-3.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/net-analyzer/mwcollect/mwcollect-3.0.3.ebuild,v 1.1 2006/02/02 20:05:53 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.3.ebuild,v 1.2 2007/04/28 17:40:20 swegener Exp $
 
 inherit eutils
 
@@ -53,6 +53,5 @@ src_install() {
 	doman doc/mwcollectd.1
 
 	newinitd ${FILESDIR}/initd mwcollectd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/confd mwcollectd
+	newconfd ${FILESDIR}/confd mwcollectd
 }
diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index 0cbb3529297b..52183ab7fc41 100644
--- a/net-analyzer/nagios-nrpe/ChangeLog
+++ b/net-analyzer/nagios-nrpe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-nrpe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.39 2007/04/28 12:07:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.40 2007/04/28 17:40:40 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> nagios-nrpe-1.8-r1.ebuild,
+  nagios-nrpe-2.3.ebuild, nagios-nrpe-2.5.2.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> nagios-nrpe-2.5.1.ebuild,
   nagios-nrpe-2.5.2-r1.ebuild, nagios-nrpe-2.7.1-r1.ebuild:
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild
index d5d266ece03e..3777ac4cdc9d 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild,v 1.10 2005/12/19 08:36:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild,v 1.11 2007/04/28 17:40:40 swegener Exp $
 inherit eutils
 
 DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
@@ -45,8 +45,7 @@ src_install() {
 	exeinto /usr/nagios/libexec
 	doexe src/check_nrpe
 	fowners nagios:nagios /usr/nagios/libexec/check_nrpe
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nrpe-1.8 nrpe
+	newinitd ${FILESDIR}/nrpe-1.8 nrpe
 
 	fperms 0750 /usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
 }
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild
index 7ab8c69dc4ac..9933d16b71f3 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.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/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild,v 1.4 2006/05/07 20:15:57 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild,v 1.5 2007/04/28 17:40:40 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -67,8 +67,7 @@ src_install() {
 	exeinto /usr/nagios/libexec
 	doexe src/check_nrpe contrib/nrpe_check_control
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nrpe-${PV} nrpe
+	newinitd ${FILESDIR}/nrpe-${PV} nrpe
 }
 pkg_postinst() {
 	einfo
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.2.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.2.ebuild
index 8739b7f3ccf8..e550fe91fd98 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.2.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.2.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/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.2.ebuild,v 1.1 2006/07/04 20:01:23 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.2.ebuild,v 1.2 2007/04/28 17:40:40 swegener Exp $
 
 inherit eutils toolchain-funcs
 
@@ -67,8 +67,7 @@ src_install() {
 	exeinto /usr/nagios/libexec
 	doexe src/check_nrpe contrib/nrpe_check_control
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nrpe-${PV} nrpe
+	newinitd ${FILESDIR}/nrpe-${PV} nrpe
 }
 pkg_postinst() {
 	einfo
diff --git a/net-analyzer/nagios-nsca/ChangeLog b/net-analyzer/nagios-nsca/ChangeLog
index 979659ac9f55..2aab0ab1f408 100644
--- a/net-analyzer/nagios-nsca/ChangeLog
+++ b/net-analyzer/nagios-nsca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-nsca
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.24 2007/04/28 12:34:01 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.25 2007/04/28 17:40:57 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> nagios-nsca-2.4.ebuild,
+  nagios-nsca-2.5.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> nagios-nsca-2.6.ebuild,
   nagios-nsca-2.7.1.ebuild:
diff --git a/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild b/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild
index fb993d31d67c..22f80cf2a437 100644
--- a/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild
+++ b/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild,v 1.8 2005/12/17 21:01:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild,v 1.9 2007/04/28 17:40:57 swegener Exp $
 
 DESCRIPTION="Nagios NSCA  - Nagios Service Check Acceptor"
 HOMEPAGE="http://www.nagios.org/"
@@ -39,8 +39,7 @@ src_install() {
 	exeinto /usr/nagios/libexec
 	doexe src/send_nsca
 	fowners nagios:nagios /usr/nagios/libexec/send_nsca
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nsca-2.3 nsca
+	newinitd ${FILESDIR}/nsca-2.3 nsca
 }
 pkg_postinst() {
 	einfo
diff --git a/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild b/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild
index 133086a6d2b1..c7b59fa89139 100644
--- a/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild
+++ b/net-analyzer/nagios-nsca/nagios-nsca-2.5.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/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild,v 1.4 2006/05/07 20:15:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.5.ebuild,v 1.5 2007/04/28 17:40:57 swegener Exp $
 
 DESCRIPTION="Nagios NSCA  - Nagios Service Check Acceptor"
 HOMEPAGE="http://www.nagios.org/"
@@ -39,8 +39,7 @@ src_install() {
 	exeinto /usr/nagios/libexec
 	doexe src/send_nsca
 	fowners nagios:nagios /usr/nagios/libexec/send_nsca
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/nsca-2.3 nsca
+	newinitd ${FILESDIR}/nsca-2.3 nsca
 }
 pkg_postinst() {
 	einfo
diff --git a/net-analyzer/neti/ChangeLog b/net-analyzer/neti/ChangeLog
index e061066fa880..89697c252c41 100644
--- a/net-analyzer/neti/ChangeLog
+++ b/net-analyzer/neti/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/neti
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.15 2007/04/28 12:23:21 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.16 2007/04/28 17:41:13 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> neti-1.01-r2.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> neti-2.0.ebuild:
   Use newinitd
diff --git a/net-analyzer/neti/neti-1.01-r2.ebuild b/net-analyzer/neti/neti-1.01-r2.ebuild
index 4de27e11e82f..dd31f86d3947 100644
--- a/net-analyzer/neti/neti-1.01-r2.ebuild
+++ b/net-analyzer/neti/neti-1.01-r2.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/net-analyzer/neti/neti-1.01-r2.ebuild,v 1.2 2006/07/25 08:56:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/neti-1.01-r2.ebuild,v 1.3 2007/04/28 17:41:13 swegener Exp $
 
 DESCRIPTION="NETI@Home research project from GATech"
 HOMEPAGE="http://www.neti.gatech.edu"
@@ -53,7 +53,6 @@ src_install() {
 	echo java -cp /usr/share/${PN} NETIMap > "${D}"/usr/bin/NETIMap
 	fperms ugo+x /usr/bin/NETIMap
 	dodoc COPYING
-	exeinto /etc/init.d
-	newexe "${FILESDIR}"/neti-init neti
+	newinitd "${FILESDIR}"/neti-init neti
 	sed -i -e s/ethereal/shark/g "${D}"/etc/init.d/neti "${D}"/usr/sbin/NETIStart
 }
diff --git a/net-analyzer/portmon/ChangeLog b/net-analyzer/portmon/ChangeLog
index c5fecad6252e..f39c880a1cb8 100644
--- a/net-analyzer/portmon/ChangeLog
+++ b/net-analyzer/portmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/portmon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/ChangeLog,v 1.11 2007/04/28 12:00:48 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/ChangeLog,v 1.12 2007/04/28 17:41:29 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> portmon-1.9.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> portmon-2.0.ebuild:
   Use newinitd
diff --git a/net-analyzer/portmon/portmon-1.9.ebuild b/net-analyzer/portmon/portmon-1.9.ebuild
index e7b379f96e3d..483862f73391 100644
--- a/net-analyzer/portmon/portmon-1.9.ebuild
+++ b/net-analyzer/portmon/portmon-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/portmon-1.9.ebuild,v 1.8 2004/08/07 23:54:04 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/portmon-1.9.ebuild,v 1.9 2007/04/28 17:41:29 swegener Exp $
 
 DESCRIPTION="Portmon is a network service monitoring daemon."
 SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz"
@@ -27,6 +27,5 @@ src_install() {
 	doins extras/portmon.hosts.sample
 	dodoc AUTHORS BUGS README
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/portmon.init portmon
+	newinitd ${FILESDIR}/portmon.init portmon
 }
diff --git a/net-analyzer/zabbix-agent/ChangeLog b/net-analyzer/zabbix-agent/ChangeLog
index 8ce5515d449a..faa8b393a5a0 100644
--- a/net-analyzer/zabbix-agent/ChangeLog
+++ b/net-analyzer/zabbix-agent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix-agent
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/ChangeLog,v 1.10 2007/04/16 16:44:11 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/ChangeLog,v 1.11 2007/04/28 17:41:46 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> zabbix-agent-1.0.ebuild,
+  zabbix-agent-1.1_alpha7.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
 *zabbix-agent-1.1.7 (16 Apr 2007)
 
diff --git a/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild b/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild
index 5d490b255f72..95bc9a9fe43e 100644
--- a/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild
+++ b/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild,v 1.2 2005/12/31 13:43:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild,v 1.3 2007/04/28 17:41:46 swegener Exp $
 
 inherit eutils
 
@@ -44,10 +44,8 @@ src_install() {
 	keepdir /etc/zabbix /var/log/zabbix /var/run/zabbix
 	insinto /etc/zabbix
 	doins ${FILESDIR}/${PV}/zabbix_agent.conf ${FILESDIR}/${PV}/zabbix_agentd.conf
-	insinto /etc/conf.d
-	doins ${FILESDIR}/${PV}/conf.d/zabbix-agentd
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/${PV}/init.d/zabbix-agentd
+	doconfd ${FILESDIR}/${PV}/conf.d/zabbix-agentd
+	doinitd ${FILESDIR}/${PV}/init.d/zabbix-agentd
 	dosbin bin/zabbix_agent bin/zabbix_agentd bin/zabbix_sender
 	fowners zabbix:zabbix /etc/zabbix /var/log/zabbix /var/run/zabbix /etc/zabbix/zabbix_agent.conf /etc/zabbix/zabbix_agentd.conf
 	fperms 0640 /etc/zabbix/zabbix_agent.conf /etc/zabbix/zabbix_agentd.conf
diff --git a/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild b/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild
index e6c880c33508..9e9e19fee4c9 100644
--- a/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild
+++ b/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild,v 1.3 2005/08/23 17:23:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild,v 1.4 2007/04/28 17:41:46 swegener Exp $
 
 inherit eutils
 
@@ -45,10 +45,8 @@ src_install() {
 	keepdir /etc/zabbix /var/log/zabbix /var/run/zabbix
 	insinto /etc/zabbix
 	doins ${FILESDIR}/${PV}/zabbix_agent.conf ${FILESDIR}/${PV}/zabbix_agentd.conf
-	insinto /etc/conf.d
-	doins ${FILESDIR}/${PV}/conf.d/zabbix-agentd
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/${PV}/init.d/zabbix-agentd
+	doconfd ${FILESDIR}/${PV}/conf.d/zabbix-agentd
+	doinitd ${FILESDIR}/${PV}/init.d/zabbix-agentd
 	dosbin bin/zabbix_agent bin/zabbix_agentd bin/zabbix_sender
 	fowners zabbix:zabbix /etc/zabbix /var/log/zabbix /var/run/zabbix /etc/zabbix/zabbix_agent.conf /etc/zabbix/zabbix_agentd.conf
 	fperms 0640 /etc/zabbix/zabbix_agent.conf /etc/zabbix/zabbix_agentd.conf
diff --git a/net-analyzer/zabbix-server/ChangeLog b/net-analyzer/zabbix-server/ChangeLog
index dd7d8ba6d914..4cf5d1d73474 100644
--- a/net-analyzer/zabbix-server/ChangeLog
+++ b/net-analyzer/zabbix-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.14 2007/04/16 16:27:09 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.15 2007/04/28 17:42:06 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> zabbix-server-1.0.ebuild,
+  zabbix-server-1.1_alpha7.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
 *zabbix-server-1.1.7 (16 Apr 2007)
 
diff --git a/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild
index 10e50ce4556c..5ba34ea30380 100644
--- a/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild
+++ b/net-analyzer/zabbix-server/zabbix-server-1.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/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild,v 1.3 2006/11/23 19:55:20 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild,v 1.4 2007/04/28 17:42:06 swegener Exp $
 
 inherit eutils
 
@@ -68,10 +68,8 @@ src_install() {
 	keepdir /etc/zabbix /var/log/zabbix /var/run/zabbix
 	insinto /etc/zabbix
 	doins ${FILESDIR}/${PV}/zabbix_suckerd.conf ${FILESDIR}/${PV}/zabbix_trapper.conf ${FILESDIR}/${PV}/zabbix_trapperd.conf
-	insinto /etc/conf.d
-	doins ${FILESDIR}/${PV}/conf.d/zabbix-suckerd ${FILESDIR}/${PV}/conf.d/zabbix-trapperd
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/${PV}/init.d/zabbix-suckerd ${FILESDIR}/${PV}/init.d/zabbix-trapperd
+	doconfd ${FILESDIR}/${PV}/conf.d/zabbix-suckerd ${FILESDIR}/${PV}/conf.d/zabbix-trapperd
+	doinitd ${FILESDIR}/${PV}/init.d/zabbix-suckerd ${FILESDIR}/${PV}/init.d/zabbix-trapperd
 	fowners zabbix:zabbix /etc/zabbix /var/log/zabbix /var/run/zabbix /usr/share/zabbix/sripts /usr/share/zabbix/dbms /etc/zabbix/zabbix_suckerd.conf /etc/zabbix/zabbix_trapper.conf /etc/zabbix/zabbix_trapperd.conf
 	fperms 0640 /etc/zabbix/zabbix_suckerd.conf /etc/zabbix/zabbix_trapper.conf /etc/zabbix/zabbix_trapperd.conf
 	dosbin bin/zabbix_suckerd bin/zabbix_trapper bin/zabbix_trapperd
diff --git a/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild
index caff45155870..d4175be7b672 100644
--- a/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild
+++ b/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.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/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild,v 1.4 2006/11/23 19:55:20 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild,v 1.5 2007/04/28 17:42:06 swegener Exp $
 
 inherit eutils
 
@@ -71,11 +71,9 @@ src_install() {
 	insinto /etc/zabbix
 	doins ${FILESDIR}/${PV}/zabbix_server.conf ${FILESDIR}/${PV}/zabbix_trapper.conf
 
-	insinto /etc/conf.d
-	doins ${FILESDIR}/${PV}/conf.d/zabbix-server
+	doconfd ${FILESDIR}/${PV}/conf.d/zabbix-server
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/${PV}/init.d/zabbix-server
+	doinitd ${FILESDIR}/${PV}/init.d/zabbix-server
 
 	fowners zabbix:zabbix /etc/zabbix /var/log/zabbix /var/run/zabbix /usr/share/zabbix/sripts /usr/share/zabbix/dbms /etc/zabbix/zabbix_server.conf /etc/zabbix/zabbix_trapper.conf
 	fperms 0640 /etc/zabbix/zabbix_server.conf /etc/zabbix/zabbix_trapper.conf