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

Package-Manager: portage-2.1.2.7

5 files changed, 39 insertions, 78 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 () {
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 60eed64d5595..2d0989ab7fee 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST HTML-Mason-1.26.tar.gz 331325 RMD160 4c8092cdcf93087da26e9c2de3d8c3809e37e97e SHA1 bf9955a02e3c8e062f6f94edd9cf440c0752ec54 SHA256 5cf9cdd8b18b07e942690c93aa4125f19c7128b7f318b9107179a7c25cb3eae5
 DIST HTML-Mason-1.32.tar.gz 382521 RMD160 a6bb0a8b979d4e8b94614a77f911d1aa887aeac8 SHA1 411cb70053d41287b99fd88f39851069d653e173 SHA256 623c0d221773372c0f4013ab17a0af1c1b10bd0a1bc7bd63afb5c942489522cc
 DIST HTML-Mason-1.33.tar.gz 383225 RMD160 6143709c72b03c1148c089abb19e1eb0189aa6f1 SHA1 788651e25b64502432ebf78790bd98fca51f703e SHA256 78605ea4ae0a874538cddb8778b8f243d548e512decf6d95b146e0252690361d
@@ -9,22 +6,22 @@ EBUILD HTML-Mason-1.26.ebuild 1727 RMD160 46734fbd0b63e27ca608ac93bfe0920a5d8c33
 MD5 0c5f02ccc9bd336bcfa0d9b5ae29a4a9 HTML-Mason-1.26.ebuild 1727
 RMD160 46734fbd0b63e27ca608ac93bfe0920a5d8c3332 HTML-Mason-1.26.ebuild 1727
 SHA256 6660163ceb29c095c85dc29f11229274860d2e44740551d6f7c959d1e0da348b HTML-Mason-1.26.ebuild 1727
-EBUILD HTML-Mason-1.32.ebuild 1645 RMD160 8a76e01c50093475e260691d13d0c3fa60b872bd SHA1 6dc42d4d75f5034ba112fbd6c9944ae72e93aa21 SHA256 2c09b63b4a66595f264ec7af73ccac47946bc2377ae9925439c2eabbf4f5b956
-MD5 91104995fca9d4979cb669b36bed5d9c HTML-Mason-1.32.ebuild 1645
-RMD160 8a76e01c50093475e260691d13d0c3fa60b872bd HTML-Mason-1.32.ebuild 1645
-SHA256 2c09b63b4a66595f264ec7af73ccac47946bc2377ae9925439c2eabbf4f5b956 HTML-Mason-1.32.ebuild 1645
-EBUILD HTML-Mason-1.33.ebuild 1644 RMD160 4aa8b829180670f5ad7cd47d2888912c1cf0c8a0 SHA1 c1dcee2193e1fd80c7f76f54d3e0cbe5c6a4646c SHA256 89b97283be722f28cc17ca2a7229493fd55036adeed336a827608ae8e8ce2e53
-MD5 a34b87d07a21abff143b09e984f371c2 HTML-Mason-1.33.ebuild 1644
-RMD160 4aa8b829180670f5ad7cd47d2888912c1cf0c8a0 HTML-Mason-1.33.ebuild 1644
-SHA256 89b97283be722f28cc17ca2a7229493fd55036adeed336a827608ae8e8ce2e53 HTML-Mason-1.33.ebuild 1644
-EBUILD HTML-Mason-1.35.ebuild 1640 RMD160 7bd246810728129e9946cd68c359ededcd679c1c SHA1 9375b6c26fed15be9d9ed6c117b0fe39a0eef59f SHA256 e72f162f6024a603b8e82fc38486d2a9ce2598235fad5a477f1b5c6799f2c01e
-MD5 0d58e2a7c99654b2cf0f5193804f5beb HTML-Mason-1.35.ebuild 1640
-RMD160 7bd246810728129e9946cd68c359ededcd679c1c HTML-Mason-1.35.ebuild 1640
-SHA256 e72f162f6024a603b8e82fc38486d2a9ce2598235fad5a477f1b5c6799f2c01e HTML-Mason-1.35.ebuild 1640
-MISC ChangeLog 9805 RMD160 bdc09a683db1d32de15e6c69e45bfe8846de6324 SHA1 2cbe437aad61fc058ec6f1990a4d5a60e6264300 SHA256 b2d822e78233c414bc8fcc1906aefcc6f6cf3cbbcb9c568584ed2e2ae332db7d
-MD5 49789755d7c05cb3321ed87f61db1406 ChangeLog 9805
-RMD160 bdc09a683db1d32de15e6c69e45bfe8846de6324 ChangeLog 9805
-SHA256 b2d822e78233c414bc8fcc1906aefcc6f6cf3cbbcb9c568584ed2e2ae332db7d ChangeLog 9805
+EBUILD HTML-Mason-1.32.ebuild 1440 RMD160 0778258c38cc5747b682f4cba0efbdf937e3057e SHA1 bcf2392cf79d3d4086e21ba55b800953094f7908 SHA256 b0bca3dffdb440af9bc27491f98bd43132a4aa9a719ef6829f2fed80c8ac4475
+MD5 cb3a317ee8fe979198ee131fd0444dd7 HTML-Mason-1.32.ebuild 1440
+RMD160 0778258c38cc5747b682f4cba0efbdf937e3057e HTML-Mason-1.32.ebuild 1440
+SHA256 b0bca3dffdb440af9bc27491f98bd43132a4aa9a719ef6829f2fed80c8ac4475 HTML-Mason-1.32.ebuild 1440
+EBUILD HTML-Mason-1.33.ebuild 1439 RMD160 98bfe06ad21cb6c9c528cff300ad22eed45ec2df SHA1 3bc2efee9e598972643a340d289e986fd74a3d49 SHA256 784187e6f89ee03da15de178a780d2495d49dceb1ceac0f00b20e8c994ce6a47
+MD5 b50e3c833456414b5700949400f517c9 HTML-Mason-1.33.ebuild 1439
+RMD160 98bfe06ad21cb6c9c528cff300ad22eed45ec2df HTML-Mason-1.33.ebuild 1439
+SHA256 784187e6f89ee03da15de178a780d2495d49dceb1ceac0f00b20e8c994ce6a47 HTML-Mason-1.33.ebuild 1439
+EBUILD HTML-Mason-1.35.ebuild 1439 RMD160 717bedaff65381a0312bec1adb05e10804c6dd27 SHA1 f060841fd4b84b53a79a5b06503efca3bfb971ed SHA256 ac55ab470e10e46e5e7bc184dba65f1781e432f5a59d2e08bea5084f100c14df
+MD5 0ecb957a76eba19a03a011d3e4f84078 HTML-Mason-1.35.ebuild 1439
+RMD160 717bedaff65381a0312bec1adb05e10804c6dd27 HTML-Mason-1.35.ebuild 1439
+SHA256 ac55ab470e10e46e5e7bc184dba65f1781e432f5a59d2e08bea5084f100c14df HTML-Mason-1.35.ebuild 1439
+MISC ChangeLog 9993 RMD160 795716287f83f4f5a55e7a23c6fb2b9b6c0afade SHA1 4c5d3ea8154c3d76e43ff2ac255a586af38eaa5b SHA256 78823b4b943c701f96b251d0bfabfd0eb6e7690162684c872d3d525849c6ca96
+MD5 7f6f4f01b6e4deb28d8a3b62d4beffa9 ChangeLog 9993
+RMD160 795716287f83f4f5a55e7a23c6fb2b9b6c0afade ChangeLog 9993
+SHA256 78823b4b943c701f96b251d0bfabfd0eb6e7690162684c872d3d525849c6ca96 ChangeLog 9993
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -41,10 +38,3 @@ SHA256 d145559355ab2692ee79a9758b2dadc719326427a3ba9aa9f29690c10f4caa45 files/di
 MD5 44c544fcc8358a3f29de4210af618d7e files/digest-HTML-Mason-1.35 247
 RMD160 01517e0ed7243205651c67757b703b07211738ed files/digest-HTML-Mason-1.35 247
 SHA256 2ca672cdd60f9bbff29d1bbbdeacd9e97d61d8e59eaf13090f94c0a7991a4efa files/digest-HTML-Mason-1.35 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF7AYyQlM6RnzZP+IRAiBIAJ9jvzaHSnX9S35klcpUJEB26ekIOACdHBez
-DKqvs9zFm8xwLjDew/MzB90=
-=aYlc
------END PGP SIGNATURE-----