gentoo resync : 25.08.2020

12 files changed, 39 insertions, 867 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1d7c7e35f003..bac8c0e92908 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,16 +1,7 @@
-AUX 2.26.2-fix-arm-non-unified-build.patch 982 BLAKE2B b2f4ab56030fffdf2504f213f2713117537095b66c6862377051687a4a798e0540dca95774275b5a7c1ac0fdd5a2927e07a6af8b7a992b8710d2edb05be272e2 SHA512 95ab575a4de13036b11691a4d9cb1b4338b118e5983352d66c4ad639104cce564c4a946349347ac461515bd5bef7359f8193a84d7b02f2d1345cba7969fcfcf6
-AUX 2.26.3-fix-gtk-doc.patch 1302 BLAKE2B 4a0b71a93dc137b5540df0aebc31186b510dfe68dd7b354f763f9a7a93e5df0ed24b12970d801a145eb9b36cde7711029c93c174146c91622a8264380cac08a8 SHA512 f3dbbff5ce65918bf3e889d3139bd7e7b3b7d17adf5f0c22b135abbbd0c8d7ebdf5bb8b126ec9ad2b345c4163da7e862ffe36e521b09eb4024330dbe67b0d7a4
-AUX 2.28.2-fix-ppc64-JSC.patch 2236 BLAKE2B e225370c443a3d3cb7160b342dd29243df9b0470094c108088bc2baf2fa053a9e5ba1b9f2d86f180d8f5fdab7df46c47114e90af8dc5f7507bec0449b98773aa SHA512 fa435bd130fa7f289e7b8971a5dd3205bfde45665422f6aba0c3382985632243f5b11ad641133c27419b9f7b34fbc3db78ac60fe0056902c75aa6a0a30f81b84
-AUX 2.28.2-fix-yelp-desktopless-build.patch 1767 BLAKE2B 75352a5f5632b1d351e22557ce51c977befa6d51251f850aebccd09433f5b11768c9f6078abffdf13fdaa514c767c2ec00810f173842570155187a84b54a6f23 SHA512 81627bc7e7c8a807bd4a0ccb2e667bae179b5f48f9ba81add2f7c072f77918a738fd0cca74f82f43d783f5fa7c0e63deef8f2eb3f30a43d4a1353a30a19d7017
 AUX 2.28.2-non-jumbo-fix.patch 1675 BLAKE2B 13541ce6392f921663dd8af6d8093e9de8b02e7d9e82cc7e06b7126e36d9c060f2342b57985bc7a5d1fa52c4d2203cdf7164a87af60ad9872bc6d12b7e14b435 SHA512 51da3680d873e7ee435a4a4bf0d23171a4ecf80fc3ea5ce60c71a55db2cf090754a4ed0c0a5297995f3729928d31541bab9528695c557c0c309338a7a75439b6
 AUX 2.28.2-opengl-without-X-fixes.patch 1656 BLAKE2B 85b825f0138a40f6647ceba693dccf644a1f86b9c57cda2ee8d6999830ad0bad13456aadf32c6789dafe7531b53f63644d5214b275159c3fce103b262a950461 SHA512 93cbbf092d9953c176bdcfc384e83ec276af35aa9c7645088a56d5c18934712d93aeee7e4c6111e1eb816b54d290ae6b23030683f81bde0f91c3ba3ff440f85b
