Version bump with performance improvements, geolocation support, and experimental WebKit2 support (splits rendering and UI into separate processes).

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

9 files changed, 663 insertions, 8 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index d5393b9031b7..e3e3321dc704 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.149 2012/04/02 21:58:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.150 2012/04/14 03:22:12 tetromino Exp $
+
+*webkit-gtk-1.8.0-r300 (14 Apr 2012)
+*webkit-gtk-1.8.0-r200 (14 Apr 2012)
+
+  14 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/webkit-gtk-1.7.5-linguas.patch,
+  +files/webkit-gtk-1.7.90-parallel-make-hack.patch,
+  +files/webkit-gtk-1.7.90-test_garbage_collection.patch,
+  +webkit-gtk-1.8.0-r200.ebuild, +webkit-gtk-1.8.0-r300.ebuild,
+  +files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch, metadata.xml:
+  Version bump with performance improvements, geolocation support, and
+  experimental WebKit2 support (splits rendering and UI into separate
+  processes).
 
   02 Apr 2012; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-1.4.3-r200.ebuild,
   -webkit-gtk-1.4.3-r300.ebuild, files/webkit-gtk-1.6.1-double-conversion.patch:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e9451da8a048..5b4ebe7894f4 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gir-paxctl-lt-wrapper 1015 RMD160 1a8eeb76ee1135e93f60cb6fe5d21ab07bdd3ee6 SHA1 b41721ac3d56161495211e7b0f6098af500ecfd1 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062ce98441a70a5b2d2f1e042a
 AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434
@@ -13,18 +13,25 @@ AUX webkit-gtk-1.6.1-double-conversion.patch 1599 RMD160 a9546a7eedabad03fdf68a9
 AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 RMD160 8a83465d74bf34d6fe7cbb6a2767f62c77e33aa2 SHA1 40090e84c3ee7814c14363d8bb790c7ec38d2dbb SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014
 AUX webkit-gtk-1.6.1-sparc-needs-alignment.patch 430 RMD160 5220e63f6c6abf4f9d2d0c4857637cb9fd07120f SHA1 7b29e3dfb79f4b2566d300bef37efa88594fd7eb SHA256 870f314ed330b8cb1d7ffc498e2019c001eded83f14dfb4976804f85af403f80
 AUX webkit-gtk-1.6.3-paxctl-introspection.patch 929 RMD160 fe2eb5fb4d6830c377a723480db6519e7a08cc32 SHA1 53b27522fe37fedb2485079055ce755833fe8048 SHA256 96efa5fcd823eca76f24c4d975dda0f7d9cfc439c71807941e895a70d0aea377
+AUX webkit-gtk-1.7.5-linguas.patch 1447 RMD160 9e710c9e90836ff608915fef6942b7bd7f3ea04f SHA1 d7229ad0bef8d2b82f4332c684676266adfad54c SHA256 42cf057556cb1493a40b12db87fa91820c0e493e542e211e9aed10c86bcb3d74
+AUX webkit-gtk-1.7.90-parallel-make-hack.patch 592 RMD160 4387ab914cabd55e2e6592926f00b7594f8915a8 SHA1 b6d89e54a6c1af0c365b370bf3bf4ec895d510e1 SHA256 e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73
+AUX webkit-gtk-1.7.90-test_garbage_collection.patch 597 RMD160 793b6f75beb80c51b296e50f2f8b4341e63088c2 SHA1 d87927e9ce345197de41597ac16f7b69451231e0 SHA256 f2ca641430a0ff09001391d649aaf135c151177ce879a29136c78a68f2dfc4d0
+AUX webkit-gtk-1.8.0-svgimagebuffer-clip.patch 6002 RMD160 8b758f798deeed43aa3233666ce1ad9597b9ab17 SHA1 47a421874cccc13a7c7859d67a2a92b4d2bd235f SHA256 53e1cf793b47e43bc8d62b3a19047c76a757b238797cdbfab0192f92ab7e8129
 DIST webkit-1.6.3.tar.xz 6794004 RMD160 cc319ffe4c2810663ae05b90e69d9495f5c3f0aa SHA1 7df69608ef2ce9dd7328353b4ee34f69271cd43b SHA256 12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3
