fix depend.apache usage wrt #208033

Package-Manager: portage-2.1.4

5 files changed, 27 insertions, 13 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 5c1e928d849a..d612d69d5361 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.109 2008/01/21 20:28:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.110 2008/01/31 19:55:36 hollow Exp $
+
+  31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> nagios-core-1.4.1.ebuild,
+  nagios-core-1.4.1-r1.ebuild, nagios-core-2.10-r1.ebuild:
+  fix depend.apache usage wrt #208033
 
   21 Jan 2008; Raúl Porcel <armin76@gentoo.org> nagios-core-2.10-r1.ebuild:
   sparc stable wrt #205335
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 9bd252ac563c..34645542f9ab 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.x-series-nsca.patch 767 RMD160 69c3916842953666037dcf258906c15a9ce0047a SHA1 5f376bd65bf74eeb3cc00efde4fadf7f8962d06c SHA256 04ecb77abfe7618d036a2b598ea30df6704a82285b2210055eda4dd6414c94d3
 AUX 99_nagios.conf 350 RMD160 d9818e29cd119b2cc185c75dcd374b3851eaa739 SHA1 fa4b438c1d06f2d00cd2bff4fefc448a59d1cdec SHA256 2e8448d5e38969f0eee4306611e9592e9cec93506ad055cd27ef8e211cfe9f71
 AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a
@@ -9,8 +12,15 @@ DIST nagios-1.4.1.tar.gz 1643386 RMD160 f79f6ec943e820562263d62b5e0fb8ab090f8d69
 DIST nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133 RMD160 62a627f54b878bdad8347138935ec7875bf39857 SHA1 2063a2d629e88f2e6b536d4eafe4e0f815c4fdb1 SHA256 1f6a1d76d589c5a5ae5bb68367a410ea984f6dccf766a6a76229c1014f872084
 DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 SHA1 7a27bcf4be959424b688f52e31887862b863ec23 SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12
 DIST nagios-2.10.tar.gz 1740558 RMD160 87086848911072a5504dd61f11ece8f0cf39db5e SHA1 b519c1b332fcc814346eecb987f689113f4f0ab6 SHA256 d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
-EBUILD nagios-core-1.4.1-r1.ebuild 7233 RMD160 684f1a6b023c8fb3b018ee9033df28072fa5c60d SHA1 cbdf2d8f74e26a8eb164ecdd6377e85d2857fee3 SHA256 7440935d6c3824af8773e3f7fb087da57f09fbc72b0cfe47674546a6f2c28baf
-EBUILD nagios-core-1.4.1.ebuild 7228 RMD160 868c716c9a980d3399a25fc332e099c35e7cc1c7 SHA1 c189a6c0663f1f12eeea4f21bfdeb567489b5a7a SHA256 d93cbe22a20a2472ed8ac3ad532239c7cba3d28910972d83015fe6fc9337f2f2
-EBUILD nagios-core-2.10-r1.ebuild 6367 RMD160 c3f40ea5344fe304db5fad6f5fc7aa845febb8c8 SHA1 e6e2ede18b6b7779b3fdef2e79737ef8e6cc9526 SHA256 8fdbf025819e093f711166fd2c04ddfa52ec9ba26d6d492148a6ebcfc217e55d
-MISC ChangeLog 19524 RMD160 40dd4e74882d14a7db0e087bd332f2c7e278db2e SHA1 32a3c6210bcba74d6ad3c8c52ac4a7bab064eda5 SHA256 e9969a00f93812185b27963b236bd5dd73967e6aa430bdbd63a34808dc3fe325
+EBUILD nagios-core-1.4.1-r1.ebuild 7232 RMD160 959cc561d97e64ef1665471b6d9039e5df0203c4 SHA1 71717c81b199262723829aac615c646b6f4c101b SHA256 5a89679e169881c1b73015f982bc3c0d0d3fec9edfeae1c53671f1f90b140741
+EBUILD nagios-core-1.4.1.ebuild 7227 RMD160 6a92a4e40edca8390e6b725e563aafd1c7672579 SHA1 2ec3c4775cf6bbde6022c8d3f7fc4b8a08717dae SHA256 faac722b77572c538cd222894779cc2c9c3957d7c89bce51eeaa14840d6e9a0a
+EBUILD nagios-core-2.10-r1.ebuild 6365 RMD160 415694b502271d58d1dadbfbcfa3b652f0246fdb SHA1 1ea0142b08e0ad0b75ca746619f01bbf24585ad3 SHA256 3a832bc85c44541ae11151bed3ac5f06e290c43fe9a6afea5120b45402e111c6
+MISC ChangeLog 19697 RMD160 82e5ce44873af7edef8d41d86fca44aae8355afe SHA1 0fd10f5f08764bcf2b313a481e866869f92bb418 SHA256 cc56584b290c730edbde6cf742d17127295af9d2a9181c42ff0e070ef006ed96
 MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeiJ8cACgkQmPFBzbX68WFBJwCggoNFdUR04+M2lZu2596TkQsb
+h8YAn1Ro6xTsmzv0e+0RhFsuXmMknEu5
+=ibNs
+-----END PGP SIGNATURE-----
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 73a499606d26..0f8e22c370cb 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
+# Copyright 1999-2008 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.5 2007/11/25 13:53:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.6 2008/01/31 19:55:36 hollow Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -176,7 +176,7 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		insinto ${APACHE2_MODULES_CONFDIR}
+		insinto ${APACHE_MODULES_CONFDIR}
 		doins ${FILESDIR}/99_nagios.conf
 
 		if use perl; then
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 ad084aae9b1d..1034d74173cd 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-2007 Gentoo Foundation
+# Copyright 1999-2008 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.10 2007/11/25 13:53:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.11 2008/01/31 19:55:36 hollow Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -176,7 +176,7 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		insinto ${APACHE2_MODULES_CONFDIR}
+		insinto ${APACHE_MODULES_CONFDIR}
 		doins ${FILESDIR}/99_nagios.conf
 
 		if use perl; then
diff --git a/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
index f3b9759b7a82..6afa18e72e5a 100644
--- a/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.10-r1.ebuild,v 1.4 2008/01/21 20:28:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild,v 1.5 2008/01/31 19:55:36 hollow Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -137,7 +137,7 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		insinto "${APACHE2_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
 		doins "${FILESDIR}"/99_nagios.conf
 
 		if use perl; then