summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-23 19:53:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-23 19:53:30 +0000
commitb9fc520ba6229541b2fc75236b68830ed1a79a62 (patch)
tree07f9754b16eab2e5766c97781ed1859dbe32f610 /eclass/php5_2-sapi.eclass
parentVersion bump, bug 326727 (diff)
downloadgentoo-2-b9fc520ba6229541b2fc75236b68830ed1a79a62.tar.gz
gentoo-2-b9fc520ba6229541b2fc75236b68830ed1a79a62.tar.bz2
gentoo-2-b9fc520ba6229541b2fc75236b68830ed1a79a62.zip
Use virtual/jpeg.
Diffstat (limited to 'eclass/php5_2-sapi.eclass')
-rw-r--r--eclass/php5_2-sapi.eclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/php5_2-sapi.eclass b/eclass/php5_2-sapi.eclass
index 57e6bacafffb..688225c52bf3 100644
--- a/eclass/php5_2-sapi.eclass
+++ b/eclass/php5_2-sapi.eclass
@@ -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/eclass/php5_2-sapi.eclass,v 1.33 2010/03/16 14:06:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.34 2010/07/23 19:53:30 ssuominen Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -51,7 +51,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
birdstep? ( >=dev-db/unixODBC-1.8.13 )
bzip2? ( app-arch/bzip2 )
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- cjk? ( !gd? ( !gd-external? ( >=media-libs/jpeg-7 media-libs/libpng sys-libs/zlib ) ) )
+ cjk? ( !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) )
crypt? ( >=dev-libs/libmcrypt-2.4 )
curl? ( >=net-misc/curl-7.10.5 )
db2? ( >=dev-db/unixODBC-1.8.13 )
@@ -59,10 +59,10 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
empress? ( >=dev-db/unixODBC-1.8.13 )
empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
esoob? ( >=dev-db/unixODBC-1.8.13 )
- exif? ( !gd? ( !gd-external? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) )
+ exif? ( !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) )
fdftk? ( app-text/fdftk )
firebird? ( dev-db/firebird )
- gd? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
+ gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
gd-external? ( media-libs/gd )
gdbm? ( >=sys-libs/gdbm-1.8.0 )
gmp? ( >=dev-libs/gmp-4.1.2 )
@@ -98,13 +98,13 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
ssl? ( >=dev-libs/openssl-0.9.7 )
sybase? ( dev-db/freetds )
tidy? ( app-text/htmltidy )
- truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( !gd-external? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) )
+ truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( !gd-external? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) )
wddx? ( >=dev-libs/libxml2-2.6.8 )
xml? ( >=dev-libs/libxml2-2.6.8 )
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? ( x11-libs/libXpm >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
+ xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib )
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
zip? ( sys-libs/zlib )
zlib? ( sys-libs/zlib )