+DIST webkit-1.8.0.tar.xz 7998384 RMD160 f1700350e3447f223e1cf900154adae86ba8a900 SHA1 75f1a7da9097c740c4aa2ccba9470229c0b5cf5c SHA256 8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc
 DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d6ff3 SHA1 13b976e736f09950ceeb6f1b0af00c52e9d8d475 SHA256 ca29992afb70d97301b8cf991ce58bf53523a71b5eb91134d998a458824a0339
 EBUILD webkit-gtk-1.6.1-r201.ebuild 4959 RMD160 efc7fe947fe751336e0038c866e842ff9b898180 SHA1 862ae335a359e32c933266b5c19dd6ea5cb1958c SHA256 c6869c581b6d7fc829c525f450c93dac9e89336b08f9394c8426892d99852896
 EBUILD webkit-gtk-1.6.1-r301.ebuild 4895 RMD160 071c892951df0ea7a1e49edbffbc03bebb645496 SHA1 c07d104bb89fbc44ac86cdc76a89746169435875 SHA256 72cb6d8910e902f4222ab70967cf87a6ecac981c7e6d3d0a305d4a59cfee3f8d
 EBUILD webkit-gtk-1.6.3-r200.ebuild 5305 RMD160 2fc401fc23c9bc7e15538850675adf7c8f0249d2 SHA1 1675235ea4f12be876e325cdc21e25c1848e6dd9 SHA256 b12b080d0a044c9cd98cdb8617e8ff4fba7a12836e92ca16058a24aec3ec6dbd
 EBUILD webkit-gtk-1.6.3-r300.ebuild 5133 RMD160 6cb6b17685ac942cc3003bc3b173755cdb0753cb SHA1 bb62ef1de44178bc7cbbc940c594eabffbc4557e SHA256 2d032d3208fa73a7b7cfdcc562e6a1b4e476b0912a3658e2fef5bc5332214eb8