-AUX 2.28.2-use-gst-audiointerleave.patch 2489 BLAKE2B 37e233512a532c8ea263b6dcb8f384e4adf426e1e76ccd55d79d11be9b1db7abf4bcedf9cbd997b20f4a417f26931447c0e39a79938763474ec45dbbced13f7e SHA512 215fec6f3dc5d35109164ef380095e31aa41b007a2e383cf328b2ef736f9b5160a2490117183c5610696cea1ae358888aab14548e2d3146fffc2e213bafa2f41
+AUX 2.28.4-non-jumbo-fix2.patch 1196 BLAKE2B 735a58a9ccfc9fa61a7d8e649262404d3a1b1b3aa257181f026ceb6b6dfd602679d1add974d6930ba2033643cd9cf8bbb3fea0bf87ec85f769d55de5635d6828 SHA512 78c1426f34dacb65090356157963ae0be4a59c4c7905cfb9a59cc5cde766d2931b68872cb55369a74a871f88f4244f3db8ef8d30ee74d8e75acaaa8893ce7989
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
-AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
-DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
-DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
-DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
-EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
-EBUILD webkit-gtk-2.26.4-r1.ebuild 8749 BLAKE2B f470ee46cd08ca1a210ac35c0dbbc7c8df2b62ba2cdd775a903c3d7289df8b556259c3b4456d4612efcd3e5ec6fa8d31b03221fbe1d9af4faf9bd7b283797435 SHA512 1e589c989cd9badd30b113550cd7d984b8e4a7da122c15c4df9c0e57de2076ea14ab3f4887981aaa43003c3a9960374f396b0ff5e920266ce724dc01179f1ae5
-EBUILD webkit-gtk-2.28.2.ebuild 9147 BLAKE2B 05dc2471e1b80aafa769e3d3252b3fe96490212f8420ad02a5d77532387145bff45fca06a4233e4ae9048a7d7dc34d0aae957af7bb327881ee91e0a073d103c5 SHA512 2c02215bf2697cc35b49bd02d069af8fa376357f69060335977a5eabd46d1e889f74af32461f02cca3fe9a84963b002db01e9ce0cbf5623472a1e5f0dd5e0e99
-MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
+DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
+EBUILD webkit-gtk-2.28.4.ebuild 8915 BLAKE2B 7e326805f4a7e26f0dcd8ce407921644fe2ce2ee98ea9d0567c73324a9e631221062b940c110eeae1f175b57f2835099f6c6ff2490aeafa0a9d7bec47c07be83 SHA512 70fb22670660db11e1ba1502cd07ee4a273dce7c0c775e1dbea6ea96cf1c9e2fe84f91abcddd0d94f6b895d1121c7a25db406717d0cbd59a48ad79f936aea833
+MISC metadata.xml 482 BLAKE2B 4ddea1fc3fdb0a18e8b6d04197bf34d93b596661d2b3ba563ea0bcf72f1a7db6529caf75f9ff301fb8d21037ebe44541294888f9a5b1d3b00b6fa5950a0c7243 SHA512 c0c614c5141d24a8b280973aa56364a8b451c88b35b4fadff111c232a6b7cad11e9273658db655d68cccc9fc59bb1158e98f806ab02d13896a67aab31a5b43e3
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
deleted file mode 100644
index 0f0959900df2..000000000000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add missing headers required during non-unified build.
-
-Unified build happens to get them included by the other sources unified
-into same source file, thus didn't fail.
-
-diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
---- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-@@ -30,6 +30,7 @@
- 
- #include "BuiltinNames.h"
- #include "BytecodeGenerator.h"
-+#include "BytecodeStructs.h"
- #include "CallFrame.h"
- #include "JIT.h"
- #include "JSCInlines.h"
-diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
---- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -23,6 +23,7 @@
- #include "MachineStackMarker.h"
- 
- #include "ConservativeRoots.h"
-+#include "CPU.h"
- #include "MachineContext.h"
- #include <setjmp.h>
- #include <stdlib.h>
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
deleted file mode 100644
index 85328be1a5ca..000000000000
--- a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this,
-but it looks like it's not enough with older perl-based gtk-doc.
-Keep this extra patch only until we can't depend on a newer gtk-doc version, which
-should be retested whether this patch is unnecessary then.
-
-Upstream extra reference for the above reference commit:
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-index 023b14c33f4..657b1febf5d 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
-      * WebKitSettings:enable-media:
-      *
-      * Enable or disable support for media playback on pages. This setting is enabled by
--     * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have
-+     * default. Disabling it means audio, track and video elements will have
-      * playback support disabled.
-      *
-      * Since: 2.26
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch b/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch
deleted file mode 100644
index 96e4d7d0aa2c..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 46c7d3ea88dd77223f25c48ce4a8688db71c489b Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Thu, 7 May 2020 19:30:28 +0000
-Subject: [PATCH] REGRESSION(r251875): Crash in JSC::StructureIDTable::get on
- ppc64le: gcSafeMemcpy broken on JSVALUE64 platforms other than x86_64 and
- aarch64 https://bugs.webkit.org/show_bug.cgi?id=210685
-
-Patch by Daniel Kolesa <daniel@octaforge.org> on 2020-05-07
-Reviewed by Michael Catanzaro.
-
-Fix gcSafeMemcpy on non-x86_64/aarch64 64-bit architectures.
-
-We were hitting an incorrect x86_64 assertion on values larger than
-mediumCutoff on JSVALUE64 architectures other than x86_64 and aarch64,
-as the control flow is wrong.
-
-* heap/GCMemoryOperations.h:
-(JSC::gcSafeMemcpy):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/JavaScriptCore/heap/GCMemoryOperations.h | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Source/JavaScriptCore/heap/GCMemoryOperations.h b/Source/JavaScriptCore/heap/GCMemoryOperations.h
-index f2b9e385bc9..ff66071db20 100644
---- a/Source/JavaScriptCore/heap/GCMemoryOperations.h
-+++ b/Source/JavaScriptCore/heap/GCMemoryOperations.h
-@@ -53,7 +53,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-             bitwise_cast<volatile uint64_t*>(dst)[i] = bitwise_cast<volatile uint64_t*>(src)[i];
-     };
- 
--#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64)
-+#if COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
-     if (bytes <= smallCutoff)
-         slowPathForwardMemcpy();
-     else if (isARM64() || bytes <= mediumCutoff) {
-@@ -121,8 +121,6 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-             :
-             : "d0", "d1", "memory"
-         );
--#else
--    slowPathForwardMemcpy();
- #endif // CPU(X86_64)
-     } else {
-         RELEASE_ASSERT(isX86_64());
-@@ -139,7 +137,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-     }
- #else
-     slowPathForwardMemcpy();
--#endif // COMPILER(GCC_COMPATIBLE)
-+#endif // COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
- #else
-     memcpy(dst, src, bytes);
- #endif // USE(JSVALUE64)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch b/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch
deleted file mode 100644
index fdf9d7d4d20b..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9cd4011a12bf658aad3776251792bacdc894643a Mon Sep 17 00:00:00 2001
-From: "berto@igalia.com"
- <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Mon, 27 Apr 2020 11:52:10 +0000
-Subject: [PATCH] [GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set
- https://bugs.webkit.org/show_bug.cgi?id=209431
-
-Reviewed by Carlos Garcia Campos.
-
-Don't create a PlatformDisplayLibWPE as a fallback when using
-Wayland or X11.
-
-* platform/graphics/PlatformDisplay.cpp:
-(WebCore::PlatformDisplay::createPlatformDisplay):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260750 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebCore/platform/graphics/PlatformDisplay.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-index 8bb47ca2b77..f9547b3af69 100644
---- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-@@ -98,12 +98,6 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
-     }
- #endif // PLATFORM(GTK)
- 
--#if USE(WPE_RENDERER)
--    return PlatformDisplayLibWPE::create();
--#elif PLATFORM(WIN)
--    return PlatformDisplayWin::create();
--#endif
--
- #if PLATFORM(WAYLAND)
-     if (auto platformDisplay = PlatformDisplayWayland::create())
-         return platformDisplay;
-@@ -121,6 +115,12 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
-     return PlatformDisplayX11::create(nullptr);
- #endif
- 
-+#if USE(WPE_RENDERER)
-+    return PlatformDisplayLibWPE::create();
-+#elif PLATFORM(WIN)
-+    return PlatformDisplayWin::create();
-+#endif
-+
-     RELEASE_ASSERT_NOT_REACHED();
- }
- 
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch b/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch
deleted file mode 100644
index f4bc7291a809..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 43686247013a1230d47b46d637f928eb47c99609 Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Wed, 29 Apr 2020 08:14:06 +0000
-Subject: [PATCH] [GStreamer] Switch to audiointerleave
- https://bugs.webkit.org/show_bug.cgi?id=211124
-
-Patch by Philippe Normand <pnormand@igalia.com> on 2020-04-29
-Reviewed by Xabier Rodriguez-Calvar.
-
-The audiointerleave element is a drop-in replacement of
-interleave. It should behave a bit better in live.
-
-No new tests, existing webaudio tests cover this change.
-
-* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
-(webKitWebAudioSrcConstructed):
-(webKitWebAudioSrcChangeState):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- .../audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp     | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-index 2f937f677cc..ea134b7b1b2 100644
---- a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-+++ b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-@@ -211,10 +211,10 @@ static void webKitWebAudioSrcConstructed(GObject* object)
-     ASSERT(priv->provider);
-     ASSERT(priv->sampleRate);
- 
--    priv->interleave = gst_element_factory_make("interleave", nullptr);
-+    priv->interleave = gst_element_factory_make("audiointerleave", nullptr);
- 
-     if (!priv->interleave) {
--        GST_ERROR_OBJECT(src, "Failed to create interleave");
-+        GST_ERROR_OBJECT(src, "Failed to create audiointerleave");
-         return;
-     }
- 
-@@ -398,8 +398,8 @@ static GstStateChangeReturn webKitWebAudioSrcChangeState(GstElement* element, Gs
-     switch (transition) {
-     case GST_STATE_CHANGE_NULL_TO_READY:
-         if (!src->priv->interleave) {
--            gst_element_post_message(element, gst_missing_element_message_new(element, "interleave"));
--            GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no interleave"));
-+            gst_element_post_message(element, gst_missing_element_message_new(element, "audiointerleave"));
-+            GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no audiointerleave"));
-             return GST_STATE_CHANGE_FAILURE;
-         }
-         src->priv->numberOfSamples = 0;
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
new file mode 100644
index 000000000000..d7bc379d2b15
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
@@ -0,0 +1,31 @@
+From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 11 Jul 2020 15:28:05 +0300
+Subject: [PATCH] Try to fix another apparent non-unified build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42:   required from here
+/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
+   79 |  static_assert(sizeof(_Tp)>0,
+      |                ^~~~~~~~~~~
+---
+ Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+index 55d9e34df61..12a7a83cc61 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include "ImageBuffer.h"
+ #include "RenderSVGResourceContainer.h"
+ #include "SVGClipPathElement.h"
+ #include "SVGUnitTypes.h"
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
deleted file mode 100644
index 475c9851e637..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 4 Oct 2019 22:17:11 +0200
-Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
-
----
- Source/WTF/wtf/URLHelpers.cpp   |  2 +-
- Source/WebCore/dom/Document.cpp |  6 +++---
- 4 files changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
-index 18e7f13cd61..c584f1a0cb7 100644
---- a/Source/WTF/wtf/URLHelpers.cpp
-+++ b/Source/WTF/wtf/URLHelpers.cpp
-@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
-     Optional<UChar32> previousCodePoint;
-     while (i < length) {
-         UChar32 c;
--        U16_NEXT(buffer, i, length, c)
-+        U16_NEXT(buffer, i, length, c);
-         UErrorCode error = U_ZERO_ERROR;
-         UScriptCode script = uscript_getScript(c, &error);
-         if (error != U_ZERO_ERROR) {
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 0fd0fa090bf..01f76850f3d 100644
---- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
- 
-     for (unsigned i = 0; i < length; ) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon)
-                 return Exception { InvalidCharacterError };
--- 
-2.23.0
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 27c7a387561f..24e8c4e03393 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -6,12 +6,8 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="coverage">Enable code coverage support</flag>
 	<flag name="egl">Enable EGL support</flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
-	<flag name="gles2">Enable GLESv2 support</flag>
 	<flag name="jumbo-build">Combine source files to speed up build process</flag>
-	<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
-	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
deleted file mode 100644
index 430f780b0e2c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
-	eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
deleted file mode 100644
index b9b0a863feac..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
-
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
-	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
index d8c2b014eb30..27ed996c0ab0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -119,7 +119,7 @@ DEPEND="${RDEPEND}
 	virtual/perl-Carp
 	virtual/perl-JSON-PP
 
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
 	geolocation? ( dev-util/gdbus-codegen )
 "
 #	test? (
@@ -167,12 +167,9 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	eapply "${FILESDIR}"/${PV}-fix-yelp-desktopless-build.patch
-	eapply "${FILESDIR}"/${PV}-use-gst-audiointerleave.patch
-	eapply "${FILESDIR}"/${PV}-fix-ppc64-JSC.patch
-	eapply "${FILESDIR}"/${PV}-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/${PV}-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }