Apache 1.X masking (fix ebuilds to not require apache-1*).

(Portage version: 2.1.2.7)

4 files changed, 23 insertions, 52 deletions

diff --git a/dev-perl/HTML-Mason/ChangeLog b/dev-perl/HTML-Mason/ChangeLog
index 67adda059b89..aab956dad102 100644
--- a/dev-perl/HTML-Mason/ChangeLog
+++ b/dev-perl/HTML-Mason/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/HTML-Mason
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/ChangeLog,v 1.65 2007/03/05 11:59:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/ChangeLog,v 1.66 2007/05/12 03:10:55 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> HTML-Mason-1.32.ebuild,
+  HTML-Mason-1.33.ebuild, HTML-Mason-1.35.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   05 Mar 2007; Andrej Kacian <ticho@gentoo.org> HTML-Mason-1.35.ebuild:
   Stable on x86, bug #169152.
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild
index 06bcb2b8e51f..56074c472e8a 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.32.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/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild,v 1.12 2007/01/20 15:21:02 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild,v 1.13 2007/05/12 03:10:55 chtekk Exp $
 
 inherit perl-module
 
@@ -11,19 +11,14 @@ HOMEPAGE="http://www.masonhq.com/"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="apache2 modperl doc"
+IUSE="modperl doc"
 SRC_TEST="do"
 
 DEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		!apache2? (
-			=net-www/apache-1*
-			>=www-misc/libapreq-1.0-r2
-			<www-apache/mod_perl-2 )
-		apache2? (
-			>=net-www/apache-2
-			www-misc/libapreq2
-			>=www-apache/mod_perl-2 )
+		>=net-www/apache-2
+		www-misc/libapreq2
+		>=www-apache/mod_perl-2
 	)
 	>=dev-perl/Params-Validate-0.7
 	>=dev-perl/module-build-0.28
@@ -46,13 +41,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	if use apache2; then
-		APACHE="/usr/sbin/apache2"
-	else
-		APACHE="/usr/sbin/apache"
-	fi
-
-	APACHE="${APACHE}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild
index 116fb43649a7..b2e6a0d4c95e 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.33.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/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild,v 1.8 2007/01/20 15:21:02 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild,v 1.9 2007/05/12 03:10:55 chtekk Exp $
 
 inherit perl-module
 
@@ -11,19 +11,14 @@ HOMEPAGE="http://www.masonhq.com/"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="alpha amd64 ppc sparc ~x86"
-IUSE="apache2 modperl doc"
+IUSE="modperl doc"
 SRC_TEST="do"
 
 DEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		!apache2? (
-			=net-www/apache-1*
-			>=www-misc/libapreq-1.0-r2
-			<www-apache/mod_perl-2 )
-		apache2? (
-			>=net-www/apache-2
-			www-misc/libapreq2
-			>=www-apache/mod_perl-2 )
+		>=net-www/apache-2
+		www-misc/libapreq2
+		>=www-apache/mod_perl-2
 	)
 	>=dev-perl/Params-Validate-0.7
 	>=dev-perl/module-build-0.28
@@ -46,13 +41,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	if use apache2; then
-		APACHE="/usr/sbin/apache2"
-	else
-		APACHE="/usr/sbin/apache"
-	fi
-
-	APACHE="${APACHE}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
index 7375d6e226d5..db4449ac0f8c 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.35.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/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild,v 1.7 2007/03/05 11:59:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild,v 1.8 2007/05/12 03:10:55 chtekk Exp $
 
 inherit perl-module
 
@@ -11,19 +11,14 @@ HOMEPAGE="http://www.masonhq.com/"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="apache2 modperl doc"
+IUSE="modperl doc"
 SRC_TEST="do"
 
 DEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		!apache2? (
-			=net-www/apache-1*
-			>=www-misc/libapreq-1.0-r2
-			<www-apache/mod_perl-2 )
-		apache2? (
-			>=net-www/apache-2
-			www-misc/libapreq2
-			>=www-apache/mod_perl-2 )
+		>=net-www/apache-2
+		www-misc/libapreq2
+		>=www-apache/mod_perl-2
 	)
 	>=dev-perl/Params-Validate-0.7
 	>=dev-perl/module-build-0.28
@@ -46,13 +41,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	if use apache2; then
-		APACHE="/usr/sbin/apache2"
-	else
-		APACHE="/usr/sbin/apache"
-	fi
-
-	APACHE="${APACHE}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {