Pull in correct SLOT of libjpeg for headers.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4868F14D

5 files changed, 24 insertions, 14 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 64ab0ab70ac5..cf4f6bf47909 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.218 2013/07/24 05:31:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.219 2013/08/05 09:48:55 ssuominen Exp $
+
+  05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  webkit-gtk-1.10.2-r300.ebuild, webkit-gtk-1.8.3-r200.ebuild,
+  webkit-gtk-1.8.3-r201.ebuild, webkit-gtk-1.8.3-r300.ebuild,
+  webkit-gtk-2.0.3.ebuild, webkit-gtk-2.0.4.ebuild:
+  Pull in correct SLOT of libjpeg for headers.
 
 *webkit-gtk-2.0.4 (24 Jul 2013)
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e9a39d0a7811..a9987042ac19 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -36,18 +36,22 @@ DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce712
 DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954
 DIST webkitgtk-2.0.3.tar.xz 9845948 SHA256 9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b SHA512 096045f471525fce871220234bddfc3d266316747b2e32272ace5ea4c02849ce69f393f784615ad834cd2933949d797b2fb5ec62c36ae656fd6d6b84dc251493 WHIRLPOOL 061e19f753ccdd83cbe48c3f84653d73caa1ff65ed9e3316c530c1a16d489f79990a0a8a1d7b73285a579cecf0b645ba9409b6351253b7ee7bda69ce1344b7b3
 DIST webkitgtk-2.0.4.tar.xz 9849620 SHA256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f SHA512 d5fd825d01f700df8eb7d9021673a2a551cb6b4ba9e35ad0038e3d4e76322c0e751e1cd4cd7293a3388d58b8cc18169fec75044412a428c886376609d52fc3ce WHIRLPOOL ce42703d535b97e9e65bc05eacf462292ddf0434da3f056698fabaab007e53a5ded8c02a31ce9c289e22dcf73308daad4b3ca54ef1be7904035e2482abea6ce1
-EBUILD webkit-gtk-1.10.2-r300.ebuild 8619 SHA256 38b0924e37e82e075a9104bca1955e3a318e55ecf2b011c0026b813fc2700daa SHA512 8c073d00659cf8a52321fd28bb40c26ceaae91c031f2ae7c3894031480d703ad7fa1c899591dfb74c2be6c6757c3c9f35f28949f7223e97f26b7ef16377fc050 WHIRLPOOL 5e524ab9d7a2b5458752eb5696c7e7b073c07ddd16039cc34b6b31ea717c913f209962ff43dff8e737fd7f91d87d18a642d2101dfda49dc3f92a4476d714463b
+EBUILD webkit-gtk-1.10.2-r300.ebuild 8621 SHA256 226617d6fc97a7cf5dd428ad80ba3c66a900cfe247ae41c8f0c541392b575487 SHA512 8afcffbc5598f8a5f4230937825757ffffe1a0e0a98aa4a06fc3f367e5ce20b70c9baf12a647a07a321d24455a17c61c6bb2064657664ccc4cd0c09d6aeccb83 WHIRLPOOL 9feccca62b4b913a5669233d420042c0905f0c14d667a2fd418d5820d7c252dd2c284bc2b514231e20faec0f6e459e57dbb7b53e0743f08835d8e09b296f902f
 EBUILD webkit-gtk-1.8.3-r200.ebuild 8633 SHA256 1611b448c9e6a679e0a6d612cc3275a47fc932194418d3e17a7c76636f0168eb SHA512 c7330dddf75c7e2dae17c96675ccbae3e03f0cce544ea1f29009342eaaedba4fd1db79a76b3713a5dae966e866b3f8f7edab57ed9f826783df1ad58d9b628d06 WHIRLPOOL d26d56fd2175bcec3661738a481708ce7ef1bee00825ce532af36982247ba1329e51510153269ca81a6fce0994a7095be1f9c0ba09f21c493fbf5542fdd4638a
 EBUILD webkit-gtk-1.8.3-r201.ebuild 8892 SHA256 52d8c1154220396d5d672eb416e7d02be3c88010e97714c47514ef82e86436c5 SHA512 f707fc65535b92692aab1a9a31fdad501d0fc0a541b1f756911a79748489610089ea18fbab91efdc3951c086e6904cba68b46f0a1297f0d4b936d9ba3ce59d21 WHIRLPOOL 66a04443b30a415f10d7cc8f35ab5437d2a2dfa838b2577ded2a995badf363d4639c1278d3b22cddfc237165add5b07290c23fb65103e689e734e66ec79acf65
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9047 SHA256 4250c97358a77c15bf0a4e50426677cbc7663d5fb0551c182b87b6a9138fb9ed SHA512 030f5eed1747e461322e64a04bf436228daea6500c9742cdd190328942efb142d2d09b7a11f7ec1721bf04341b20a2a103e2fdcd0057d295b2c77e5b683e0899 WHIRLPOOL 4b37b2fed6a35df03e58f988a6c7f37535d1d5ab226502fd3a750069a2e05226c0af45a54853c5c7caa70e6c089cce5ddcb65181e463bc86f8717716a8817177
-EBUILD webkit-gtk-2.0.3.ebuild 8216 SHA256 21b2e4f87be2e7a75593145b6cd5c3e5527db4b011b4ce80f7547759a468c738 SHA512 da82cf542195c5746b2fdaddfc1db828aea2f6f88540ab73a683cda8d797d6b2cb58732d6991f8615394b7be0c41fb22847b06d70f02cc86db619ae2e51ba69b WHIRLPOOL dfbe29f9df363656dc4b14df69a085729b007e006869e40d640bfb137923a284a1147d2bd56e278712b36fbeef2810e70f05cacabbeb2a853b347bca9272ea12
-EBUILD webkit-gtk-2.0.4.ebuild 8119 SHA256 b40b9709e56bae0716d248cee10a6eaced5d02985291854446da0af16700cf1d SHA512 8ba85189344f2a9db3658d5cd60efa79fa6da2b8c94d6996df52eee4382cd3c8cfc25d60146239ebcf523fbbc0ec69d4c7fd296ac11e49eebd73b61d8cff6b13 WHIRLPOOL ba73e28c669f4142c01a0f952ae7f7b9768f845e8e4df36560382f83e3da06fed4279303e52c207da7c33e8f22beb7ce49402456443f6899271d85dc9bfcdcff
-MISC ChangeLog 43898 SHA256 d7dc47a948f3906fdc0c24a868ec84c608c06371f07ddff9ee2826fd0e826326 SHA512 0a28ca0042d99a3f3e4fd439333871d3e51cf929463b21310d8c72d2a4755a63aa82285197ee6702608fc108b8502d79742f9032ad55e6eae6affa1820d9fa63 WHIRLPOOL 901ba6dc5b3c05540512bed0422b3e375a6133723a131e91c7a70e3e6de4f06a8d8e2e2dc4712591344603e7c269b56047631a293c3d56103b66e8182ab0104b
+EBUILD webkit-gtk-2.0.3.ebuild 8217 SHA256 69bc4f618042ae3fdb23326e190df01aac0aaf987a8e13c5b96e03cbeda5645f SHA512 cbf98934085a9a06c8609e9fbfacdc48b83936b64194c746415fc6f800dfe32caffc91dc340ada6e7a8b9692c1038cf7913586861847b135edb940cc789bf629 WHIRLPOOL 743a87d60b703385fe78f60f07a149eacb3f0e5db71872caf5eb3aa6347bb7921b4040e9987d4a91dedd590925efafbf468edf8db0b1f0598ac619f59ebbda21
+EBUILD webkit-gtk-2.0.4.ebuild 8124 SHA256 2b6bc10a3887bda40a0abc34f3cc409b87f1152aeead45b96929aab57fd3a851 SHA512 b3f7a185af91b62fb11c260424dc71ec606ac52eac7325739723476cd8e94f7514ff0190d52335d6e4757ec4f07e7056f71e7e87d3b0cc3319ccad68c7a7ea12 WHIRLPOOL 0e75178c72d6ac40cc8e869be1822fc6d356bca3967b05b6b032e8366038e0319c1bef1660d8b7579564206c4441a285caf06d159d62c473c7fa2236b2b50af3
+MISC ChangeLog 44181 SHA256 f3f6b191bcbbccd5c6501d86bb7cf0b47f2b43e048815aa0ee0551031c1e395b SHA512 aafe5416661b02232301ab902b80b21b2d7a0105a629b1eecd5d0a174c7f4ea81e98ab4f5eb3bfbff2155196d58c3e6cfeaed286b9bd813054a38c2b870ad809 WHIRLPOOL 4162570063d61bd4f242168218c293d88176804048883b3aca053741ae2c1003896e82719ae7bb8f55d5cde957e1bd43700a95bde544a74069d9f532920dfdc9
 MISC metadata.xml 633 SHA256 99b9115b4d9711d65a7fd50cc777c4b8b49147104bfa23a23a46eb478742d338 SHA512 bf0a77250072f9c44a142030574cdb223de5f17c0fe168c1e848065043daddcb9e38eaddd8bd85dfa925bfd22cf37386a1532c4fe272a1aea4d22d5e46981510 WHIRLPOOL 8bdb0cc7b4659e177ceedca853cdc5b5bec4daa4d9144d32410ba584cbfa6ee2dd09a75211c5ea3f1ea2f5c180e10b3cf6e3e8583c0a14bd2095c604fbbc4b60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHvZqwACgkQCaWpQKGI+9TLYgCfUQYMhAxms3LvVylMik7Ax3fU
-b0AAn1Hs7aDPRYuG+ujyk+RyebQJlY/y
-=R8Tc
+iQEcBAEBCAAGBQJR/3ShAAoJEEdUh39IaPFNYlYH/jOa22ipTQnPSZZGJFFeKdZK
+3IPigh3PAfAGXYKGw412qja8xppGsEVr281Quh+lB0U7O9vJvJUmPQyPyLxvqPTP
+az6Xk7uHrqXjbnDuhGsq9bErAyg0et/dLFv50ctgbmswHv50AgpRqbvYw0qOUOdU
+XLMMDRwLoM45wrg0DU1CJ5V3WerNnPl0tpyHprCeFjFM9vkDAeEx+rEADSmJABLQ
+ejYm/Gx5InGHf9mAxP+RbJHlO87QycoSHJQIn9maVyWztNukfSCIolXGyq/B4xl+
+zIXBp+kLRyuSyEgSH1fgAzZ2jRLJh1CzdoN8O+rX/6ez6VUD0fkrey3G0cLeQx0=
+=eZrT
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
index 869480739d60..59fe544bfc82 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.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/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.9 2013/06/18 06:10:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.10 2013/08/05 09:48:55 ssuominen Exp $
 
 EAPI="5"
 
@@ -27,7 +27,7 @@ REQUIRED_USE="introspection? ( geoloc gstreamer )"
 RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	virtual/jpeg:=
+	virtual/jpeg:0=
 	>=media-libs/libpng-1.4:0=
 	>=x11-libs/cairo-1.10:=
 	>=dev-libs/glib-2.32:2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild
index 0fa84f42ea4f..b4b4275c5bd7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.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/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild,v 1.2 2013/06/18 06:10:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild,v 1.3 2013/08/05 09:48:55 ssuominen Exp $
 
 EAPI="5"
 
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/libxslt
 	media-libs/harfbuzz:=[icu(+)]
 	media-libs/libwebp
-	virtual/jpeg:=
+	virtual/jpeg:0=
 	>=media-libs/libpng-1.4:0=
 	>=x11-libs/cairo-1.10:=
 	>=dev-libs/glib-2.36.0:2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
index 59014fa51014..aad31cd759f2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.4.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/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.1 2013/07/24 05:31:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.2 2013/08/05 09:48:55 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-libs/libxslt
 	media-libs/harfbuzz:=[icu(+)]
 	media-libs/libwebp
-	virtual/jpeg:=
+	virtual/jpeg:0=
 	>=media-libs/libpng-1.4:0=
 	>=x11-libs/cairo-1.10:=[X]
 	>=dev-libs/glib-2.36.0:2