gentoo auto-resync : 19:10:2023 - 03:53:34

8 files changed, 51 insertions, 767 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3fc77007873e..6c2c31f9533c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,14 +1,11 @@
 AUX 2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch 1059 BLAKE2B de9edffeb14808fc7b04339af660343e8faeb599254157cd31cca0ef7b012526c9d27e44fbb8c27881c3836d80b65493081fd314e891cd29af147242b4a863b2 SHA512 b7ece6ebd90cf6c04e26cae1a809d7ec3925405a17b709809648b216426d19bbacdd6810390927622f965c334a220c4614a98fe38514246cf445a415859bd2bd
+AUX 2.42.1-arm64-non-jumbo-fix.patch 1491 BLAKE2B 2902c8f26730fe92c3604ef264ed4bfc9b88d39fdc0f9babb9d48849840167b9d52eb45d20d8e4ea4a3363a8a3bb6b89a5a1ae32a24a0f9a0e86581c3c6d3d6e SHA512 f9be3b4bc29a8c7ae81e4cd5e817e52de409694db72303a255ee8660a1157b8392e3b9d8ff65a9ed84ee762b6b8b007aa2bf3811bba2276352182101097657d8
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a
-DIST webkitgtk-2.42.0.tar.xz 40917832 BLAKE2B afaaef8482fe81645eee55be86a80fb51eff83dc000ac0dc5981d41810b5c72c59428d8e92a02c04718c0367ac19689501c81764f9603b767d7271ad9cd66075 SHA512 f71627182707f4ab34483a16b74d1519d7234833151ced818e54749f8ecb1f2956cc5d76e09957d07b727155c023e7b75426ad38ee955928fcac9e68d6304e2b
 DIST webkitgtk-2.42.1.tar.xz 38011772 BLAKE2B c6453cf2d15661507df66c5478e7675217b62d9579cf9b9408cb3e4fa1a8405c5c2608edf0960baed62aafa766e6cdbe2f0c07e8fb728d86c111f12d5a816492 SHA512 c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c
 EBUILD webkit-gtk-2.40.5-r410.ebuild 8099 BLAKE2B 944259f71714a4b21081d8bff8e27e394ab708d76ee4d2e5bcb37e2615d127c810b54e9b01c727daa8f18894da049dd4cfa4f5f12a4368d5858d81f9476caff0 SHA512 ab8888a79c9d9b990b5b8c114fd17488a6f7762cab9f12c3f239b38a790011d69782475322f1315bce9fcab97b0496c1e89e5a5c876a770c6987c02f76a96446
 EBUILD webkit-gtk-2.40.5-r600.ebuild 7988 BLAKE2B 2f9b8087eb25d576a3c6645b94ead0f39696ebd26456afbdece19b8258d935855fb31f9c7681318e179d5141b2403f643c92d91c62f1455c8959e4b756a83df3 SHA512 577b7b7e10d27075d73936df16f6d0b8014b41f34141ddc23335788bdf6aad87d6525a95b0b7819bab3cf79b544d6ed5e66c3c7e6c8337fb76063f1673ed8e0a
 EBUILD webkit-gtk-2.40.5.ebuild 7825 BLAKE2B 08e9ad86b3dca85c4c9a728c4c7b7e0374c732f35949cc9441d1b24e50bae4e5e62602d94e9a4a34a10032ea63ae858487dd514b551a591eb311ef0f2ca1bf12 SHA512 1c4a274afcd91639eaa22862fc01594109b257688dcdc917e80cc71dc198ff3ba55d89a28fc925cc1e02b16c606bdde35f20a5d85e1994d348955cd8bdfc4c6d
-EBUILD webkit-gtk-2.42.0-r410.ebuild 7864 BLAKE2B badfeea27811b31e8d47924f80a85c782ce597bf600e15879149a791825cd8a5c8b4d74f529cecd049f2f55ce737c8919d508ab78384ee2a77ae20bb0e52f0ab SHA512 11cbd27a7b7fa2dcd27e2f3c882dd4eb71f08a4e3fa4d43c5e94d0143592117b4b59df29096efc05060a1b32d8331c92e5a799392de26dca551336e000d323fc
-EBUILD webkit-gtk-2.42.0-r600.ebuild 7761 BLAKE2B cf7ebd55993bd940d2010e9869b05df7312f6991cbc72b5e7c28287beb1176f6b592ae5641360eb3f6d2d9373df6e8a8adb6b0c833852aeb5e2f946830851490 SHA512 83d6783e92201d17883b44f3e349c313ce6617bb91a512b7cc24f4e8db85ea044e175ccc69af64bb39cd1a11cd08f64bad89b9f85250425b81a26084307384ed
-EBUILD webkit-gtk-2.42.0.ebuild 7590 BLAKE2B 789c6146a91ffb4a2e472afaa6bdc72d569dd96374d9f644938ba6498eefb48cd8349ea1ced8d205c08b4b3f978752292610f570ec9244ffe2043d695414d3cb SHA512 4f4523c1d72440bc6929c66149af8a40296fb1e2eb2b7d3c4128b9a161468a6dfbac990f67de248204aa05d1be5b179e708be058a84c7c3843bb7b5876cea8cd
-EBUILD webkit-gtk-2.42.1-r410.ebuild 7864 BLAKE2B badfeea27811b31e8d47924f80a85c782ce597bf600e15879149a791825cd8a5c8b4d74f529cecd049f2f55ce737c8919d508ab78384ee2a77ae20bb0e52f0ab SHA512 11cbd27a7b7fa2dcd27e2f3c882dd4eb71f08a4e3fa4d43c5e94d0143592117b4b59df29096efc05060a1b32d8331c92e5a799392de26dca551336e000d323fc
-EBUILD webkit-gtk-2.42.1-r600.ebuild 7761 BLAKE2B cf7ebd55993bd940d2010e9869b05df7312f6991cbc72b5e7c28287beb1176f6b592ae5641360eb3f6d2d9373df6e8a8adb6b0c833852aeb5e2f946830851490 SHA512 83d6783e92201d17883b44f3e349c313ce6617bb91a512b7cc24f4e8db85ea044e175ccc69af64bb39cd1a11cd08f64bad89b9f85250425b81a26084307384ed
-EBUILD webkit-gtk-2.42.1.ebuild 7590 BLAKE2B 789c6146a91ffb4a2e472afaa6bdc72d569dd96374d9f644938ba6498eefb48cd8349ea1ced8d205c08b4b3f978752292610f570ec9244ffe2043d695414d3cb SHA512 4f4523c1d72440bc6929c66149af8a40296fb1e2eb2b7d3c4128b9a161468a6dfbac990f67de248204aa05d1be5b179e708be058a84c7c3843bb7b5876cea8cd
+EBUILD webkit-gtk-2.42.1-r410.ebuild 7965 BLAKE2B bb6d2a3d564067501b5506e29c61483d4716e2fc0ab05af4d6df995b5502d24c35d935fa6ca5a615691d9e47e017164445e362882feec2b6234165a1c8b92496 SHA512 ba8bf837b278f52d345081e901710c2ae039c235bd9aaa47f1fedc77426c3008224ac3b84f2023134de4b0f0f7c3417c02960b287ba30a03cca997274abe1841
+EBUILD webkit-gtk-2.42.1-r600.ebuild 7862 BLAKE2B 53f78f9e677fd636cdb474798ca830a3526c10fe9b086668200a028484c761244ada18eea23727eb79ccc169f76b6418d0406a853fda43632f81e2254f8b0213 SHA512 ce50b8795deee9b2e91053570b2f90e660bc2213657acd348c8d88d952ad7de0d152dfd9908210eedf782897d3b43a79ce8ef691bdc45cfda87ea7e4e29c10e8
+EBUILD webkit-gtk-2.42.1.ebuild 7691 BLAKE2B afcf77427e907c9e1af751397aa3849c2146d7bb6895829882d0987b64b483e4646288ff2cb1148e27a334157f2938e44642b804c8bd72715cdb662c7e40cf8e SHA512 e23de36a670f61101e982b4d5b2025f6b40140e7dd7c478c62b4b5b71ef4281bfa5151056cfc5cbf6ae02c145f09af49b0e319354648fefaab61cb9528554559
 MISC metadata.xml 774 BLAKE2B 13bbabc7d1fa7b1f8218091a6c575d7e95a80904f1927bf2dff5ce499445a45f15329f0ee29d97b7f3e493d63595a6a8a7f65db808d1c2fbba74b48b94adc7fd SHA512 9032e0d2cf83f1c388ea66cc2b28e9db464f77a35f12dac94308096e6fd309df2080ebfd2d25da4a04e72266e1f68d4d7462657197f4765897570e1ef526148c
diff --git a/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch
new file mode 100644
index 000000000000..ec05d647d7f8
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch
@@ -0,0 +1,38 @@
+From c5e664167ec74b24a9082506fe17dee1ea194185 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Oct 2023 13:08:30 +0300
+Subject: [PATCH] [JSC] Fix Air OptimizePairedLoadStore missing header includes
+
+Reviewed by NOBODY (OOPS!).
+
+Fixes compile errors with non-unified build by adding missing include files for
+single unit compilation.
+Fixed compilation errors:
+
+error: incomplete type 'JSC::CCallHelpers' named in nested name specifier
+error: function 'JSC::B3::Air::Inst::forEachDefWithExtraClobberedRegs<JSC::B3::Air::Tmp, (lambda at ...)>' is used but not defined in this translation unit, and cannot be defined in any other translation unit because its type does not have linkage
+
+* Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
+---
+ Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+https://github.com/WebKit/WebKit/pull/19242
+
+diff --git a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
+index e6fc4d116d00..8321ba03822a 100644
+--- a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
++++ b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
+@@ -32,7 +32,9 @@
+ #include "AirArgInlines.h"
+ #include "AirCode.h"
+ #include "AirInst.h"
++#include "AirInstInlines.h"
+ #include "AirPhaseScope.h"
++#include "CCallHelpers.h"
+ #include <wtf/Range.h>
+ 
+ namespace JSC { namespace B3 { namespace Air {
+-- 
+2.42.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild
deleted file mode 100644
index 007034b448c5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-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.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-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-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=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
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-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
-}
-
-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() {
-	cmake_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 $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		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"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild
deleted file mode 100644
index c3f8c3afb610..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-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="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-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?]
-	>=gui-libs/gtk-4.4.0:4[introspection?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=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
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-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
-}
-
-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() {
-	cmake_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 $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		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"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild
deleted file mode 100644
index ff1b87b91e12..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-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-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.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
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=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
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-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
-}
-
-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() {
-	cmake_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 $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		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"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
index 007034b448c5..19c7f97e3817 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -150,6 +150,9 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
index c3f8c3afb610..750b51413093 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -151,6 +151,9 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
index ff1b87b91e12..86bbd5c5de8a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -148,6 +148,9 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
 }
 
 src_configure() {