Fix linking failure with harfbuzz-0.9.18, and add a subslot dependency to allow for automatic rebuilding when 0.9.18-rX is subslotted.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 57 insertions, 15 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 5abb04d7f74a..a64ef224c57b 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.205 2013/05/28 05:23:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.206 2013/06/06 05:09:38 tetromino Exp $
+
+  06 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-2.0.1.ebuild, webkit-gtk-2.0.2.ebuild,
+  +files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch:
+  Fix linking failure with harfbuzz-0.9.18, and add a subslot dependency to
+  allow for automatic rebuilding when 0.9.18-rX is subslotted.
 
   28 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   webkit-gtk-1.10.2-r300.ebuild, +files/webkit-gtk-1.10.2-gcc-4.8.patch,
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4a0a0b6f7e1a..e9fd78dc25e3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -31,6 +31,7 @@ AUX webkit-gtk-1.8.3-disable-backtrace-uclibc.patch 1007 SHA256 5f4f640991a1822f
 AUX webkit-gtk-1.8.3-libdl.patch 874 SHA256 4cc477deb430915a60af6267e0400ea6210e9febea775d6d231aac6c408867b2 SHA512 87cfff6f72d73cf8ca2b9da3d59bef292f97688063bb9c6f8c8b3e0eb4ddfa0242300b5d35e5c6a41d75ee2a0f1e4a2e78a9fee6e702dac619401c8a92efaf99 WHIRLPOOL 1457c87606f9ace7067e93e43a6575e5ccb912ab1fe080f8c868ccbda252e293d24be20ed7e9bfc256cf10caa9441766f82cd4808688eb6ac4336ef646ab9b85
 AUX webkit-gtk-1.8.3-spellchecker.patch 792 SHA256 5c68f2c4052f660ab34476006f5fd600c6ba5427079ac83e08e787b7cbe6598c SHA512 a182a22b58aaa9e5efda5b23851d5c224370e03835ff76353f54fceabdb9dc2244c324cf0d3d5069ea8773e32008e671cdc7921846233397d7d9ec44fdf63118 WHIRLPOOL f7060b8c6aa88df85c583c65635a1a1845e1d0a0442d554a618d42759c13b4dbdb23dfb4dd18094915a42bfe8f90399ea84375b4ae6b3d94042947cb6367b0e0
 AUX webkit-gtk-1.9.91-libdl.patch 691 SHA256 a4da8aaea1a14ab9e67bcec01c666c074cbdc0785af2d2655a6cf6b1ff67072c SHA512 a7d3ab2a2065d18b16d5758c29d63543da1902f71dfb641e5b7d5db0a50c90b443026368b24b9f601d2f63f9eaaea67d3f686492d49068c2b013ad1cf6cf76a9 WHIRLPOOL 7808838f8d5389adb703dce234fa28e2da8266b57576fc70c37d11ea22af3b21a68f0e8600d237fbfc645a2796a7694e75c176035d57df75402f2adef690c4f8
+AUX webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 1406 SHA256 370a19c4d2f38064947f3ac3f3d113b1fa17b2cf18e161d709c5b0cd7f929203 SHA512 9bcf69ed673b288189b52ee362072e874fda44e99a6cd9feef8bf2e89c8a4e4d1864aaa7e4f71bcdd21c34d7eb6f946d54d7ccf27a885ce60d1fb4a1f61fa480 WHIRLPOOL 6f532823a1249ddea17ef09a6db181af70f0355c6fcce603f2f59ad28f269e705874b65c432b4e82893ebd0a55fe0084723b5533adc02b3bc4ff97c0cee55055
 DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7 SHA512 4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f WHIRLPOOL 25b8ce9a26f2c475a5e061bedf75d835ae5a907a92628e11cd9ae5962fcacbdfa6a0181ae7730fb39e4544615d2d78741025b17fa202f3d42d0f3956fcb7c3f0
 DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954
 DIST webkitgtk-2.0.1.tar.xz 9841872 SHA256 6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb SHA512 9924397cb35a73ed43831117fb47017af1b05220c09760a2d323fc788cd0f24625d48f7e638ddd574264e2af0ace0cf1041713629d24256a5fb25c04993b045a WHIRLPOOL 6b6e2dc91a55eeba4e2c61085af45a1e77a3a5145ab2aadbe1d42552c0bc25013e9f623ed942f940de42dc81e2e520cd60248a87e653a64095788c27a58c328e
@@ -39,18 +40,18 @@ EBUILD webkit-gtk-1.10.2-r300.ebuild 8466 SHA256 da9799204c216c4c52255387d1863cc
 EBUILD webkit-gtk-1.8.3-r200.ebuild 8607 SHA256 7624f6e7fd1ec7312e663165ddb2d1ef559a84de384948547240fc99f1d900ec SHA512 7785ace0b34a623e54b9b10715d8f860bd41fd6a36b68ec69221cf1ae6739286840e05a5712f0f3b0fd7a3cb6b2df9d30dc5fe4d14fb172fd44dc5751087c410 WHIRLPOOL 18f6fe225528c34aa8fdbbc4fc8f9a2efb8a4e9f04b8d4ce7d397fb51f30037a5c1b9d39184156ac8e5434f719df5a0141b0069437dcddf67bdd54734b24b958
 EBUILD webkit-gtk-1.8.3-r201.ebuild 8878 SHA256 e68ca325067edb331d71a44b6c097fc9a701e201919b110ba2875a730646cfc2 SHA512 6303953e539133a52942d819103203886931232cc509861f595e6a8cd6f48c4e96a8a227b6bbdae34b4a40d6d0b14bc870b3c61d7fafb69c7bacc98ff69617c0 WHIRLPOOL 6da40a95521dcf189e8a1d2bc27fee2e2634f9689fa8a87f6b033ce121795b5a5086f4468557b0645d76ef1b0bf1f9e708d5617495fbf9518741d2b3747968e3
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9023 SHA256 25a16bd35a80572608e1bc28b31937f54ff2b764f5843701bb95461a75ef7a35 SHA512 cb89ebfd6487df70e4e478cc1e60d250efb257745e4f176fe2192e0acd0e3c8cef3cd779ab54c0183fbf928475614bde2afa5475de36f9c07cbda5db16e8731e WHIRLPOOL fd18d56cc6f11f8c8cf475c84f7b23cba0fb31e0adafbd0f2f7cfa267a01e6cfe7b46458f18e76aefd550dfaea08f103b677ba3fee82db0819ce7e4f28530a57
-EBUILD webkit-gtk-2.0.1.ebuild 7963 SHA256 8a42647018f2c963b98e3bda22f24c618c628e130aa7b885e18166bef2440dd3 SHA512 7d2b68514d7b8640d0d5220e7361390575c57ef35760525f32125e8db87c728e2c6d85d861412c0373732ed44243b3dd9993b6cebc44421da2115bdf12997bc0 WHIRLPOOL d899dc43fbad5b11c1c59bbc1fcd863d21be4c03e4de4879484eb6eb12a76caf939383e7df8976bac399f4512626289d3ba358cf28fd1cf44eea0722d497af89
-EBUILD webkit-gtk-2.0.2.ebuild 7963 SHA256 a80c276caa362e39fa3375802686631a9b2de7875ea26a0d92338764d9ed3a95 SHA512 86e58b42e2f0ffe176bf3977234dcb1b5fa57204fd82a488dc7b99f9fd6511bb3d8b0d2f5222ab5eb38fb9f926ea046321a3ff569ceeb549a16a7017e97b3193 WHIRLPOOL 641dc46e59c15d34c6c4039fbec7925100b3bec6975958fcf82f6a166b45bbb8dd2aa236c53dde842f9fd1ab7020858d7242f37e5f5a7f2d27d06839e7d21e89
-MISC ChangeLog 41794 SHA256 35ef012b089db23c3ae1694a17ac5330ae2151f99fcae7beeb6ee4324309a86e SHA512 9d3fb526d38e22ea2e999eb4a8746ef3c8647f93934ba824aa939189c461b5136ac78f59cc2886bdf3546e855da29c641b71b43eae371626555fabc2983a561d WHIRLPOOL 1af82215da1da9af4d25c67ec2fcc66c226b735612b41dc42f0fed504be421ff19f4e4b71a404be9785734cf93e54fc68726d351511d9f36649a0a0a683efaeb
+EBUILD webkit-gtk-2.0.1.ebuild 7969 SHA256 e0d17186fd3910b0f695929da6b4866c7f225c07000e147bbf15b1708fba98fa SHA512 b345864bccc45fb1b0bbf60d8176d41ec65d152e0e2229afaa2003722dff2af9f1cf1e4f1cb6b3b9fc1623845ef1c99eb2853ea21967ae1c81d52b74a8e1e8c3 WHIRLPOOL 85b0a1e59ccd3b650fd93d245cb777a42e398dfbd37cd9aecb1abd9a24a7cd33f6702033af50c82f77c446e9954f813132eae571a689d9208eac7dc4862347bb
+EBUILD webkit-gtk-2.0.2.ebuild 8072 SHA256 a1566a43fbf54cb6e690017e2c8447ca55fa1b1c72ad9082fae89af3406554f6 SHA512 9833f185f174f6a79ae6d5e6a97add470ae6faf6ec86544baad9faae1a47d7d3e8eb5d38291e179cb333dfe6ac649af0465695458008beec23e76008658d6d47 WHIRLPOOL 726f84d9d1923c6d9b733ad385a609c6c199e433ab0443e423d99578540e7b7e35d50f4b4c4c41c45a9d3607a4f17f350361cc3f24c42c037b03198cff3a76d0
+MISC ChangeLog 42094 SHA256 1d22e0c068e3a90bbc15ed764ed3ba8fd8338f7eaf7aaef00455fa86f7a8a625 SHA512 86c576411e22cf119d1fe85fe981517367584bb904524bc5d21e51095fe9f15e293f155091afd71c8e993e4a8b504b6a87936064823532897ed12394bce1a6d7 WHIRLPOOL 195bc7b577b284e5087550ccd080bdfd5c5ef8bded86b191e419309849d9bf18d2d42b179ccbd840af768cedb1ee69844a0a34e826cb784ed9e488b568c8d6d4
 MISC metadata.xml 569 SHA256 7680bd9bb6771ea8bc643d5969b074a024b40548f23aa24dae05ecebe3d01983 SHA512 168d9cba348426bdaa2f8d1686bb88fe0e645ae2812de308dc8e186ef735f75c016538d2feefd6f2efe854eb63ea995a9ce39ffcda7c8ca104f7550f921dd8af WHIRLPOOL 2f803a29c30ebc0b202ce619c4d894e2a17ad6ca1002372d8e366eae2e5448fdab592bbc9edb1fcfd02ac8be95de38e0af8e0354559e53fc3b572387033e7591
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRpD9PAAoJEJ0WA1zPCt1hSmQIAKIyPr6e4q0zcC+0JsRH/iGY
-fffWiFL13ioNG/CFjNWlwJY/1/cgHYS5HCxG9TR9f/b4gmNBPZyFDxLbwTq/0nUv
-VJbTG3gXX3+4PWAWa+UjTp68DIVOS9JLlRuT9GobF+buNGm1rxepV1yJhoIU/S5a
-lSCQTp/pTaKY4qUgGUmyB0/bH2j8ZDobuQBw2YQgIoKNPv4OQL6tSN+vwaewCRlT
-eQMb7sVZPQ2DPLgCnGTLsyBdYLuqHIykW+WjnbCM1hUK5b7YXbjyrNb578rQfGgK
-ic9tI5i0S1reCLW4XK2la6M9Ndlh85w0FAo0IKkjxYppt8LmZAJ++Zwb7dmjRUo=
-=k3e3
+iQEcBAEBCAAGBQJRsBmTAAoJEJ0WA1zPCt1hSMwIAJsvBfciC0PxxZ0Lxvm3nc5w
+byvTNjuSKyIM6FLYOVeIt5lIASLkYeudwPX2QBIyxfYGXM2OPYw991jteQjzIFkN
+tJEVTEBdjJN9eRl+Hpga8zvnKwIbw7XpkdK5HJ6XhE8kQ9DxclXc99WTbDo1vOVW
+YjQKjthV+26MVwgK/2+45OiDNly/c2kcBTBwdI69lvMM2nIHeIckxj9K6ujdzhIf
+JmSOpb4HRloJejJ5pxX0syx8YejYSfu2DRP5YJcb2Z9FZMu7ws7xcTKtBtNesVQa
+o6RIqrb5N1c/vSZFmo9hbkh+RRqVSzdpXjX4P92wn+JVaSbWMPxcOLXTBVqkgb4=
+=KYnj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
new file mode 100644
index 000000000000..df054556ad60
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
@@ -0,0 +1,32 @@
+2013-05-30  Alberto Garcia  <agarcia@igalia.com>

