Fix Dependencies. Add threads useflag.

Package-Manager: portage-2.2.0_alpha42/cvs/Linux x86_64

3 files changed, 22 insertions, 15 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index b0380697e6c7..f94ba8500f85 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.89 2011/05/15 17:26:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.90 2011/07/01 17:56:29 idl0r Exp $
+
+  01 Jul 2011; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.5.ebuild:
+  Fix Dependencies. Add threads useflag.
 
   15 May 2011; Raúl Porcel <armin76@gentoo.org> mod_perl-2.0.5.ebuild:
   Add ~alpha/~ia64/~sparc wrt #359047
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index c5330f4c0649..e60973503e02 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.0.3/75_mod_perl.conf 1221 RMD160 5fe4dee7d3123be5f3cd8cd41bb54fd1b63f0328 SHA1 068bf3f674a13e1db51046851a837ee7501353b7 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 RMD160 ef12070dd5e5707286e3c714ec3aeae78ce5cfd4 SHA1 80ece64910771b6c36d7b2d30373287bc1bf4b87 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544
@@ -9,13 +9,17 @@ AUX mod_perl-2.0.5-bundled-Apache-Test.patch 2075 RMD160 bf3664f1f000b6cb8d1b006
 DIST mod_perl-2.0.4.tar.gz 3727717 RMD160 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d SHA1 65299a16ec414a690a48a2bbe63acaa3c6bb897b SHA256 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0
 DIST mod_perl-2.0.5.tar.gz 3778910 RMD160 d659db1c64200ed9c8863c6e283360dfdd0c8384 SHA1 e749e2d7236273217f33cbe7fcd704a662e532d1 SHA256 fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa
 EBUILD mod_perl-2.0.4-r1.ebuild 4315 RMD160 be88f1c53c76052bf79bc2957f44116a6108bd3b SHA1 fac4a0af4d745d6b30754804f0da0aef8882bef6 SHA256 33daa1b9b9f4a9bb00e232f32cde95a9a5f159335b47d838ac2ad5fd7a82f0e4
-EBUILD mod_perl-2.0.5.ebuild 4798 RMD160 2b56f502da2039b2558d49794937f2049ef45a3a SHA1 5753ba89498131d7d84f9d12138b17c3a3398b18 SHA256 21fa44a99ff5dc76504ab4ae42503b10c6c7e29c6e2b1d033c22f26427ad1b1b
-MISC ChangeLog 21940 RMD160 7b883959dffad18561badb13f9a0b2f34468cfaf SHA1 d535dbd9cbf27505f8649d6ebf4cb524488e9bee SHA256 3d2f57c10e548172782597c7d7956344e6831d04c04ff7c4e017787bbd5f80a9
+EBUILD mod_perl-2.0.5.ebuild 4865 RMD160 caf229d91459d716b03fb2bc506e2d861449f922 SHA1 0ba7b2bace2c70bf86e3f66e2072ef20028c7250 SHA256 a0f70d68cfddf1ecc1958a3797a328348b793356d518c108c1d519e563f86f50
+MISC ChangeLog 22055 RMD160 9f08fbf21ebe9e30881139f85daf072fcc601cf1 SHA1 abfae209f3f18d941819cb50970d7d9d195d5809 SHA256 2c54b26b963bb719db5b291988a1c3cecb4c2d45647835ae6c384338d56cab2a
 MISC metadata.xml 275 RMD160 4ee9e0a9afbd2a8e5817202cd2c14bb35cd5c729 SHA1 342b1eb74f37b19a3c5f9300f4814bb8e42a62a4 SHA256 031d7de6b452dfe25c20e59c8a3da81e54a59cd2c4bb80524e4905b180eb66ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3QDMgACgkQuQc30/atMkBWMwCeJF96xVf30G1PwrKR1UJtsQyn
-UoYAnRyAhpo5XQ2l0OrITGIDNc1bw1Rl
-=N1+Z
+iQEcBAEBCAAGBQJODgpTAAoJEMOx0zmdw4Z1E8QH/R+zljOGBgiKdDoCU6lbhVXm
+mF4msRlskSP8fLPpSj5GTXI+B4EZ+DNEHWONv28HDWm3skFzvG72PjP/dH8TLWj/
+LfrZ6Iwqv2gDRUoQcVvVFtpSOPw6R3h4ytACmNs0VQk0Ot4ulqsRuXWS6j7AMhYm
+ZCtb4WqwNSx/objTYlsZsyBR1Bkh4orqs+TGcjq71XlzAPM4qk4JHFJaDuxY+OyJ
+ZLXkVdy1ssRu4sHjHrVeOOSxhfEME5S7pi8ushzl5/ldhXdCxfsHm5dAnmsSNIe4
+kxhpZr4/Y2WYT7QeT0lhYPtC5Ayq2NtuR/6qCJdRvkP840irwOBVSJMyL26JNhs=
+=lC27
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_perl/mod_perl-2.0.5.ebuild b/www-apache/mod_perl/mod_perl-2.0.5.ebuild
index 9a39d812655d..ec2897333319 100644
--- a/www-apache/mod_perl/mod_perl-2.0.5.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.5.ebuild,v 1.2 2011/05/15 17:26:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.5.ebuild,v 1.3 2011/07/01 17:56:29 idl0r Exp $
 
 EAPI="3"
 
@@ -12,15 +12,15 @@ HOMEPAGE="http://perl.apache.org/"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-IUSE=""
+IUSE="threads"
 SLOT="1"
 
 # Make sure we always use the latest Apache-Test version or even check the
 # version of the bundled Apache-Test!
 DEPEND=">=dev-perl/Apache-Test-1.360
 	>=virtual/perl-CGI-3.08
-	dev-lang/perl
-	|| ( www-servers/apache[-threads] dev-lang/perl[ithreads] )"
+	threads? ( www-servers/apache[threads] dev-lang/perl[ithreads] )
+	!threads? ( www-servers/apache[-threads] dev-lang/perl[-ithreads] )"
 RDEPEND="${DEPEND}"
 PDEPEND=">=dev-perl/Apache-Reload-0.11
 	>=dev-perl/Apache-SizeLimit-0.95"
@@ -64,9 +64,9 @@ src_prepare() {
 	# test" below should allow the software to build properly.
 
 	# Robert Coie <rac@gentoo.org> 2003.05.06
-	sed -i -e "s/sleep \$_/sleep \$_ << 2/" \
-		"${S}"/Apache-Test/lib/Apache/TestServer.pm \
-		|| die "problem editing TestServer.pm"
+#	sed -i -e "s/sleep \$_/sleep \$_ << 2/" \
+#		"${S}"/Apache-Test/lib/Apache/TestServer.pm \
+#		|| die "problem editing TestServer.pm"
 
 	# rendhalver - this got redone for 2.0.1 and seems to fix the make test problems
 	epatch "${FILESDIR}"/mod_perl-2.0.1-sneak-tmpdir.patch