depend virtual/jpeg

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

5 files changed, 30 insertions, 26 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index b2bf1c0d9bb9..64b497cc5c98 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.470 2011/02/25 11:57:50 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.471 2011/02/25 19:00:15 signals Exp $
+
+  25 Feb 2011; Kevin McCarthy <signals@gentoo.org> php-5.2.14.ebuild,
+  php-5.2.16.ebuild, php-5.2.17.ebuild, php-5.3.3-r1.ebuild:
+  Updated depends from media-libs/jpeg to virtual/jpeg
 
   25 Feb 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.5.ebuild,
   php-5.3.6_rc1.ebuild:
diff --git a/dev-lang/php/php-5.2.14.ebuild b/dev-lang/php/php-5.2.14.ebuild
index 3b8cae37d9be..5ccaceada59b 100644
--- a/dev-lang/php/php-5.2.14.ebuild
+++ b/dev-lang/php/php-5.2.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14.ebuild,v 1.11 2010/09/07 21:22:40 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14.ebuild,v 1.12 2011/02/25 19:00:15 signals Exp $
 
 EAPI=2
 
@@ -103,7 +103,7 @@ DEPEND="app-admin/php-toolkit
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng
 		sys-libs/zlib
 	) ) )
@@ -115,13 +115,13 @@ DEPEND="app-admin/php-toolkit
 	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
 	esoob? ( >=dev-db/unixODBC-1.8.13 )
 	exif? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		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 )
@@ -160,7 +160,7 @@ DEPEND="app-admin/php-toolkit
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? ( !gd-external? (
-			>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) )
+			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
 	)
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
@@ -169,7 +169,7 @@ DEPEND="app-admin/php-toolkit
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng sys-libs/zlib
 	)
 	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.2.16.ebuild b/dev-lang/php/php-5.2.16.ebuild
index 40a7d696112a..58adc3a9a413 100644
--- a/dev-lang/php/php-5.2.16.ebuild
+++ b/dev-lang/php/php-5.2.16.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/dev-lang/php/php-5.2.16.ebuild,v 1.8 2011/01/30 16:00:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.9 2011/02/25 19:00:15 signals Exp $
 
 EAPI=2
 
@@ -110,7 +110,7 @@ DEPEND="app-admin/eselect-php
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng
 		sys-libs/zlib
 	) ) )
@@ -122,13 +122,13 @@ DEPEND="app-admin/eselect-php
 	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
 	esoob? ( >=dev-db/unixODBC-1.8.13 )
 	exif? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		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 )
@@ -167,7 +167,7 @@ DEPEND="app-admin/eselect-php
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? ( !gd-external? (
-			>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) )
+			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
 	)
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
@@ -176,7 +176,7 @@ DEPEND="app-admin/eselect-php
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng sys-libs/zlib
 	)
 	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index 0abaa7c6a459..c3e875edf8cd 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.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/dev-lang/php/php-5.2.17.ebuild,v 1.9 2011/01/30 16:00:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.10 2011/02/25 19:00:15 signals Exp $
 
 EAPI=2
 
@@ -110,7 +110,7 @@ DEPEND=">=app-admin/eselect-php-0.6.2
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng
 		sys-libs/zlib
 	) ) )
@@ -122,13 +122,13 @@ DEPEND=">=app-admin/eselect-php-0.6.2
 	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
 	esoob? ( >=dev-db/unixODBC-1.8.13 )
 	exif? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		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 )
@@ -167,7 +167,7 @@ DEPEND=">=app-admin/eselect-php-0.6.2
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? ( !gd-external? (
-			>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) )
+			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
 	)
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
@@ -176,7 +176,7 @@ DEPEND=">=app-admin/eselect-php-0.6.2
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng sys-libs/zlib
 	)
 	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.3.3-r1.ebuild b/dev-lang/php/php-5.3.3-r1.ebuild
index 213c4463e721..4b34fbb21b1f 100644
--- a/dev-lang/php/php-5.3.3-r1.ebuild
+++ b/dev-lang/php/php-5.3.3-r1.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/dev-lang/php/php-5.3.3-r1.ebuild,v 1.9 2011/01/30 16:00:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r1.ebuild,v 1.10 2011/02/25 19:00:15 signals Exp $
 
 EAPI=2
 
@@ -113,7 +113,7 @@ DEPEND="app-admin/php-toolkit
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng
 		sys-libs/zlib
 	) ) )
@@ -126,13 +126,13 @@ DEPEND="app-admin/php-toolkit
 	enchant? ( app-text/enchant )
 	esoob? ( >=dev-db/unixODBC-1.8.13 )
 	exif? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng
 		sys-libs/zlib
 	) ) )
 	firebird? ( dev-db/firebird )
 	fpm? ( >=dev-libs/libevent-1.4.12 )
-	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 )
@@ -173,7 +173,7 @@ DEPEND="app-admin/php-toolkit
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? ( !gd-external? (
-			>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) )
+			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -183,7 +183,7 @@ DEPEND="app-admin/php-toolkit
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		>=media-libs/jpeg-6b
+		virtual/jpeg
 		media-libs/libpng sys-libs/zlib
 	)
 	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )