Use do{conf,init}d, bug #174266.

Package-Manager: portage-2.1.2.2

7 files changed, 26 insertions, 38 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index cbd1d2db9a7e..2237565ce98d 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.95 2007/03/12 00:28:47 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.96 2007/04/22 10:19:51 pva Exp $
+
+  22 Apr 2007; <pva@gentoo.org> nagios-core-1.4.1.ebuild,
+  nagios-core-1.4.1-r1.ebuild, nagios-core-2.3.1-r1.ebuild,
+  nagios-core-2.4-r1.ebuild, nagios-core-2.5-r1.ebuild,
+  nagios-core-2.8.ebuild:
+  Use do{conf,init}d, bug #174266.
 
 *nagios-core-2.8 (12 Mar 2007)
 
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
index 0d20f59fb2e1..b79130c63650 100644
--- a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.4.1-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-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -165,11 +165,8 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib
 	doins -r contrib/database contrib/eventhandlers
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
+	doinitd ${FILESDIR}/nagios
+	newconfd ${FILESDIR}/conf.d nagios
 
 	chmod 644 ${S}/contrib/*.cgi
 	into /usr/nagios
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
index ae63c907d7ac..fbb624838397 100644
--- a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.4.1.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-core/nagios-core-1.4.1.ebuild,v 1.6 2006/11/23 19:50:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.7 2007/04/22 10:19:51 pva Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -165,11 +165,8 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib
 	doins -r contrib/database contrib/eventhandlers
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
+	doinitd ${FILESDIR}/nagios
+	newconfd ${FILESDIR}/conf.d nagios
 
 	chmod 644 ${S}/contrib/*.cgi
 	into /usr/nagios
diff --git a/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild
index 14e05979f531..833456dbfb40 100644
--- a/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.3.1-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-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -131,11 +131,8 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib
 	doins -r contrib/eventhandlers
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
+	doinitd ${FILESDIR}/nagios
+	newconfd ${FILESDIR}/conf.d nagios
 
 	chmod 644 ${S}/contrib/*.cgi
 	into /usr/nagios
diff --git a/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild
index 864d3d90609f..88187c7af9e2 100644
--- a/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.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/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -131,11 +131,8 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib
 	doins -r contrib/eventhandlers
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
+	doinitd ${FILESDIR}/nagios
+	newconfd ${FILESDIR}/conf.d nagios
 
 	chmod 644 ${S}/contrib/*.cgi
 	into /usr/nagios
diff --git a/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild
index c661902ca565..1024097f854f 100644
--- a/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.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/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -131,11 +131,8 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib
 	doins -r contrib/eventhandlers
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
+	doinitd ${FILESDIR}/nagios
+	newconfd ${FILESDIR}/conf.d nagios
 
 	chmod 644 ${S}/contrib/*.cgi
 	into /usr/nagios
diff --git a/net-analyzer/nagios-core/nagios-core-2.8.ebuild b/net-analyzer/nagios-core/nagios-core-2.8.ebuild
index 9ec087a8b9cf..1d7f69d35cdd 100644
--- a/net-analyzer/nagios-core/nagios-core-2.8.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-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-analyzer/nagios-core/nagios-core-2.8.ebuild,v 1.1 2007/03/12 00:28:47 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.8.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -131,11 +131,8 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib
 	doins -r contrib/eventhandlers
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d nagios
+	doinitd ${FILESDIR}/nagios
+	newconfd ${FILESDIR}/conf.d nagios
 
 	chmod 644 ${S}/contrib/*.cgi
 	into /usr/nagios