summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-07-04 22:07:57 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-07-04 22:07:57 +0000
commita8e9166d01fa53f1b888ef257751c2f24afb6927 (patch)
tree31186632d6ab62e75878ce87c0c2a521a226c93f /www-apache
parentVersion bump. (diff)
downloadhistorical-a8e9166d01fa53f1b888ef257751c2f24afb6927.tar.gz
historical-a8e9166d01fa53f1b888ef257751c2f24afb6927.tar.bz2
historical-a8e9166d01fa53f1b888ef257751c2f24afb6927.zip
Fix apache/perl dependencies again, bug 373943.
Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_perl/ChangeLog5
-rw-r--r--www-apache/mod_perl/Manifest18
-rw-r--r--www-apache/mod_perl/mod_perl-2.0.5.ebuild11
3 files changed, 20 insertions, 14 deletions
diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index f94ba8500f85..cb1a43c23618 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.90 2011/07/01 17:56:29 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.91 2011/07/04 22:07:57 idl0r Exp $
+
+ 04 Jul 2011; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.5.ebuild:
+ Fix apache/perl dependencies again, bug 373943.
01 Jul 2011; Christian Ruppert <idl0r@gentoo.org> mod_perl-2.0.5.ebuild:
Fix Dependencies. Add threads useflag.
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index e60973503e02..2559e230a043 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -9,17 +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 4865 RMD160 caf229d91459d716b03fb2bc506e2d861449f922 SHA1 0ba7b2bace2c70bf86e3f66e2072ef20028c7250 SHA256 a0f70d68cfddf1ecc1958a3797a328348b793356d518c108c1d519e563f86f50
-MISC ChangeLog 22055 RMD160 9f08fbf21ebe9e30881139f85daf072fcc601cf1 SHA1 abfae209f3f18d941819cb50970d7d9d195d5809 SHA256 2c54b26b963bb719db5b291988a1c3cecb4c2d45647835ae6c384338d56cab2a
+EBUILD mod_perl-2.0.5.ebuild 4923 RMD160 178e1d1262ab42f7c1c5e54d0646106a26171a99 SHA1 a261b873e1957e0d71c8ff796e47ce1f9c54e851 SHA256 a3aa29434e28b42331e4b51c3400de5998e7791613b88e0951264a628d4356a0
+MISC ChangeLog 22181 RMD160 24ab12d8563435f7474d318b533c53912b35e3c5 SHA1 bcc9dfa8615a6680f1f47e49a037c46f00cd457b SHA256 261ccf788e90933088afe194ebfd19376614b5c0be70c535c66a5a7d01a8cb9b
MISC metadata.xml 275 RMD160 4ee9e0a9afbd2a8e5817202cd2c14bb35cd5c729 SHA1 342b1eb74f37b19a3c5f9300f4814bb8e42a62a4 SHA256 031d7de6b452dfe25c20e59c8a3da81e54a59cd2c4bb80524e4905b180eb66ab
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBCAAGBQJODgpTAAoJEMOx0zmdw4Z1E8QH/R+zljOGBgiKdDoCU6lbhVXm
-mF4msRlskSP8fLPpSj5GTXI+B4EZ+DNEHWONv28HDWm3skFzvG72PjP/dH8TLWj/
-LfrZ6Iwqv2gDRUoQcVvVFtpSOPw6R3h4ytACmNs0VQk0Ot4ulqsRuXWS6j7AMhYm
-ZCtb4WqwNSx/objTYlsZsyBR1Bkh4orqs+TGcjq71XlzAPM4qk4JHFJaDuxY+OyJ
-ZLXkVdy1ssRu4sHjHrVeOOSxhfEME5S7pi8ushzl5/ldhXdCxfsHm5dAnmsSNIe4
-kxhpZr4/Y2WYT7QeT0lhYPtC5Ayq2NtuR/6qCJdRvkP840irwOBVSJMyL26JNhs=
-=lC27
+iQEcBAEBCAAGBQJOEjoSAAoJEMOx0zmdw4Z1DdMH/1Ns0oN3EKavozeubf/G5Kxp
+uPSfnSlYdrAixb8U1fAA8ym74E+DzXRegLfGhiQECfRRqt9vmgHjzBqIXg7TUY5v
+IMmOa7cTxZjPQ5jLeYDT4afLbChbTPrQHge563ZGeMt0mhdE36XrxgceJ8kwJF6S
+RRTWccew6H4lgN/uiTWi4I4ITXmMivVWpDrAUwOuQ3uCbqxIl2LMY+OtXxCtY8VI
+AW3ESUZlFv8AEYWwcBlwQiXe7X74wSfPGZ4z4SgOAZQMZWaDgssbOj+5NRWbFb37
+7RcpLJq68USarG9n2ZyYJQe+gQWdsNKoTI6e1L1enUsg+rQBuzfNF1fPIAlcqW4=
+=2m1X
-----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 ec2897333319..c9cde5ca7656 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.3 2011/07/01 17:56:29 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.5.ebuild,v 1.4 2011/07/04 22:07:57 idl0r Exp $
EAPI="3"
@@ -12,15 +12,18 @@ HOMEPAGE="http://perl.apache.org/"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-IUSE="threads"
SLOT="1"
# Make sure we always use the latest Apache-Test version or even check the
# version of the bundled Apache-Test!
+#
+# We need both, apache and perl but either apache without threads or perl with
+# ithreads, bug 373943
DEPEND=">=dev-perl/Apache-Test-1.360
>=virtual/perl-CGI-3.08
- threads? ( www-servers/apache[threads] dev-lang/perl[ithreads] )
- !threads? ( www-servers/apache[-threads] dev-lang/perl[-ithreads] )"
+ dev-lang/perl
+ www-servers/apache
+ || ( www-servers/apache[-threads] dev-lang/perl[ithreads] )"
RDEPEND="${DEPEND}"
PDEPEND=">=dev-perl/Apache-Reload-0.11
>=dev-perl/Apache-SizeLimit-0.95"