+

+        [GTK] Needs to check for harfbuzz-icu

+        https://bugs.webkit.org/show_bug.cgi?id=116978

+

+        Reviewed by Xan Lopez.

+

+        HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we

+        also need to check for it in order to get the necessary flags for

+        the compiler and the linker.

+

+        We keep this conditional for now since we still want to support

+        earlier versions of HarfBuzz.

+

+        * Source/autotools/FindDependencies.m4:

+

+Index: /trunk/Source/autotools/FindDependencies.m4

+===================================================================

+--- /trunk/Source/autotools/FindDependencies.m4	(revision 150962)

++++ /trunk/Source/autotools/FindDependencies.m4	(revision 150963)

+@@ -376,4 +376,11 @@

+         [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])

+ fi

++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.

++# Since we support earlier HarfBuzz versions we keep this conditional for now.

++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then

++    PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)

++    FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"

++    FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"

++fi

+ AC_SUBST([FREETYPE_CFLAGS])

+ AC_SUBST([FREETYPE_LIBS])

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild
index b5f149120af5..ed4aea5f4c38 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.1.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.1.ebuild,v 1.3 2013/05/01 09:31:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild,v 1.4 2013/06/06 05:09:38 tetromino Exp $
 
 EAPI="5"
 inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs versionator virtualx
@@ -25,7 +25,7 @@ RDEPEND="
 	app-crypt/libsecret
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	media-libs/harfbuzz
+	media-libs/harfbuzz:=
 	media-libs/libwebp
 	virtual/jpeg:=
 	>=media-libs/libpng-1.4:0=
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild
index 98fe23a22a11..4826e6a2f6b7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.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/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild,v 1.1 2013/05/15 11:53:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild,v 1.2 2013/06/06 05:09:38 tetromino Exp $
 
 EAPI="5"
 inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs versionator virtualx
@@ -25,7 +25,7 @@ RDEPEND="
 	app-crypt/libsecret
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	media-libs/harfbuzz
+	media-libs/harfbuzz:=
 	media-libs/libwebp
 	virtual/jpeg:=
 	>=media-libs/libpng-1.4:0=
@@ -150,6 +150,9 @@ src_prepare() {
 	# garbage collection test fails intermittently if icedtea-web is installed, bug #????
 	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
 
+	# Fix linking with harfbuzz-0.9.18; in 2.1.x
+	epatch "${FILESDIR}/${PN}-2.0.2-harfbuzz-0.9.18.patch"
+
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC