Version bump, drop old

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 34 insertions, 41 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 82ebb3866318..64ab0ab70ac5 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.217 2013/06/26 11:55:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.218 2013/07/24 05:31:22 pacho Exp $
+
+*webkit-gtk-2.0.4 (24 Jul 2013)
+
+  24 Jul 2013; Pacho Ramos <pacho@gentoo.org> +webkit-gtk-2.0.4.ebuild,
+  -webkit-gtk-2.0.2.ebuild, metadata.xml:
+  Version bump, drop old
 
   26 Jun 2013; Agostino Sarubbo <ago@gentoo.org> webkit-gtk-1.8.3-r201.ebuild:
   Stable for arm, wrt bug #473112
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c8f015068ae4..e9a39d0a7811 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062ce98441a70a5b2d2f1e042a SHA512 8a0e5ae51ab38f1e27e18cc7a7166267bdb8d9ea814874ddbfc97c5022c555d23cffce496219f0827f9eac32a55d5d95ac353eb56b4439f915a8c34683a1989d WHIRLPOOL 937e28e599f50535f6c8461acc10982719856c5b760d5d592d86819601bca5c032b405f215ff525c0278ce6563704c385cb942e3e21093112dce33d0b280a72c
 AUX webkit-gtk-1.10.1-disable-backtrace-uclibc.patch 1056 SHA256 3d899d5d93e4d5c96c7fe1f82ab96038b8a3add8cec001f023badb1a21eebfb2 SHA512 09c9d3f5dc64d1389279d8fba9027772c9d718ea86ec9649deb01841d5b45930ee5fe9bbc61829cb7b2df0e4a05b8acfdaba0dc08b2786eb9c5e39626fe54b98 WHIRLPOOL d7dc3b235465bc4c96eed6d2b79ceb579b7ed6958b95faeab5e8421a286e03bef48bcfb963fa3cd5ef1375a75749b458227d1b4516dddfdb49e15eee1508bb32
@@ -34,30 +34,20 @@ AUX webkit-gtk-1.9.91-libdl.patch 691 SHA256 a4da8aaea1a14ab9e67bcec01c666c074cb
 AUX webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 1374 SHA256 2a1b197842fc36607e68cf35fa222eaaf780064cb17bd40cf318ab1f3693f40f SHA512 eeddbc8cf51727b6f69c06f215a58b73704a626f8c0dd05370bda988409ad8b161a6393baafa9af65fd3ef961f9c559280af7626c41f5689684bba79a8570083 WHIRLPOOL 884b5bb0c483fe78bf73ac5a429953a9b084700068bfd923a86150c03ebe4bbd5cf6101c60654f82da19a5f28c617df5d8221e726a254ff250494c30e954d022
 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.2.tar.xz 9845276 SHA256 c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2 SHA512 fd9b333fb35b10ad577d85e4f9aa8e1c7b74fa2c8c3199df6c479095b8f3e6cb7146dc37af373cadcb4a90fb168a30977aea42b9fad4169a017c78d99e380ad6 WHIRLPOOL 36ee6c2336f026651bdd122ee86b6026bbc34863c5405d44adce5c9369617f7d913994f0d4cea8bf47df6dbeefa75d41c284fb82cfba41aef79556ec81b7ec1e
 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.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.2.ebuild 8234 SHA256 c7557e64441f93c7eb9c8d09c9c524746b6e01a2e8a282cd39aec9cb3bc8d9fa SHA512 efefaff6350b4b19873a3ad16288cc3f75819c5f1c0c50171622221b35a8d81c026a94e8df33991cf4e3927333c208f4771934384052dd0d2efb79e6e2e7598d WHIRLPOOL 82cc8b2e4928de5077ac17617368a07dd4aae4b9076e499ec5f5f42eeb8da39f155abc43a773f51a83722e786c9b3a4043c6ace3ddbd71eda907faaf306aa5fd
 EBUILD webkit-gtk-2.0.3.ebuild 8216 SHA256 21b2e4f87be2e7a75593145b6cd5c3e5527db4b011b4ce80f7547759a468c738 SHA512 da82cf542195c5746b2fdaddfc1db828aea2f6f88540ab73a683cda8d797d6b2cb58732d6991f8615394b7be0c41fb22847b06d70f02cc86db619ae2e51ba69b WHIRLPOOL dfbe29f9df363656dc4b14df69a085729b007e006869e40d640bfb137923a284a1147d2bd56e278712b36fbeef2810e70f05cacabbeb2a853b347bca9272ea12
-MISC ChangeLog 43723 SHA256 2cbe16ca9e3c2789f1751f2e691e905b2ab47518617e53b8351752326f91d064 SHA512 c0821eaee9c685d53778c70f977f126b92c64515bf7f3b16a52424ce3927f866304280d9d610b440e526e4fc1f1bd51f569631c53c31a47677fb64531c84c28a WHIRLPOOL 593ac13e151d3b88d6fa2f4c8744a2378d3eeaf35a18884db0b3037819383bf381b0bde6d7c56c04ec704509b64669d0a79b4c24066e77a42d3ed5551d23e93d
-MISC metadata.xml 569 SHA256 7680bd9bb6771ea8bc643d5969b074a024b40548f23aa24dae05ecebe3d01983 SHA512 168d9cba348426bdaa2f8d1686bb88fe0e645ae2812de308dc8e186ef735f75c016538d2feefd6f2efe854eb63ea995a9ce39ffcda7c8ca104f7550f921dd8af WHIRLPOOL 2f803a29c30ebc0b202ce619c4d894e2a17ad6ca1002372d8e366eae2e5448fdab592bbc9edb1fcfd02ac8be95de38e0af8e0354559e53fc3b572387033e7591
+EBUILD webkit-gtk-2.0.4.ebuild 8119 SHA256 b40b9709e56bae0716d248cee10a6eaced5d02985291854446da0af16700cf1d SHA512 8ba85189344f2a9db3658d5cd60efa79fa6da2b8c94d6996df52eee4382cd3c8cfc25d60146239ebcf523fbbc0ec69d4c7fd296ac11e49eebd73b61d8cff6b13 WHIRLPOOL ba73e28c669f4142c01a0f952ae7f7b9768f845e8e4df36560382f83e3da06fed4279303e52c207da7c33e8f22beb7ce49402456443f6899271d85dc9bfcdcff
+MISC ChangeLog 43898 SHA256 d7dc47a948f3906fdc0c24a868ec84c608c06371f07ddff9ee2826fd0e826326 SHA512 0a28ca0042d99a3f3e4fd439333871d3e51cf929463b21310d8c72d2a4755a63aa82285197ee6702608fc108b8502d79742f9032ad55e6eae6affa1820d9fa63 WHIRLPOOL 901ba6dc5b3c05540512bed0422b3e375a6133723a131e91c7a70e3e6de4f06a8d8e2e2dc4712591344603e7c269b56047631a293c3d56103b66e8182ab0104b
+MISC metadata.xml 633 SHA256 99b9115b4d9711d65a7fd50cc777c4b8b49147104bfa23a23a46eb478742d338 SHA512 bf0a77250072f9c44a142030574cdb223de5f17c0fe168c1e848065043daddcb9e38eaddd8bd85dfa925bfd22cf37386a1532c4fe272a1aea4d22d5e46981510 WHIRLPOOL 8bdb0cc7b4659e177ceedca853cdc5b5bec4daa4d9144d32410ba584cbfa6ee2dd09a75211c5ea3f1ea2f5c180e10b3cf6e3e8583c0a14bd2095c604fbbc4b60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRytXxAAoJELp701BxlEWfK4MP/2KZLpKUpYTQCNIT/DrjkFHL
-MrKUirqdVvAIZQZNKlAPE9gk6S2RNaltH8mMbjoCsHTLFdsmhVqlrnegX37aWHCC
-5zXZHERlXccNqDgmp1QVgcYg7b9rfWQu1ICwygUY6SCvFUXT3gVKX6SDkD4Aj3U4
-OrADgiv5d2iDyF9zdsMnLCD5BMghGgd/YruDq7WWii1thdCzFu+HYXNdfeDRucsF
-eSFa9Jk5YiDo+FSQ5/LhVdt+OTgH872JRcP2waunem/Nm4TdKKNxovzzmU7+t5wa
-/iVV5jActN0pSisGxs+nCyeMpso48M7JtGjlwtUFS295W25m6dIFDpfETk3rzXe0
-LvAqzbsatBOSeqkanj1dWqAY2GFZ0OmqhqIfnhWP1l4vP3Gt4+Awaq8TWnJpxzwX
-NZ1isQI2WtdyLkOt3vW1oK8LqF1zs2DuE5uWKbq+0+ZZ5rCTKn2o7SJtj0k2BqVH
-nGsG23KQnpCpe733RMugLRNdah3ivh/PcKx2tiFh1aPnJpRlnwLTvmDiObkmbqEe
-wyBrcXFEXtzIijVI9HKI9paQLIabZ5nHXLcWvslzlKRNWdAIN4ZrQ+KQj/Je31ry
-n3+qTrfFYfcvHqO18NaSbmT1icpxAjgWbyIyA4uvZl4TUnvCUpxmLayGm0Bjp1oM
-cmN+j9CzAofQeLUmm8KH
-=A4gW
+iEYEAREIAAYFAlHvZqwACgkQCaWpQKGI+9TLYgCfUQYMhAxms3LvVylMik7Ax3fU
+b0AAn1Hs7aDPRYuG+ujyk+RyebQJlY/y
+=R8Tc
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index b0ea152e860b..caf7f409436f 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -3,12 +3,10 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
-    <flag name="coverage">Enable code coverage support</flag>
-    <flag name="geoloc">Enable geolocation support through
-			<pkg>app-misc/geoclue</pkg></flag>
-    <flag name="webgl">Build support for the WebGL HTML API using
-			<pkg>virtual/opengl</pkg></flag>
-    <flag name="webkit2">Enable WebKit2 API that splits web content rendering
-			and application UI into separate processes</flag>
+  	<flag name="coverage">Enable code coverage support</flag>
+	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
+	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
+	<flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
index eb9cc3d741e0..59014fa51014 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.2.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.2.ebuild,v 1.4 2013/06/18 06:10:56 tetromino Exp $
+# $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 $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 LICENSE="LGPL-2+ BSD"
 SLOT="3/25" # soname version
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
+IUSE="aqua coverage debug +geoloc +gstreamer libsecret +introspection +jit spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="introspection? ( geoloc gstreamer )"
 
@@ -25,14 +25,13 @@ REQUIRED_USE="introspection? ( geoloc gstreamer )"
 # gtk2 is needed for plugin process support
 # TODO: There's 3 acceleration backends: opengl, egl and gles2
 RDEPEND="
-	app-crypt/libsecret
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	media-libs/harfbuzz:=[icu(+)]
 	media-libs/libwebp
 	virtual/jpeg:=
 	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10:=
+	>=x11-libs/cairo-1.10:=[X]
 	>=dev-libs/glib-2.36.0:2
 	>=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
 	>=dev-libs/icu-3.8.1-r1:=
@@ -47,13 +46,16 @@ RDEPEND="
 		>=media-libs/gstreamer-1.0.3:1.0
 		>=media-libs/gst-plugins-base-1.0.3:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+	libsecret? ( app-crypt/libsecret )
 	spell? ( >=app-text/enchant-0.22:= )
 	webgl? (
 		virtual/opengl
 		x11-libs/libXcomposite
 		x11-libs/libXdamage )
 "
+
 # paxctl needed for bug #407085
+# Need real bison, not yacc
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/perl
@@ -76,7 +78,6 @@ DEPEND="${RDEPEND}
 		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
 "
-# Need real bison, not yacc
 
 S="${WORKDIR}/${MY_P}"
 
@@ -157,9 +158,6 @@ 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
 
@@ -180,14 +178,15 @@ src_configure() {
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"
 
+	# Try to use less memory, bug #469942
+	append-ldflags "-Wl,--no-keep-memory"
+
 	local myconf
 	# TODO: Check Web Audio support
 	# TODO: There's 3 acceleration backends: opengl, egl and gles2
 	# should somehow let user select between them?
 	#
 	# * dependency-tracking is required so parallel builds won't fail
-	# * libsecret dep was made optional for compatibility with Windows, not sure
-	# if we really want to make credential storage optional
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
@@ -196,12 +195,12 @@ src_configure() {
 		$(use_enable introspection)
 		$(use_enable gstreamer video)
 		$(use_enable jit)
+		$(use_enable libsecret credential_storage)
 		$(use_enable webgl)
 		--disable-egl
 		--disable-gles2
 		--with-gtk=3.0
 		--enable-accelerated-compositing
-		--enable-credential_storage
 		--enable-dependency-tracking
 		--disable-gtk-doc
 		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
@@ -216,11 +215,11 @@ src_configure() {
 	econf ${myconf}
 }
 
-src_compile() {
+#src_compile() {
 	# Avoid parallel make failure with -j9, bug #????
-	emake DerivedSources/WebCore/JSNode.h
-	default
-}
+#	emake DerivedSources/WebCore/JSNode.h
+#	default
+#}
 
 src_test() {
 	# Tests expect an out-of-source build in WebKitBuild