Use virtual/jpeg wrt #327487.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

5 files changed, 19 insertions, 14 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index eabbf4ca524b..92e2b8cf8c1b 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.82 2010/10/17 15:00:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.83 2010/11/07 21:13:34 ssuominen Exp $
+
+  07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  webkit-gtk-1.1.15.4.ebuild, webkit-gtk-1.2.3.ebuild,
+  webkit-gtk-1.2.5.ebuild:
+  Use virtual/jpeg wrt #327487.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> webkit-gtk-1.2.3.ebuild:
   alpha/ia64/sparc stable wrt #324077
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7c8fd9fc0041..00d3e989ecc9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,8 +5,8 @@ AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b549
 DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
 DIST webkit-1.2.3.tar.gz 6740030 RMD160 41fa194de2865867dbf7d1156d0962a7580f2275 SHA1 88c38ebeba187a062272b2aa8ca2bbd0bbb86306 SHA256 ff70b25ea8dedc0031f29f2ea8d9aa226bfa65ebd2f12772390f4e2845306fe1
 DIST webkit-1.2.5.tar.gz 6727977 RMD160 7510af4c5d15c06adf984a090a9e9550f5ea7147 SHA1 2cd50e62a0c94bba8cc8a8466ea16fac1f9fc1ce SHA256 b08a69a9ccbd84b2e23a94caf7eb5cfc390bb6cef49a4921b5eb11860b329d41
-EBUILD webkit-gtk-1.1.15.4.ebuild 2550 RMD160 64a87a310fe47ccb336c66f39b3b86a1fa869d14 SHA1 193e316fe1ba246e32c550992782f0afa360bf46 SHA256 bd88cecc6710e5d52954f5c990ee322b1e18b5b47d04164789b346d2f00ff5c3
-EBUILD webkit-gtk-1.2.3.ebuild 3222 RMD160 a1d2563c4bf9ecf589e128bd89487ffb5c1ea7e0 SHA1 eb8daf7f5d253c6f6db5eadcbd56c996c705a864 SHA256 257e825f9209e071826a72060072e91b4b8ca52cce0a742787a277305073bcc5
-EBUILD webkit-gtk-1.2.5.ebuild 3035 RMD160 fe91d9399dd7ff38d91da36628aa849f6c9f1a1f SHA1 d147dce8d80bc9b096aff9225041de5c34af84f1 SHA256 c23abd3fc1aa4d64d737af5256ac57652dac0a384e0e52a7e392b4e28983cfc8
-MISC ChangeLog 17046 RMD160 2a0f3fe145a7acfc82fb5799644da36e1e23be23 SHA1 2baecdfa7b158222850f713150256356c0aa2202 SHA256 316930691ad7285917e136875d997ea315c47283d617b78e6d73ced9b5232a1c
+EBUILD webkit-gtk-1.1.15.4.ebuild 2557 RMD160 771413d3807a9da4522f483f4e838b8120177175 SHA1 7d71f4cacd1ebf7d8066f4e9e3cbb055c5515e58 SHA256 f1c9236bb0cefb171230c5b6852f2ce96036c75e25b45bbf262f81475386f89a
+EBUILD webkit-gtk-1.2.3.ebuild 3225 RMD160 1b77c8ffe7a7670f4b3ad7a47531589d3f4ede09 SHA1 d9455dd4b8212de85f15197750959b7d28d58cd1 SHA256 c986810420fb57c811bfb548201749df24d74bdd2cd73bbe7490f2a4d05f82b1
+EBUILD webkit-gtk-1.2.5.ebuild 3040 RMD160 2fdda6862b67bc47fe6564202abba70990c95ff9 SHA1 e1576e1573572004ca8283b9c88a44c24b41f32d SHA256 14d54cf46ee10e7982637174061d68f2441cd245b65b9490b0dbbd4f35763331
+MISC ChangeLog 17217 RMD160 2e04c256a0e8ac017c91d6df76b5df090d75d327 SHA1 ed11caf35bd6eaa88961b5921c8779b89e25b77e SHA256 f5b5275f99c35beb5158a9543569c40e4b0ae29d7f178632735d0481662cb3c7
 MISC metadata.xml 415 RMD160 4cf82e15e7b1dadf71e0b4549a01b41f508d36e2 SHA1 f74ebd33bba8b57f7714e7267e2f13f97277bd38 SHA256 7498f904ea7154281d4082a83ff5a47647bdfca09ee3da630dd8e6a1ee6b0e1e
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
index 7e792f5e911c..7349b931547a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.13 2010/03/29 22:28:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.14 2010/11/07 21:13:34 ssuominen Exp $
 
 EAPI="2"
 
@@ -22,8 +22,8 @@ IUSE="aqua coverage debug doc +gstreamer +websockets"
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
-	media-libs/jpeg:0
-	media-libs/libpng
+	virtual/jpeg
+	>=media-libs/libpng-1.4
 	x11-libs/cairo
 
 	>=x11-libs/gtk+-2.13[aqua=]
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
index 2014d3c92390..490b8d014658 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild,v 1.7 2010/10/17 15:00:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild,v 1.8 2010/11/07 21:13:34 ssuominen Exp $
 
 EAPI="2"
 
@@ -25,8 +25,8 @@ IUSE="coverage debug doc +gstreamer" # aqua
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
-	media-libs/jpeg:0
-	media-libs/libpng
+	virtual/jpeg
+	>=media-libs/libpng-1.4
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.13
 	>=dev-libs/glib-2.21.3
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
index 2f9ff27a72ce..f8f046b5456c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.1 2010/10/11 13:47:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.2 2010/11/07 21:13:34 ssuominen Exp $
 
 EAPI="3"
 
@@ -24,8 +24,8 @@ IUSE="coverage debug doc +gstreamer introspection" # aqua
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
-	media-libs/jpeg:0
-	media-libs/libpng
+	virtual/jpeg
+	>=media-libs/libpng-1.4
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.13
 	>=dev-libs/glib-2.21.3