-MISC ChangeLog 29946 RMD160 055dfe2a1e868cb1d3ecf1c82c22a829cf99d21a SHA1 7a683877d61d185cbbbf81439202d1c115b303c3 SHA256 9b86728276773c9ee0ce9aa7d7b5cc31f480829fe6b9d99586014c530ddccce5
-MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
+EBUILD webkit-gtk-1.8.0-r200.ebuild 6639 RMD160 7237d71b4ffdfca289f1ed58b28ac57eca700d00 SHA1 edb4c3770b0c1260d92c554b94e36a7d5cf2b618 SHA256 4989e7754e33f0d5b51d8625d68b0eb93572d6d804ebde46df9d66250c7f5917
+EBUILD webkit-gtk-1.8.0-r300.ebuild 6646 RMD160 67d88021de8298bd6a93c203fdabc65d62b4fa57 SHA1 2ec2ea3f929458b12b666896a4518d2e61cfd527 SHA256 a8608bb511ea7499a5d2ecfd6c846b6029b18d6602d837a920200743bd2f940e
+MISC ChangeLog 30523 RMD160 0ca6129a8a2421cc52390f12990d03c016413366 SHA1 541f11c0a59770b6195cb1bc3d46a14176e8ad65 SHA256 0a2efbb47a7a101fe83c6a5a78ed62bc81ff2528769587ad72f0c5ff1a68233d
+MISC metadata.xml 759 RMD160 8f6fe7ef53ac0b8ebf648fa3dcff019d6c806775 SHA1 33b751cd3d5c948455a4117120487fdd5a40fd9f SHA256 7e95cf6779c2de81716bb42246e7669418e15954e67f50ff7904da251e48d3d2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk96ISUACgkQCaWpQKGI+9Rk/wCeMNde59R5BLFgxIaa+6AbmjS2
-Mc0AnAq6oQZTeWUQMhjhlQKM8xLKnUOq
-=C7w+
+iF4EAREIAAYFAk+I7WoACgkQdjK8w9WeBnD5BAD8C6GGIwaMNgDFndzx66lPyHOl
+SZEOD+r6PMT+/qKqmkUA/3hx/AdZbfROnGEu2Ys49zB/kpIrJ/rvyfS6deDHH1An
+=MMVu
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
new file mode 100644
index 000000000000..df14a5cfe305
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
@@ -0,0 +1,47 @@
+Respect intltool's LINGUAS variable for building translations.
+
+--- a/webkit-1.7.5/GNUmakefile.am
++++ b/webkit-1.7.5/GNUmakefile.am
+@@ -54,6 +54,9 @@
+ IDL_BINDINGS :=
+ TEST_PROGS :=
+ POFILES :=
++PO_LINGUAS :=
++USER_LINGUAS :=
++USE_LINGUAS :=
+ MOFILES :=
+ dom_binding_idls :=
+ wtf_cppflags:=
+--- a/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
++++ b/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
+@@ -27,7 +27,15 @@
+ 
+ POFILES += $(shell ls $(srcdir)/Source/WebKit/gtk/po/*.po)
+ 
+-MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
++PO_LINGUAS += $(patsubst $(srcdir)/Source/WebKit/gtk/po/%.po,%,$(POFILES))
++
++USER_LINGUAS += $(filter $(LINGUAS),$(PO_LINGUAS))
++
++USE_LINGUAS += $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS="$(PO_LINGUAS)"; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++
++MOFILES += $(USE_LINGUAS:%=Source/WebKit/gtk/po/%.mo)
++
++ALL_MOFILES := $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
+ 
+ .po.mo:
+ 	test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
+@@ -124,11 +132,11 @@
+ 	$(top_builddir)/stamp-po
+ 
+ MAINTAINERCLEANFILES += \
+-	$(MOFILES) \
++	$(ALL_MOFILES) \
+ 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
+ 
+ DISTCLEANFILES += \
+-	$(MOFILES) \
++	$(ALL_MOFILES) \
+ 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
+ 
+ po-install-data-local: all
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
new file mode 100644
index 000000000000..b632ca2791db
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
@@ -0,0 +1,21 @@
+Horrible failure of a hack to enable workaround for
+https://bugs.webkit.org/show_bug.cgi?id=79498
+
+--- a/GNUmakefile.am
++++ b/GNUmakefile.am
+@@ -285,6 +285,15 @@
+ all-local: stamp-po
+ 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
+ 
++# Horrible hack to enable workaround for parallel make failure
++all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
++
++all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
++
++all-programs-local: GNUmakefile $(PROGRAMS)
++
++all-data-local: GNUmakefile $(DATA)
++
+ # remove built sources and program directories
+ clean-local:
+ 	-rm -rf $(GENPROGRAMS)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
new file mode 100644
index 000000000000..577c249eeda2
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
@@ -0,0 +1,18 @@
+Garbage collection test fails intermittently if icedtea browser plugin is
+installed.
+
+--- a/Source/WebKit/gtk/tests/testdomdocument.c
++++ b/Source/WebKit/gtk/tests/testdomdocument.c
+@@ -353,12 +353,6 @@
+                test_dom_document_get_links,
+                dom_document_fixture_teardown);
+ 
+-    g_test_add("/webkit/domdocument/test_garbage_collection",
+-               DomDocumentFixture, HTML_DOCUMENT_LINKS,
+-               dom_document_fixture_setup,
+-               test_dom_document_garbage_collection,
+-               dom_document_fixture_teardown);
+-
+     return g_test_run();
+ }
+ 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch
new file mode 100644
index 000000000000..e93059f3aeb4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch
@@ -0,0 +1,114 @@
+Index: /trunk/Source/WebCore/ChangeLog
+===================================================================
+--- /trunk/Source/WebCore/ChangeLog	(revision 110561)
++++ /trunk/Source/WebCore/ChangeLog	(revision 110563)
+@@ -1,2 +1,31 @@
++2012-03-13  Stephen Chenney  <schenney@chromium.org>
++
++        Crash in WebCore::GraphicsContext::paintingDisabled
++        https://bugs.webkit.org/show_bug.cgi?id=80669
++
++        Reviewed by Nikolas Zimmermann.
++
++        The SVGImageBufferTools::clipToImageBuffer method deletes the clip
++        image when it thinks it is not needed. However, there are cases when
++        it is in fact still needed, particularly when the clip buffer is
++        coming from higher up in the stack where it may be needed again.
++
++        So this patch adds a flag to only allow deletion of the image buffer
++        if it was created at the most recent call site.
++
++        Tests: svg/custom/circular-clip-path-references-crash-expected.svg
++               svg/custom/circular-clip-path-references-crash.svg
++
++        * rendering/svg/RenderSVGResourceClipper.cpp:
++        (WebCore::RenderSVGResourceClipper::applyClippingToContext):
++        * rendering/svg/RenderSVGResourceGradient.cpp:
++        (WebCore::clipToTextMask):
++        * rendering/svg/RenderSVGResourceMasker.cpp:
++        (WebCore::RenderSVGResourceMasker::applyResource):
++        * rendering/svg/SVGImageBufferTools.cpp:
++        (WebCore::SVGImageBufferTools::clipToImageBuffer):
++        * rendering/svg/SVGImageBufferTools.h:
++        (SVGImageBufferTools):
++
+ 2012-03-13  Gavin Peters  <gavinp@chromium.org>
+ 
+Index: /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp	(revision 109016)
++++ /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp	(revision 110563)
+@@ -122,5 +122,5 @@
+ }
+ 
+-void SVGImageBufferTools::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>& imageBuffer)
++void SVGImageBufferTools::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>& imageBuffer, bool safeToClear)
+ {
+     ASSERT(context);
+@@ -137,5 +137,5 @@
+     // When nesting resources, with objectBoundingBox as content unit types, there's no use in caching the
+     // resulting image buffer as the parent resource already caches the result.
+-    if (!currentContentTransformation().isIdentity())
++    if (safeToClear && !currentContentTransformation().isIdentity())
+         imageBuffer.clear();
+ }
+Index: /trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	(revision 106108)
++++ /trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	(revision 110563)
+@@ -99,5 +99,5 @@
+ 
+     targetRect = textRootBlock->repaintRectInLocalCoordinates();
+-    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, targetRect, imageBuffer);
++    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, targetRect, imageBuffer, false);
+ 
+     AffineTransform matrix;
+Index: /trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	(revision 106108)
++++ /trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	(revision 110563)
+@@ -87,5 +87,6 @@
+     ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
+ 
+-    if (!m_masker.contains(object))
++    bool missingMaskerData = !m_masker.contains(object);
++    if (missingMaskerData)
+         m_masker.set(object, new MaskerData);
+ 
+@@ -117,5 +118,5 @@
+         return false;
+ 
+-    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, maskerData->maskImage);
++    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, maskerData->maskImage, missingMaskerData);
+     return true;
+ }
+Index: /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.h
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.h	(revision 106157)
++++ /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.h	(revision 110563)
+@@ -43,5 +43,5 @@
+ 
+     static void renderSubtreeToImageBuffer(ImageBuffer*, RenderObject*, const AffineTransform&);
+-    static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>&);
++    static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>&, bool safeToClear);
+ 
+     static void calculateTransformationToOutermostSVGCoordinateSystem(const RenderObject*, AffineTransform& absoluteTransform);
+Index: /trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	(revision 109097)
++++ /trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	(revision 110563)
+@@ -156,5 +156,6 @@
+                                                       const FloatRect& repaintRect, GraphicsContext* context)
+ {
+-    if (!m_clipper.contains(object))
++    bool missingClipperData = !m_clipper.contains(object);
++    if (missingClipperData)
+         m_clipper.set(object, new ClipperData);
+ 
+@@ -202,5 +203,5 @@
+         return false;
+ 
+-    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, clipperData->clipMaskImage);
++    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, clipperData->clipMaskImage, missingClipperData);
+     return true;
+ }
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index db2d36fc015b..f6718a8bf879 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -4,11 +4,15 @@
   <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="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 		for introspection</flag>
 	<flag name="jit">Enable JIT javascript compiler (disabling it will
 		cause performance penalty)</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-1.8.0-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r200.ebuild
new file mode 100644
index 000000000000..b0ab576dd4c1
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r200.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2012 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.8.0-r200.ebuild,v 1.1 2012/04/14 03:22:12 tetromino Exp $
+
+EAPI="4"
+
+# Don't define PYTHON_DEPEND: python only needed at build time
+inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+#SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=x11-libs/cairo-1.10
+	>=dev-libs/glib-2.31.2:2
+	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.21
+	x11-libs/libXrender
+
+	geoloc? ( app-misc/geoclue )
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+
+	webgl? ( virtual/opengl )
+"
+# paxctl needed for bug #407085
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-devel/bison
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? ( x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+# Need real bison, not yacc
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Needed for CodeGeneratorInspector.py
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	# TODO: FAILS TO APPLY!
+	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
+	epatch "${FILESDIR}/${P}-svgimagebuffer-clip.patch"
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
+	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die
+
+	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	fi
+
+	# We need to reset some variables to prevent permissions problems and failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# https://bugs.webkit.org/show_bug.cgi?id=79498
+	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
+
+	# XXX: failing tests
+	# https://bugs.webkit.org/show_bug.cgi?id=50744
+	# testkeyevents is interactive
+	# mimehandling test sometimes fails under Xvfb (works fine manually)
+	# datasource test needs a network connection and intermittently fails with
+	#  icedtea-web
+	sed -e '/Programs\/unittests\/testwebinspector/ d' \
+		-e '/Programs\/unittests\/testkeyevents/ d' \
+		-e '/Programs\/unittests\/testmimehandling/ d' \
+		-e '/Programs\/unittests\/testwebdatasource/ d' \
+		-i Source/WebKit/gtk/GNUmakefile.am || die
+	# garbage collection test fails intermittently if icedtea-web is installed
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+
+	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
+	# http://paludis.exherbo.org/trac/ticket/1230
+	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co.
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# XXX: dependency-tracking is required so parallel builds won't fail
+	# WebKit2 can only be built with gtk3
+	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable geoloc geolocation)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		--enable-web-sockets
+		--with-gtk=2.0
+		--disable-gtk-doc
+		--disable-webkit2
+		--enable-dependency-tracking
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Horrible failure of a hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	emake -j1 all-built-sources-local
+	emake all-ltlibraries-local
+	emake all-programs-local
+	use introspection && emake WebKit-1.0.gir
+	emake all-data-local
+	default
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/unittests/test*) \
+		Programs/unittests/.libs/test*
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+
+	# Prevents crashes on PaX systems
+	use jit && pax-mark m "${ED}usr/bin/jsc-1"
+
+	# File collisions with slot 3
+	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
+	rm -rf "${ED}usr/share/gtk-doc" || die
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.0-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r300.ebuild
new file mode 100644
index 000000000000..68942892c821
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r300.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2012 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.8.0-r300.ebuild,v 1.1 2012/04/14 03:22:12 tetromino Exp $
+
+EAPI="4"
+
+# Don't define PYTHON_DEPEND: python only needed at build time
+inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+#SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl webkit2"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=x11-libs/cairo-1.10
+	>=dev-libs/glib-2.31.2:2
+	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.37.2.1:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.21
+	x11-libs/libXrender
+
+	geoloc? ( app-misc/geoclue )
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+
+	webgl? ( virtual/opengl )
+
+	webkit2? ( >=x11-libs/gtk+-2.13:2 )
+"
+# paxctl needed for bug #407085
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-devel/bison
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+	webkit2? ( app-accessibility/at-spi2-core )
+"
+# Need real bison, not yacc
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Needed for CodeGeneratorInspector.py
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	# TODO: FAILS TO APPLY!
+	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
+	epatch "${FILESDIR}/${P}-svgimagebuffer-clip.patch"
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
+	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die
+
+	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	fi
+
+	# We need to reset some variables to prevent permissions problems and failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# https://bugs.webkit.org/show_bug.cgi?id=79498
+	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
+
+	# XXX: failing tests
+	# https://bugs.webkit.org/show_bug.cgi?id=50744
+	# testkeyevents is interactive
+	# mimehandling test sometimes fails under Xvfb (works fine manually)
+	# datasource test needs a network connection and intermittently fails with
+	#  icedtea-web
+	sed -e '/Programs\/unittests\/testwebinspector/ d' \
+		-e '/Programs\/unittests\/testkeyevents/ d' \
+		-e '/Programs\/unittests\/testmimehandling/ d' \
+		-e '/Programs\/unittests\/testwebdatasource/ d' \
+		-i Source/WebKit/gtk/GNUmakefile.am || die
+	# garbage collection test fails intermittently if icedtea-web is installed
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+
+	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
+	# http://paludis.exherbo.org/trac/ticket/1230
+	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co.
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# XXX: dependency-tracking is required so parallel builds won't fail
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable doc gtk-doc)
+		$(use_enable geoloc geolocation)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		$(use_enable webkit2)
+		--enable-web-sockets
+		--with-gtk=3.0
+		--enable-dependency-tracking
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Horrible failure of a hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	emake -j1 all-built-sources-local
+	emake all-ltlibraries-local
+	emake all-programs-local
+	use introspection && emake WebKit-3.0.gir
+	emake all-data-local
+	default
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \
+		Programs/unittests/.libs/test*
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+
+	# Prevents crashes on PaX systems
+	use jit && pax-mark m "${ED}usr/bin/jsc-3"
+}