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
commit53537332b602a7757fe79896c283a105c703db90 (patch)
tree67b75aac68f129fffa5965a422c80f4de76776c7 /www-apache/mod_perl
parentVersion bump. (diff)
downloadgentoo-2-53537332b602a7757fe79896c283a105c703db90.tar.gz
gentoo-2-53537332b602a7757fe79896c283a105c703db90.tar.bz2
gentoo-2-53537332b602a7757fe79896c283a105c703db90.zip
Fix apache/perl dependencies again, bug 373943.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'www-apache/mod_perl')
-rw-r--r--www-apache/mod_perl/ChangeLog5
-rw-r--r--www-apache/mod_perl/mod_perl-2.0.5.ebuild11
2 files changed, 11 insertions, 5 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/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"