summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2006-01-26 06:06:40 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2006-01-26 06:06:40 +0000
commit0da35565d61c8bc32014fc6d1e10c5513e4a104d (patch)
tree62ff8f787bd345692a05bbaed7e61b7f440dd40d /eclass/php5-sapi-r1.eclass
parentFix modular-X deps properly. "use? || (...)" is not valid, it should be "use?... (diff)
downloadgentoo-2-0da35565d61c8bc32014fc6d1e10c5513e4a104d.tar.gz
gentoo-2-0da35565d61c8bc32014fc6d1e10c5513e4a104d.tar.bz2
gentoo-2-0da35565d61c8bc32014fc6d1e10c5513e4a104d.zip
Fix modular-x deps on old PHP eclasses. Not really needed, but makes tracing of real modular-x bugs easier.
Diffstat (limited to 'eclass/php5-sapi-r1.eclass')
-rw-r--r--eclass/php5-sapi-r1.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index 1487f120ffe9..65559db1e32b 100644
--- a/eclass/php5-sapi-r1.eclass
+++ b/eclass/php5-sapi-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.21 2006/01/22 18:52:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.22 2006/01/26 06:06:40 robbat2 Exp $
#
# eclass/php5-sapi-r1.eclass
# Eclass for building different php5 SAPI instances
@@ -68,7 +68,7 @@ DEPEND="$DEPEND
tiff? ( media-libs/tiff )
truetype? ( =media-libs/freetype-1* =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
wddx? ( dev-libs/expat )
- xpm? ( virtual/x11 )
+ xpm? ( || ( x11-libs/libXpm virtual/x11 ) )
xsl? ( dev-libs/libxslt )
zlib? ( sys-libs/zlib )"