gentoo resync : 07.01.2022

5 files changed, 2 insertions, 626 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7a41a150b02b..b2b4d9c9b8fa 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,13 +1,8 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
-AUX 2.34.1-opengl-without-X-fixes.patch 953 BLAKE2B 06d9e12a9ccb37950e87c89031d1067c8cea5c9cc4b0f802386d32c4ca8499537c95af799b9f9e9c57008e65c38716b01cf0dfd012900ae32a36d813311b48f3 SHA512 854dcaef25ad6927a288bdfbf842dcec385954abff1af710c9e789cdf4e194a271561b2bd8a695d051f675a3c2219563d834461f19ceee10e2320f6ac2bb5284
 AUX 2.34.3-non-jumbo-fix.patch 1056 BLAKE2B 4d229c01fbfae518725bb802c0fd907a1dc8bd4edd41be2b48075471f31ec84b6f9bae1b97294f46a42ba77a081e3705be3ad49177de28791a495f19ddb4f51e SHA512 1ace5a3c1e775f258c67c59987a0c84ebc7cadd007cc0b79b282712b354cdaf9eb4dd6ef75b85b234ad3b16079ac8dbf2890921165854fc2da51f79cbd5f0e79
 AUX 2.34.3-opengl-without-X-fixes.patch 1436 BLAKE2B 231cdc9a428342d7fe98a1c1fb230b345f29b6a2d45da02cfa674dae1ceffbbcf5d62a77e903f690b59eb49ad7a3e50dffc190ea57bfa953f10fccfeb6dd4dfd SHA512 1af17f79d2a60cdd5337ca5a571787fb2cc1abc7d3f392b6640edc88856e2f8fc3e77625fdfd600d9ba9376a18ec379151d064d5f7ad1b2bfed0db2e0330e2ee
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
-DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
-DIST webkitgtk-2.34.2.tar.xz 24996572 BLAKE2B eb89965065e39d6cc2b54a4a167a19fee50387a25a5285b5eb369b6f2a7af550bff5b476fc27d5e4348c40e2523b76c31116d9ce2f70578f38ce81b2379143af SHA512 37c40fb067ee9f5bb8786bf2ce92aac885e9c5c2da4bc5f4e81682ccfb5eeb0aa94d5094f6aa99a9af216f542d1823094cf27aea13c7be3e5e6e3f6a9729c7a5
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
 EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8
-EBUILD webkit-gtk-2.34.1-r1.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
-EBUILD webkit-gtk-2.34.2.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
-EBUILD webkit-gtk-2.34.3.ebuild 8268 BLAKE2B 727e2f8cceed5137ac668da87bf09b4b0a4f33443b3d0b0478279ee0a542d92f15d848840ba7d8527091957762166be6ad9b01d6e4c70284ad6e13b66b228fc2 SHA512 3f3f19f6ee99db72b8b7559b12d5230c3d0e1e2ddc07d3642caeafa2c7bb13550ea890714a91ff5f3463676b0794a7bf945212fe322f48c95b4085a02f674b54
+EBUILD webkit-gtk-2.34.3.ebuild 8266 BLAKE2B 754573cae584af0b855e30136fa4885a6730ec6f80b08bba74942fbe4eddb0538be06c4775df1943794b5a9b6f83a0125f70d5eec8fe8202f32eaa6ab4d9c612 SHA512 6b2e09bdefa19fbd3d57b9833b648353099abff0b26b1374d3739a1919851c7febb65ec974a2dec2921d1b35eea6914f27e344d78fe8c405e1cb5c79b77b8901
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
deleted file mode 100644
index a4cf86f36cbf..000000000000
--- a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=208907
-
-From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 9 May 2020 23:11:52 +0300
-Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
- some build configurations
-
----
- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-index 3515be452b2..82cce70f14b 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-@@ -64,7 +64,10 @@
- 
- #if USE(GLX)
- #include <GL/glx.h>
--#include <WebCore/OpenGLShims.h>
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
-+#include "WebCore/OpenGLShims.h"
- #endif
- 
- #if USE(GSTREAMER)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
deleted file mode 100644
index fec3dc003ca7..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd 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.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# 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:=
-	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.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-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.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		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= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	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 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${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.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	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=gles2-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}"/2.34.1-opengl-without-X-fixes.patch
-	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 "-Wl,--no-keep-memory"
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "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=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_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.34.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild
deleted file mode 100644
index fec3dc003ca7..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd 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.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# 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:=
-	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.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-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.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		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= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	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 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${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.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	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=gles2-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}"/2.34.1-opengl-without-X-fixes.patch
-	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 "-Wl,--no-keep-memory"
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "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=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_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.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index b4da0e93b88e..a21471f285eb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"