net-libs/webkit-gtk: moved to gx86

11 files changed, 0 insertions, 829 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
deleted file mode 100644
index e65df6d0..00000000
--- a/net-libs/webkit-gtk/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 RMD160 6c73b491645c0d4626d5a60043159c045bee013f SHA1 e032315b4155a92f18ea43b29a4581655eb34d89 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23
-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.8.0.tar.xz 7998384 RMD160 f1700350e3447f223e1cf900154adae86ba8a900 SHA1 75f1a7da9097c740c4aa2ccba9470229c0b5cf5c SHA256 8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc
-EBUILD webkit-gtk-1.8.0-r200.ebuild 6633 RMD160 d15efe9d75edc2c5e17385e7ce2ab41497c76e90 SHA1 f1fccfc0030713d948ad6c045f58c9b8eb667b64 SHA256 b0773535790a6a9f749db6fcaa54b3a67598f651fb7785ed8decf6cff694c23f
-EBUILD webkit-gtk-1.8.0-r300.ebuild 6644 RMD160 0c02530f29d1fb713369872dc30d7d792d8215c6 SHA1 eaeaea123867650310b550b4a4b583f18ec37ab4 SHA256 bbb9136c438e6f89b60a974e0a93586d730f51ef1b9edde289046869b7a46dc2
diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
deleted file mode 100755
index d4f270c2..00000000
--- a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
-# generated by g-ir-scanner.
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-echo ${LIBTOOL} "$@"
-${LIBTOOL} "$@"
-
-retval=$?
-
-files=$(find . -path "*tmp-introspect*/.libs/*")
-
-if type -p paxctl > /dev/null; then
-	echo "PT PaX marking -${flags} ${files}"
-	for f in ${files}; do
-		# First, try modifying the existing PAX_FLAGS header
-		paxctl -q${flags} "${f}" && continue
-		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
-		paxctl -qc${flags} "${f}" && continue
-		# Third, try pulling the base down a page, to create space and
-		# insert a PT_GNU_STACK header (works on ET_EXEC)
-		paxctl -qC${flags} "${f}" && continue
-	done
-elif type -p scanelf > /dev/null; then
-	# Try scanelf, the Gentoo swiss-army knife ELF utility
-	# Currently this sets PT if it can, no option to control what it does.
-	echo "Fallback PaX marking -${flags} ${files}"
-	scanelf -Xxz ${flags} ${files}
-fi
-
-exit ${retval}
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch
deleted file mode 100644
index 3b1c5c43..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Fixup pool and add sparc support
---- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h
-+++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@ namespace WTF {
-             : m_freeList(pool())
-             , m_isDoneWithInitialFreeList(false)
-         { 
--            memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+            memset(m_pool, 0, sizeof(m_pool));
-         }
- 
-         Node* allocate()
-@@ -171,7 +171,7 @@ namespace WTF {
-         }
- 
-     private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
-         Node* pastPool() { return pool() + m_poolSize; }
- 
-         bool inPool(Node* node)
-@@ -182,10 +182,7 @@ namespace WTF {
-         Node* m_freeList;
-         bool m_isDoneWithInitialFreeList;
-         static const size_t m_poolSize = 256;
--        union {
--            char pool[sizeof(Node) * m_poolSize];
--            double forAlignment;
--        } m_pool;
-+        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
-     };
- 
-     template<typename ValueArg> struct ListHashSetNode {
---- webkit-1.2.1.orig/WebCore/platform/text/AtomicString.cpp
-+++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp
-@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
-     if (string->length() != length)
-         return false;
- 
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
-     // FIXME: perhaps we should have a more abstract macro that indicates when
-     // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
---- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h
-+++ webkit-1.2.1/WebCore/platform/text/StringHash.h
-@@ -54,13 +54,13 @@ namespace WebCore {
- 
-             // FIXME: perhaps we should have a more abstract macro that indicates when
-             // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
-             const UChar* aChars = a->characters();
-             const UChar* bChars = b->characters();
--            for (unsigned i = 0; i != aLength; ++i) {
-+            for (unsigned i = 0; i != aLength; ++i)
-                 if (*aChars++ != *bChars++)
-                     return false;
--            }
-+
-             return true;
- #else
-             /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
deleted file mode 100644
index 5ad357e9..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Original from:
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
-
-Adapted for 1.6.1
-
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -70,6 +70,8 @@
- #endif
- #include <gtk/gtk.h>
- 
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "RefPtrCairo.h"
- #include "gtk2xtbin.h"
-@@ -439,9 +441,9 @@
-         event->setDefaultHandled();
- }
- 
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -454,10 +456,12 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
-+#endif
- }
- 
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -470,8 +474,8 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
--}
- #endif
-+}
- 
- void PluginView::setParent(ScrollView* parent)
- {
---- Source/WebCore/plugins/gtk/gtk2xtbin.c
-+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
-@@ -41,7 +41,7 @@
-  * The GtkXtBin widget allows for Xt toolkit code to be used
-  * inside a GTK application.  
-  */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -966,3 +966,4 @@
- 
-   return;
- }
-+#endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
deleted file mode 100644
index c34cc402..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
---- a/Source/WebKit/gtk/GNUmakefile.am
-+++ b/Source/WebKit/gtk/GNUmakefile.am
-@@ -269,7 +269,7 @@
- WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
- 
- $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
--	$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
-+	$(AM_V_GEN)LIBTOOL="$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \
- 	     --symbol-prefix=webkit \
- 	     --identifier-prefix=WebKit \
- 	     --namespace=WebKit \
-@@ -280,7 +280,7 @@
- 	     --include=Soup-2.4 \
- 	     --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
- 	     --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
--	     --libtool="$(LIBTOOL)" \
-+	     --libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \
- 	     --pkg=gobject-2.0 \
- 	     --pkg=gtk+-@GTK_API_VERSION@ \
- 	     --pkg=libsoup-2.4 \
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
deleted file mode 100644
index df14a5cf..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index b632ca27..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 577c249e..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index e93059f3..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-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/webkit-gtk-1.8.0-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r200.ebuild
deleted file mode 100644
index 999fe294..00000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.0-r200.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2011 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.6.1-r200.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek 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 paludis braindamage, 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
deleted file mode 100644
index 7573a174..00000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.0-r300.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2011 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.6.1-r300.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek 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 paludis braindamage, 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/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-3"
-}