Address dependency issues caused by depend.apache. Refer to bug 107127.

(Portage version: 2.1_rc4-r1)

5 files changed, 20 insertions, 15 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index abefa96b3105..6b77e36c27ce 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.22 2006/04/27 23:28:41 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.23 2006/06/04 19:05:52 vericgar Exp $
+
+  04 Jun 2006; Michael Stewart <vericgar@gentoo.org> mod_perl-1.29.ebuild,
+  mod_perl-2.0.1-r1.ebuild, mod_perl-2.0.1-r2.ebuild, mod_perl-2.0.2.ebuild:
+  Address dependency issues caused by depend.apache. Refer to bug 107127.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org>
   files/digest-mod_perl-1.27-r1, files/digest-mod_perl-1.27-r2,
diff --git a/www-apache/mod_perl/mod_perl-1.29.ebuild b/www-apache/mod_perl/mod_perl-1.29.ebuild
index e162558db5bc..1ac661450368 100644
--- a/www-apache/mod_perl/mod_perl-1.29.ebuild
+++ b/www-apache/mod_perl/mod_perl-1.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.29.ebuild,v 1.4 2006/02/26 14:53:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-1.29.ebuild,v 1.5 2006/06/04 19:05:52 vericgar Exp $
 
 inherit eutils apache-module
 
@@ -12,7 +12,8 @@ SLOT="0"
 LICENSE="Apache-1.1 as-is"
 KEYWORDS="alpha ~amd64 ia64 ~ppc ppc64 sparc x86"
 
-DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1*"
+DEPEND="dev-lang/perl dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
 
 APACHE1_MOD_DEFINE="PERL"
 APACHE1_MOD_CONF="${PV}/75_mod_perl"
diff --git a/www-apache/mod_perl/mod_perl-2.0.1-r1.ebuild b/www-apache/mod_perl/mod_perl-2.0.1-r1.ebuild
index cf8b71bd421e..9f80775dd70d 100644
--- a/www-apache/mod_perl/mod_perl-2.0.1-r1.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r1.ebuild,v 1.4 2006/02/13 15:11:46 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r1.ebuild,v 1.5 2006/06/04 19:05:52 vericgar Exp $
 
 inherit apache-module perl-module eutils
 DESCRIPTION="An embedded Perl interpreter for Apache2"
@@ -13,19 +13,19 @@ IUSE=""
 SLOT="1"
 
 # see bug 30087 for why sudo is in here
-need_apache2
-
 DEPEND="!dev-perl/Apache-Test
 	dev-lang/perl
 	>=virtual/perl-CGI-3.08
 	>=dev-perl/Compress-Zlib-1.09
-	>=net-www/apache-2.0.47
 	app-admin/sudo"
+RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="75_${PN}.conf apache2-mod_perl-startup.pl"
 DOCFILES="Changes INSTALL LICENSE README STATUS"
 APACHE2_MOD_DEFINE="PERL"
 
+need_apache2
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild
index 017d4a8ef73f..2e9c1942d6da 100644
--- a/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild,v 1.11 2006/04/08 20:27:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.1-r2.ebuild,v 1.12 2006/06/04 19:05:52 vericgar Exp $
 
 inherit apache-module perl-module eutils multilib
 DESCRIPTION="An embedded Perl interpreter for Apache2"
@@ -13,19 +13,19 @@ IUSE=""
 SLOT="1"
 
 # see bug 30087 for why sudo is in here
-need_apache2
-
 DEPEND="!dev-perl/Apache-Test
 	dev-lang/perl
 	>=virtual/perl-CGI-3.08
 	>=dev-perl/Compress-Zlib-1.09
-	>=net-www/apache-2.0.47
 	app-admin/sudo"
+RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="75_${PN}.conf apache2-mod_perl-startup.pl"
 DOCFILES="Changes INSTALL LICENSE README STATUS"
 APACHE2_MOD_DEFINE="PERL"
 
+need_apache2
+
 src_unpack() {
 	INSTALLED_MPM="$(${ROOT}/usr/sbin/apxs2 -q MPM_NAME)"
 	eval `perl '-V:useithreads'`
diff --git a/www-apache/mod_perl/mod_perl-2.0.2.ebuild b/www-apache/mod_perl/mod_perl-2.0.2.ebuild
index ece0f8fd3805..a566a71f715a 100644
--- a/www-apache/mod_perl/mod_perl-2.0.2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.2.ebuild,v 1.1 2006/02/26 14:53:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.2.ebuild,v 1.2 2006/06/04 19:05:52 vericgar Exp $
 
 inherit apache-module perl-module eutils multilib
 DESCRIPTION="An embedded Perl interpreter for Apache2"
@@ -13,19 +13,19 @@ IUSE=""
 SLOT="1"
 
 # see bug 30087 for why sudo is in here
-need_apache2
-
 DEPEND="!dev-perl/Apache-Test
 	dev-lang/perl
 	>=virtual/perl-CGI-3.08
 	>=dev-perl/Compress-Zlib-1.09
-	>=net-www/apache-2.0.47
 	app-admin/sudo"
+RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="75_${PN}.conf apache2-mod_perl-startup.pl"
 DOCFILES="Changes INSTALL LICENSE README STATUS"
 APACHE2_MOD_DEFINE="PERL"
 
+need_apache2
+
 src_unpack() {
 	INSTALLED_MPM="$(${ROOT}/usr/sbin/apxs2 -q MPM_NAME)"
 	eval `perl '-V:useithreads'`