Pin virtual/jpeg SLOT to 0.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

8 files changed, 48 insertions, 43 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index f48440240430..94d405c2fac3 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.759 2013/08/24 14:06:31 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.760 2013/08/27 15:01:26 kensington Exp $
+
+  27 Aug 2013; Michael Palimaka <kensington@gentoo.org> php-5.3.27.ebuild,
+  php-5.4.17.ebuild, php-5.4.18.ebuild, php-5.4.19.ebuild, php-5.5.2.ebuild,
+  php-5.5.3-r1.ebuild, php-5.5.3.ebuild:
+  Pin virtual/jpeg SLOT to 0.
 
   24 Aug 2013; Ole Markus With <olemarkus@gentoo.org> php-5.5.3-r1.ebuild:
   Fix bug 482310, use the correct patch
diff --git a/dev-lang/php/php-5.3.27.ebuild b/dev-lang/php/php-5.3.27.ebuild
index 3c68a7ba7f11..dc873db875c6 100644
--- a/dev-lang/php/php-5.3.27.ebuild
+++ b/dev-lang/php/php-5.3.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.27.ebuild,v 1.9 2013/08/18 03:04:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.27.ebuild,v 1.10 2013/08/27 15:01:26 kensington Exp $
 
 EAPI=5
 
@@ -92,7 +92,7 @@ DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
@@ -100,12 +100,12 @@ DEPEND="
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
 	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
@@ -142,7 +142,7 @@ DEPEND="
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
-			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -152,7 +152,7 @@ DEPEND="
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.4.17.ebuild b/dev-lang/php/php-5.4.17.ebuild
index efa0bfab4cfd..24ffbbda97e1 100644
--- a/dev-lang/php/php-5.4.17.ebuild
+++ b/dev-lang/php/php-5.4.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.17.ebuild,v 1.13 2013/08/18 03:04:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.17.ebuild,v 1.14 2013/08/27 15:01:26 kensington Exp $
 
 EAPI=5
 
@@ -92,7 +92,7 @@ DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
@@ -100,12 +100,12 @@ DEPEND="
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
 	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
@@ -141,7 +141,7 @@ DEPEND="
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
-			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -151,7 +151,7 @@ DEPEND="
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.4.18.ebuild b/dev-lang/php/php-5.4.18.ebuild
index 1229dfb6a964..39542c68a4b1 100644
--- a/dev-lang/php/php-5.4.18.ebuild
+++ b/dev-lang/php/php-5.4.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.18.ebuild,v 1.2 2013/08/18 03:04:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.18.ebuild,v 1.3 2013/08/27 15:01:26 kensington Exp $
 
 EAPI=5
 
@@ -92,7 +92,7 @@ DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
@@ -100,12 +100,12 @@ DEPEND="
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
 	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
@@ -141,7 +141,7 @@ DEPEND="
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
-			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -151,7 +151,7 @@ DEPEND="
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.4.19.ebuild b/dev-lang/php/php-5.4.19.ebuild
index 904fe3208167..5c5d1cd25dd6 100644
--- a/dev-lang/php/php-5.4.19.ebuild
+++ b/dev-lang/php/php-5.4.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.19.ebuild,v 1.1 2013/08/23 11:22:10 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.19.ebuild,v 1.2 2013/08/27 15:01:26 kensington Exp $
 
 EAPI=5
 
@@ -92,7 +92,7 @@ DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
@@ -100,12 +100,12 @@ DEPEND="
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
 	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
@@ -141,7 +141,7 @@ DEPEND="
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
-			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -151,7 +151,7 @@ DEPEND="
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.5.2.ebuild b/dev-lang/php/php-5.5.2.ebuild
index cb956dcfa735..e5cdd4019e74 100644
--- a/dev-lang/php/php-5.5.2.ebuild
+++ b/dev-lang/php/php-5.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.2.ebuild,v 1.12 2013/08/23 16:08:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.2.ebuild,v 1.13 2013/08/27 15:01:26 kensington Exp $
 
 EAPI=5
 
@@ -83,7 +83,7 @@ DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
@@ -91,12 +91,12 @@ DEPEND="
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
 	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
@@ -132,7 +132,7 @@ DEPEND="
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
-			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -142,7 +142,7 @@ DEPEND="
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.5.3-r1.ebuild b/dev-lang/php/php-5.5.3-r1.ebuild
index 710433ae54b4..e7678d8e9c2f 100644
--- a/dev-lang/php/php-5.5.3-r1.ebuild
+++ b/dev-lang/php/php-5.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.3-r1.ebuild,v 1.2 2013/08/24 14:06:31 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.3-r1.ebuild,v 1.3 2013/08/27 15:01:26 kensington Exp $
 
 EAPI=5
 
@@ -83,7 +83,7 @@ DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
@@ -91,12 +91,12 @@ DEPEND="
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
 	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
@@ -133,7 +133,7 @@ DEPEND="
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
-			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -143,7 +143,7 @@ DEPEND="
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-5.5.3.ebuild b/dev-lang/php/php-5.5.3.ebuild
index e07630534ec5..923c084136bf 100644
--- a/dev-lang/php/php-5.5.3.ebuild
+++ b/dev-lang/php/php-5.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.3.ebuild,v 1.1 2013/08/23 11:22:10 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.3.ebuild,v 1.2 2013/08/27 15:01:26 kensington Exp $
 
 EAPI=5
 
@@ -83,7 +83,7 @@ DEPEND="
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
@@ -91,12 +91,12 @@ DEPEND="
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib
 	) )
 	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	iconv? ( virtual/libiconv )
@@ -132,7 +132,7 @@ DEPEND="
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
-			virtual/jpeg media-libs/libpng:0= sys-libs/zlib )
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	)
 	unicode? ( dev-libs/oniguruma )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
@@ -142,7 +142,7 @@ DEPEND="
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
-		virtual/jpeg
+		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )