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

(Portage version: 2.1.2.5)

3 files changed, 13 insertions, 13 deletions

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