Apache DEPEND problem fixed.

Package-Manager: portage-2.0.51.22-r3

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index c93c604fd4d778e9edcffeae6cb443a2384ae3ef..f10e2e0535551254a6b85208550bef82b5497bc1 100644 (file)
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.57 2005/10/08 19:45:39 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.58 2005/10/11 03:02:23 soulse Exp $
+
+  10 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r4.ebuild,
+  nagios-core-2.0b_p1.ebuild, nagios-core-2.0b_p2.ebuild,
+  nagios-core-2.0b_p4.ebuild:
+  Apache DEPEND problem fixed.
 
   08 Oct 2005; <soulse@gentoo.org> -nagios-core-1.2-r2.ebuild,
   -nagios-core-1.2-r3.ebuild:

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 6c53e6340887391a49cb8cbe78a1771ccef4277d..72045502e12adecf2b9843ce2322d99eca9560e7 100644 (file)
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,9 +1,9 @@
-MD5 43f495c0086a62a6811913e038dc534f ChangeLog 10099
+MD5 027674f11ae042615c66d723a6c00f2c ChangeLog 10281
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
-MD5 d811b1963412b464f44c7b5ff6ef181c nagios-core-1.2-r4.ebuild 7115
-MD5 ce3be07134c88a9567e69cfbe28fe86a nagios-core-2.0b_p1.ebuild 5825
-MD5 be04314bc38c3f1ad8b15ac0b7399264 nagios-core-2.0b_p2.ebuild 5856
-MD5 9c1d799b7e7b5bc5c2267241c2b44755 nagios-core-2.0b_p4.ebuild 5858
+MD5 ebee553340e8edcdf915e3b9fab01b9d nagios-core-1.2-r4.ebuild 7118
+MD5 3d9f085b88202cbc8107eb3d9ca50b93 nagios-core-2.0b_p1.ebuild 5830
+MD5 b6f0fdafd85266f0a1f24cafb7cd0017 nagios-core-2.0b_p2.ebuild 5861
+MD5 a4340f0a04241083903ec43b9a3ded53 nagios-core-2.0b_p4.ebuild 5861
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
index 63b3b03303e95ee3898970f04d97731e82698572..8a6865cf3a03660b2def156f9221aaaca2e751b7 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.2-r4.ebuild,v 1.7 2005/10/07 18:30:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.8 2005/10/11 03:02:23 soulse Exp $
 
-inherit eutils depend.apache toolchain-funcs
+inherit eutils apache-module toolchain-funcs
 
 MY_P=${P/-core}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
@@ -20,7 +20,7 @@ DEPEND="virtual/mailx
                >=media-libs/jpeg-6b-r3
                >=media-libs/libpng-1.2.5-r4
                >=media-libs/gd-1.8.3-r5
-               ${APACHE_DEPEND}
+               ${NEED_APACHE_DEPEND}
        )
        perl? ( >=dev-lang/perl-5.6.1-r7 )
        mysql? ( >=dev-db/mysql-3.23.56 )

diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild
index 4b900728df6a3ee6b754e2590af9d8fc8817f4c5..8ab8a1623084c477f35b338459edf7031e5d6fa1 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.0b_p1.ebuild,v 1.5 2005/09/20 04:05:26 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild,v 1.6 2005/10/11 03:02:23 soulse Exp $
 
-inherit eutils depend.apache toolchain-funcs
+inherit eutils apache-module toolchain-funcs
 
 MY_P=${PN/-core}-${PV/_p}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
@@ -19,7 +19,7 @@ DEPEND="virtual/mailx
                >=media-libs/jpeg-6b-r3
                >=media-libs/libpng-1.2.5-r4
                >=media-libs/gd-1.8.3-r5
-               ${APACHE_DEPEND}
+               ${NEED_APACHE_DEPEND}
                perl? ( net-analyzer/traceroute )
        )
        perl? ( >=dev-lang/perl-5.6.1-r7 )"

diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild
index b239cbde40e8137830fca0d60be08475e3dc412f..e36f4c034b894dc1fb6c33f8f1d2ad9ede292f9b 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.0b_p2.ebuild,v 1.5 2005/09/20 04:05:26 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild,v 1.6 2005/10/11 03:02:23 soulse Exp $
 
-inherit eutils depend.apache toolchain-funcs
+inherit eutils apache-module toolchain-funcs
 
 MY_P=${PN/-core}-${PV/_p}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
@@ -19,7 +19,7 @@ DEPEND="virtual/mailx
                >=media-libs/jpeg-6b-r3
                >=media-libs/libpng-1.2.5-r4
                >=media-libs/gd-1.8.3-r5
-               ${APACHE_DEPEND}
+               ${NEED_APACHE_DEPEND}
                perl? ( net-analyzer/traceroute )
        )
        perl? ( >=dev-lang/perl-5.6.1-r7 )"

diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
index 6d188529e9d6a1130cc60594b47bcca3a5810a18..689d47af9f686db355bf8895b1ecf6ff7d938e5f 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.0b_p4.ebuild,v 1.1 2005/09/28 18:22:32 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild,v 1.2 2005/10/11 03:02:23 soulse Exp $
 
-inherit eutils depend.apache toolchain-funcs
+inherit eutils apache-module toolchain-funcs
 
 MY_P=${PN/-core}-${PV/_p}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
@@ -19,7 +19,7 @@ DEPEND="virtual/mailx
                >=media-libs/jpeg-6b-r3
                >=media-libs/libpng-1.2.5-r4
                >=media-libs/gd-1.8.3-r5
-               ${APACHE_DEPEND}
+               ${NEED_APACHE_DEPEND}
                perl? ( net-analyzer/traceroute )
        )
        perl? ( >=dev-lang/perl-5.6.1-r7 )"