gentoo auto-resync : 10:10:2024 - 04:03:57

20 files changed, 963 insertions, 22 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7fa6810b5ca8..51000ac93162 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index d001296d2b9c..c32aaef3d3ad 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,6 @@
 DIST libmbim-1.26.4.tar.xz 566188 BLAKE2B 96fb932e89455364eec39d879256eb10efd4fafc18c0dc69619b3a73cea1e62e3ea50b828c2785082e6422c39d8775c9bc1c084db3aaafdf054b1e7aa7d6929f SHA512 a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8
 DIST libmbim-1.28.4.tar.bz2 213993 BLAKE2B 86418182fea2ed50d6b606b898e58f0511ecc5ed4be36748678befa3c005d37a2364db6f4f5537f6a616015f635bb77cfcae282b328b1dd3f5807eae360e93a7 SHA512 f6ac196106e70c790727438a4f42c14b3f8e82dc96b9ac244fbe44b9173132d9562dd6250a51bbf21fc3b84a2a059ae9d7d02d08cac5ba5775715507a64d66d2
 EBUILD libmbim-1.26.4.ebuild 819 BLAKE2B 3d5140aff14fd10406cd9413a0a2b1f5f6909096a0f10ee44b0c65cf5186306ec7b62d58faacbc4ec5fc700fc0c527900fb5aad9dc9df91d8dc7b45d40e4f8a2 SHA512 d95db5914da4c5e065f3837327296e318385471e26f5272ded454bd4e849778b650833a9c4b0fc7c632e241567a6cf99187457d815d6bf4c7fbaa6f80a3c8ad2
+EBUILD libmbim-1.28.4-r1.ebuild 1160 BLAKE2B da60cec71b0635e2613e8d49a4bcced48e877c863227d3be90448d31da879753511838ad018bd1e79e78f030a2c595b4b792fa81f7a8086718b348ff63ad29e0 SHA512 109eb3cef1443f7c6f41482f85c825ff3d0d43c9cb096de865bf1a87c15f56e08e8aac747a370653529b65a3c6db0dfa8697220611d90c282b7936517b1d67fc
 EBUILD libmbim-1.28.4.ebuild 1114 BLAKE2B 5489804413ddebc3feeb7d339c8f8f8dabc9b4e26832ec04a31f72754e788075a60aa3553d2bf3eb6be64b21d27b88ba642939dd96bd6f7f15188b7aa775aaa4 SHA512 ffcc93b542caf06c8bb034958b9f0dda0196ec8e7afde7a8317860dbb19b12250535ba4a41ec9fa6150ff317e6f61c26b972cee13ebb07867ddbcdaf28010a99
 MISC metadata.xml 338 BLAKE2B 2815902ffac2d76180100eebb3c6b7e72c17b024325d0e4dabf24a7dd1a0365c409e95b2d735595c762f9f16dca663ce34106bbedaa872a5ed72435778914b6c SHA512 f43d3c8e5b608e73f8a230760bffc555c0728f9109b321d7205288de0a52e4867135b026b8775b4443f9db761874736bc849d8b16cfa636685e115fe9b9f53b2
diff --git a/net-libs/libmbim/libmbim-1.28.4-r1.ebuild b/net-libs/libmbim/libmbim-1.28.4-r1.ebuild
new file mode 100644
index 000000000000..d64b685b3b68
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.28.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 meson python-any-r1
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
+SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="gtk-doc introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	gtk-doc? ( dev-util/gtk-doc )
+	dev-util/glib-utils
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman=true
+		# Let's avoid BuildRequiring bash-completion, install it manually
+		-Dbash_completion=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dobashcomp src/mbimcli/mbimcli
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index a09a047c400f..4da9c0fe8025 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,6 +3,6 @@ DIST libpcap-1.10.4.tar.gz.sig 442 BLAKE2B d0eb5da9a57003848b24d458e50a201d0bb88
 DIST libpcap-1.10.5.tar.gz 974772 BLAKE2B c0bb29c5c308cb21244a9c63d3daa19033eb21fbd721607c057f04b2ae6b2527fb1cfeeb2b29b7c3535d5d6256aa5fdf5aa22ce48aa4f88a3cc8a81029a98116 SHA512 e599a31f2f1c03bdf386defa613ea9f08f80459c87068c2dd36c55c1bd678e2622cdce6333f0a776f16812df7bd4d6747820d1c35c7a2f1d7ad4a2ffb45dbe24
 DIST libpcap-1.10.5.tar.gz.sig 442 BLAKE2B 6816bb76c6b41b292a29edcff7d89e71511d25190da7e4f26296fbae2690e476b5072f44b5ff1c9e43f31403a37e23d69c18e1f2483488fe8d742cbe3f768312 SHA512 183ed0f6a93679550dc5a589422e92023a92be8fe29f79fb296e966f26e3693e1c6d47c5e88bccbb6004cb19b6419c9d7cd998f4e2255f5594a7f5f6e84ecdc9
 EBUILD libpcap-1.10.4.ebuild 2377 BLAKE2B ac8d3a3719b8431ff8dda801c5958b2caa626c9efc14f70fa16a1a77116f0b870d96636703ab50d453a7ff9f3567b8954a0ecade30cca8f7a01926387dc22814 SHA512 7f47214d63ad29ae36a5e01878efc9b3ba9ac7fc35d068b79546ac1fe656f838a9de5a4675d915075a01bbc4fdc0f96dccfd44c64f523d93a5bf0496c47f6a07
-EBUILD libpcap-1.10.5.ebuild 2391 BLAKE2B 32cb8563e01a39a2c0e9fe196cee6381ea9e990d8c00488819ca8bf92bfdf666e4768612acc8be9577199fb22ed9f576863de0ea62346db97fc5d6d7bf9242fa SHA512 39d4f39800a3da01a36eeaac5c80fb4d332f832e68d715c7375e0063506cc008e9c8e313ce14ad7fd93ccac8d13bbad4a4aa2f7c5f1fae23523a4e19c7e6c8e5
+EBUILD libpcap-1.10.5.ebuild 2390 BLAKE2B 4460a2997b1c60f6a463694002e0901a5d4c411d53cf0005667e8733c24ba78cdde62bfde5ca7cd7076c834412c192f2a72f58caa6c4411ae029f4c878d5fa68 SHA512 3be60c1507f9c2af0672234befb7c2ab829e3153a2d3fbc040ee6f75dafc3a9fad9e1c6c728e4531770da40be6c956bc6a42e76f181c9ec5ec4c5cc9519c6427
 EBUILD libpcap-9999.ebuild 2396 BLAKE2B 50d1e0a02ff2a6f3d5cf600a0cee98924a5a6aff8cdfbb5a78349efdb5ef24b13bbde022282d81593f91b910e9cac872bc3ea27cc0442a8aad339b18076608b1 SHA512 e6dc3c88f030dea951681edb372a200927c25e73dc6e2cb18bf340dce70a6ad5f1436fbb3ab04b267cef100f7ab4aa39859d23119179cf81e99a8ba3768adf47
 MISC metadata.xml 811 BLAKE2B d3c9d3d8ed42bb512b1d1608076d19ee7f3d3f06f5c622bfbe2f4ea1326397bd03fb480f4c01caf8c367b58a3f466f0b94b5e94b14c9d66cc7cbbde3c70651ec SHA512 bbef3e91d4958ec7070871f176aef2934e15d6bb45a45249dbd903b7dc108931c48df691df5810ad0e95c6bca2be707f88646b79b0d42a4a3c8966b6d0918dfb
diff --git a/net-libs/libpcap/libpcap-1.10.5.ebuild b/net-libs/libpcap/libpcap-1.10.5.ebuild
index 1442979feb78..5182af429187 100644
--- a/net-libs/libpcap/libpcap-1.10.5.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.5.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 # The project itself has COPYING with BSD, but the files used for
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 07200d942030..3c33c92c6625 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,3 +1,3 @@
 DIST libpsl-0.21.5.tar.gz 7624251 BLAKE2B a0076f622b85df99f866de6707850ac216b764bdb68c6d516f4603da42dac8eae3ee4c53d68dbb6af6f779c2c7f1b9caab74c8b558209b1f6823f95c13fc3ceb SHA512 c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5
-EBUILD libpsl-0.21.5.ebuild 1299 BLAKE2B b93529d39a5c76336173c8c489204d3dd023ee38c1072357537ac2332fd3e268aff405676eb030a77fb69de9f1ce13c6351b2e23b32a3586a8c19737e4ade5bd SHA512 6cc9f19257cb29a2936c07d2623df01999a0477de0a024d35a21ffe60fd1a56cd08903a2311d8f577bd3cd39a185690e09bedbe2b8e3815e5de3398926a67e01
+EBUILD libpsl-0.21.5.ebuild 1389 BLAKE2B 4c2e62ebc32e22a4c01bcc3e08b86287a3a42ea10cd47c7839fceea34f06da98a59d53b1bc7299a0938b5e602aead21691237ddf71bc5f5fb90852d15f02d588 SHA512 9adb3f427bffa94176307cafde425f3153905ba8b54ad095e999a08fb3ba54681d6e75c9746ee9a2a2e34cf214d76bd4c97ea169133144fba99f2e20ffd9a09b
 MISC metadata.xml 341 BLAKE2B 8b4e137684e24b96357cbd463dc95b7d1c0bdc6bd33f51f0a43b8bb80063db494c56afafc5c48f369f0b12fa87d468792bb7e883a1ee7dbb93370922d050a7f4 SHA512 48594aec5e8bb724ddbab35405d9257688ea5ac8eeb39cd4b06f9f9e53c95d821b7bb11a61f3fd54da85fe902c296fb2bb4e5d79ed866e93d3a5c7da330f8a44
diff --git a/net-libs/libpsl/libpsl-0.21.5.ebuild b/net-libs/libpsl/libpsl-0.21.5.ebuild
index 797883568aa8..9ca8c1d70d9c 100644
--- a/net-libs/libpsl/libpsl-0.21.5.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="icu +idn test"
+IUSE="icu +idn test static-libs"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -58,5 +58,11 @@ multilib_src_configure() {
 		)
 	fi
 
+	if use static-libs ; then
+		emesonargs+=(
+			-Ddefault_library=both
+		)
+	fi
+
 	meson_src_configure
 }
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index c812a9f7e13a..543de76f119b 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,7 @@
 DIST libqmi-1.30.8.tar.xz 1244844 BLAKE2B c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1 SHA512 60567e82eb35ed7ab3d65f1073e19ca8faa68e909f96e498b8f9d8ce2a987156e0a580f9c212416c4e0740d2ad05cb93f4dfeae9b2d048f0eb53ab6a83f6d024
 DIST libqmi-1.32.4.tar.bz2 3710575 BLAKE2B 728cc821208432ec69d21d6b1b16e82f982e27ba899e0a2426b6e1ae6ce8cc800f15417e4d5ff6fd9a60ad2a0e7c3f3ddc77caee9115431d174e29bd40a8398b SHA512 6f68e2dd4bf5493de0c9298d88e477f9477b367f887bf5321a1faab7e8217fd10e761748326deb37ca26659bef70d5c8464bcb964d0ed0ba1f44c423785ebb0f
 EBUILD libqmi-1.30.8.ebuild 1268 BLAKE2B 8c7eedda6bcbab7e0e401980883b80fa2425c43e5537121689d0d180d3cea553e3b05eb9a492341a0ffc7c93554846b8f3b0901d8f0fba6b39f268a30c905555 SHA512 80dde870797eb4e8ecdf7f3df8eaddec90d884de1b293e24059b5648d396cd0bb0351ce59bd649b16d3db9449cf585d32659082cd2af4c7c1df8b53ca8b7b4bb
+EBUILD libqmi-1.32.4-r1.ebuild 1457 BLAKE2B a267959e43675c8b92a0ab55dd2700602deea71dc5bc8e70f8c2967338ada8497e9d7875205176424b7cdf0f3a98cc3cc9cb1ae030c23a4d4a6f74a01f01a5e5 SHA512 8c6a9ab7866b2fca8c9e042f3a2e54dc79bd6ccb128d7c43706e0ead1025b3e6090bae423ed95811ae2dec14b7c3c0b1871b7837d333e8a340e336cc84e90bb4
 EBUILD libqmi-1.32.4.ebuild 1413 BLAKE2B 8f0689e5ae8cb51b2a00e2706c8380b96f4d28a2795893118f7aa0a2da8d32c960607f45ded8ce530b39375741d36153d8e99b736e7c746be091eddfb48f1919 SHA512 c67623b32a0225b2857e9811c851d6619a6f8684e7ab909c31854887a85d2becdb7be98c29c5084278c7c6d5d01ee5e0b7547edf2a94936fb160e06845aa5469
-EBUILD libqmi-9999.ebuild 1419 BLAKE2B 9c41b6e9bec6d317df230a043785e5d970ccdae9a1c17ed9a2f51ba3c1bf7b121411f51c6c06473d4bb72b947c2fa169867efebf2821fb2ab6c09570b7c5924d SHA512 99522e01dce8a5cd78fc9233956cf810cabe101265e400acc4dfcf93f4927a0e74b1c373d22c08241b158dfd938f9b6ffae9dd0bc07ab7b16af2ff100da3475e
+EBUILD libqmi-9999.ebuild 1457 BLAKE2B a267959e43675c8b92a0ab55dd2700602deea71dc5bc8e70f8c2967338ada8497e9d7875205176424b7cdf0f3a98cc3cc9cb1ae030c23a4d4a6f74a01f01a5e5 SHA512 8c6a9ab7866b2fca8c9e042f3a2e54dc79bd6ccb128d7c43706e0ead1025b3e6090bae423ed95811ae2dec14b7c3c0b1871b7837d333e8a340e336cc84e90bb4
 MISC metadata.xml 584 BLAKE2B b68349a0ffdd18d892129b88e33fae82e294fd52cbe4c4d90bd750750aa7918ed96ef2a734e01b2b70af525e7fc2bc2bac6bf2592fa941ce8805de7f810de856 SHA512 50549b9ad459c518b1248df30b428e585e14ce7285d442a1d070ea9a98c268fbc282c21bf1349111fcd0d1226f86534791aeb565514618a4a0b8543930164cd3
diff --git a/net-libs/libqmi/libqmi-1.32.4-r1.ebuild b/net-libs/libqmi/libqmi-1.32.4-r1.ebuild
new file mode 100644
index 000000000000..68b118b34834
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.32.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+inherit bash-completion-r1 meson udev
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
+
+LICENSE="LGPL-2"
+SLOT="0/5.9" # soname of libqmi-glib.so
+IUSE="gtk-doc introspection +mbim +qrtr"
+
+RDEPEND="
+	>=dev-libs/glib-2.56
+	>=dev-libs/libgudev-232
+	introspection? ( dev-libs/gobject-introspection:= )
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use mbim mbim_qmux)
+		$(meson_use qrtr)
+		-Drmnet=true
+
+		-Dudev=true
+		-Dudevdir="$(get_udevdir)"
+
+		$(meson_use introspection)
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+
+		# Let's avoid BuildRequiring bash-completion, install it manually
+		-Dbash_completion=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dobashcomp src/qmicli/qmicli
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 5336e7de9c06..68b118b34834 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,8 +7,8 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 inherit bash-completion-r1 meson udev
@@ -17,17 +17,15 @@ DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
 
 LICENSE="LGPL-2"
-IUSE="gtk-doc +mbim +qrtr"
-
-SLOT="0/5.9"	# soname of libqmi-glib.so
+SLOT="0/5.9" # soname of libqmi-glib.so
+IUSE="gtk-doc introspection +mbim +qrtr"
 
 RDEPEND="
 	>=dev-libs/glib-2.56
 	>=dev-libs/libgudev-232
+	introspection? ( dev-libs/gobject-introspection:= )
 	mbim? ( >=net-libs/libmbim-1.18.0 )
 	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
-
-	dev-libs/gobject-introspection:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -37,7 +35,6 @@ BDEPEND="
 "
 
 src_configure() {
-	# Let's avoid BuildRequiring bash-completion, install it manually
 	local emesonargs=(
 		$(meson_use mbim mbim_qmux)
 		$(meson_use qrtr)
@@ -46,10 +43,11 @@ src_configure() {
 		-Dudev=true
 		-Dudevdir="$(get_udevdir)"
 
-		-Dintrospection=true
+		$(meson_use introspection)
 		$(meson_use gtk-doc gtk_doc)
 		-Dman=true
 
+		# Let's avoid BuildRequiring bash-completion, install it manually
 		-Dbash_completion=false
 	)
 	meson_src_configure
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index c8a88076097b..087928f663c2 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -4,7 +4,7 @@ DIST nghttp3-1.5.0.tar.xz 391668 BLAKE2B cbafd1e927bc39db78e238c0a7330170ec8e7a6
 DIST nghttp3-1.6.0.tar.xz 392480 BLAKE2B 43cedaaddaf450a8c3cac4be2353605c85230ef394a94bd40d74f1561fb3593d022f865da41aa05d301de43ccc0aade69f015866cfb93501c4c9083808ef81cf SHA512 d0f585cf388a48d391f803897b0998c12c39e118ca380ecc48c4d3dfd3ff4588a5e456dc89a96f2f5ffd5afc261a2d60a71fd4d8ebb82af35bfe6668737538d8
 EBUILD nghttp3-1.3.0.ebuild 744 BLAKE2B 994f0c78236499781bd2f9614027cece2269bec984b84832072a5b2a13c4bce12b41db6e0cbbe64837d42a2b534eaf51c4293bce57c584b62be791739ab91773 SHA512 7de158fd566b4a1e85db9f4a7cf6b2da7204618dffc59a5b5ded3284becc80b68bfa71d952505ca393eea9f10b31c02eda355eced3c68428768fb47ea0c76fd9
 EBUILD nghttp3-1.4.0.ebuild 953 BLAKE2B c3aa735822acdf3c34b2c013fa8744b822e78072f3f7fd6c59f1df8a39621efbd160970bcfbeeb0a3afb39fef40bb091c304bff85decb5e4a418fc2c56a5089e SHA512 ff2fe912a4e9aa9c7f061d1efb0db7aa4d0c2b6c87580ec93776fc1470a6b3336866b14c5ac54939df5f18e0ed050ed0d79571abfe92b5c36d78181ad0c2f8b9
-EBUILD nghttp3-1.5.0.ebuild 961 BLAKE2B 1e07bbbef4267df26f0ea2a4cc965622c08001799ec03fd6581384d75969ec702fa1eb18d92ac47a5ff0f2012624ffcc174cd4075b266e45de79e3bb597019ee SHA512 616e3d9ea699ae2b14e6fd70faace8518a796eb8e029d6df44f5da10e19dc16d3f9fa71c8404b5510c2e092d07b912c872bbcbf25331aacc51bdddacefb13503
+EBUILD nghttp3-1.5.0.ebuild 960 BLAKE2B aa66799695e745be0a5eb321a29b9cf64bf244f105d40bcd1d0b172683120e6db802ae2a3ce45ee34d4ff1bac3f585482be0850a09a0ca5dd15ef34f9bc07871 SHA512 5f7f823c245f99ca446e52d03480345902acbaf14a859aedaed3fb500a2ada906e0abc974bdfe76f1e44f880d885f7a2bf309c2a170ba143c10aec92dea82571
 EBUILD nghttp3-1.6.0.ebuild 951 BLAKE2B 1c8dfd2fb3926e70a9a847a429165e7741db9836f415460c4fde809aa64a4f6c9aeb3e63fe78ba5803916024799f15ef6b62cc7a2d7341dd289f0f714147f3c5 SHA512 6ae1125d5010edf42044d61b26716d62055bab7d498c76c558bd55ac199542df99edc44e828cca250add2e75bb3e8d99b727bc47edcd47ead4e30dcfc4c2ec4c
 EBUILD nghttp3-9999.ebuild 903 BLAKE2B 688e8d22b7ce67aa1b6605bd4c0cce375b7943d5999f4644801494e3da7e51e16027b26b1cd0b3f560aa083a3a24b32a94960dc47aa5c321bfec35d9212e4959 SHA512 34c929f7296197bda8e6c082726ddc7c5770849c0d7336649e180ca3830c9b634db8d4160f476b4518437ef436c13ffa0825a317e1ce17db8d71bae0adc0dbd8
 MISC metadata.xml 328 BLAKE2B 6f0147cead329ef6b779485417ff33e5814b0cd86e99b571b0dc5653a7ca8f80f65fddb8b1b58fe249b7b86c0aecd32a446d415065fc70a0c72bf69651b19d25 SHA512 54e49a9c82c6a7f7a50daf557416845fa5c548f11ca243ff236105ad97903ea983436e94067c831b93ca95da154dd2561e314e96e8bde6d4678efd1adaf02f11
diff --git a/net-libs/nghttp3/nghttp3-1.5.0.ebuild b/net-libs/nghttp3/nghttp3-1.5.0.ebuild
index c653227312aa..1cd64fc96429 100644
--- a/net-libs/nghttp3/nghttp3-1.5.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4d671dbadad4..31d193237366 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,12 +3,17 @@ AUX 2.44.1-branch-patchset.patch 11288 BLAKE2B 0966d524063bc6137464eca431d161ac3
 AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802
 AUX 2.44.1-riscv.patch 2977 BLAKE2B 37a6e22cea8f621e1857141a77b886d82afca1bec70d56b5ecce4b5f89eefc1c0c311f11521840872314a1372ef4666b71000ed14eec787a26c4dc694a1168b3 SHA512 ee5ecbc98c0a40d41477975adc9d4d093cecb9dfe26901f6a5eed510bcefb505885fd7dc99cccc20a79661df900a70a985d2cf740f51481037a8888961488cda
 AUX 2.44.2-excessive-cpu-usage.patch 2972 BLAKE2B 2d01af909030900b4c2de7e441b4c667cdd739d3856ee21a2ec1f49ea74430159b1e66b7dd2cefbf6be6c4684a6ea70b39b7064d751076e2d409cff40e7a7521 SHA512 6a0b65e7c70d5d7ad1c80ca4441a3442dcfb399f55dd1c3c1771f710e20da45bb92490967e9efe8943b89b0c298812a65112100bdb0fcacefc24cb695b1bb61c
+AUX 2.46.1-riscv-buildfix.patch 2144 BLAKE2B 27515b7497cb0ca0f04da4352fda97eb254643e1d2486603bb82aff32c96da2f0a08d0cb50b3ab124c83d249816310add54ca6b589372fd1756723ed6db6b4d8 SHA512 4020e64a11fc3df014deb568dcd6f8b07c9ebef53bd8b0dfaae94411b7bedbf14aeeb6d5eea893a4b45da41e29720b69f2d17c81f887ec3c23e6c84cca4d6a4f
 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
 DIST webkitgtk-2.44.4.tar.xz 35858056 BLAKE2B 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c SHA512 037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9
+DIST webkitgtk-2.46.1.tar.xz 42776840 BLAKE2B 784b4cc4d59da31000612955413608f7a39481c66711139a7c8bc4cf854a62801865a6b3455d6a05918297b2ff3c9ba38ea9046f338ea6060768192af6d67bcd SHA512 e1ac92305b1d1b034eea9be6aa22cfa260249562fa0af41f0ed5c76a36916bba432073e033f228978d84d0377f245642ff31cdec324565e83aa8c82d8ea0c1f5
 EBUILD webkit-gtk-2.44.1-r410.ebuild 7961 BLAKE2B 442435051d98fbe4171bbddf7b65535d97ad33bb2b76ece855d2ca1a02fb423efb112a239c2c2ced7174c950e78d2347237be2dbf72392694b4fbdb618e98de6 SHA512 025bc8d14cc3459ba2a0fbcc1e3de32eae18394b3a43b0c1acea8ff68e601217364dea8eac862aff441ccf397f7f73c77750f09bf074b7887b5ab34692be8a23
 EBUILD webkit-gtk-2.44.1-r600.ebuild 8731 BLAKE2B cfe0215bd43e15124abf32ba0779441b3e48bd395479da706064cad2f0fd8ffd1eec6122d83ed6032d024997c3487f4175c0c16769696d14f45a05d1ec2f4d56 SHA512 ccfdd83983bf4ef3673a4e81459515f43e619e512694487fbdd345c6aaafb9c12fc4b28f98de4f50b262f8e984d07abda0e63511bff73f66ab51d3ad795aeb82
 EBUILD webkit-gtk-2.44.1.ebuild 7809 BLAKE2B f8eebb5a781e511fa7119c56f80e885c3af9af5ad58bcad6e3f53f903ea2777849f35167d1b2fece8f91ea2a7cba4795d1b978de7048aed8d59ebad053c64f39 SHA512 3dda8a65331b87ae3d7699757908623792b20d161e94391277cd82a81516c71dea7222d6d88b13a48464dfb8634278062d558901ec43e339b2ec53f40b03193d
-EBUILD webkit-gtk-2.44.4-r410.ebuild 7830 BLAKE2B 4ccabf713425920b67a636d69b0d9205ae47183b5899ed80b68bc78858b471a96c9c43c946e2973c9af35fc21a5f8411ef2888c03d2e3373e49f84c40b29e3e2 SHA512 d873e4f8490263809c5cb016006970503a5302d73f0819b39e652771d36b35698fd18efffd02296a0b23e9de2c6328139a6c03f861db13e8c9fbbccfdcd7bf72
-EBUILD webkit-gtk-2.44.4-r600.ebuild 8571 BLAKE2B 17018a5c0443dd8842abd801084da7e48c38c405b2a8bd9beffc8eda6814d9feda74788612705b2fc916663eb4f805deafd793c18639c31413806ccd4c50fcd9 SHA512 686d1462c87efa57f0785869df6cb4a9e36f3c09247c862401f6ab99b143c810aa98306974a6378488036d1139c5937a9803de8602f4a91d6837d72f8872c50f
-EBUILD webkit-gtk-2.44.4.ebuild 7678 BLAKE2B 830737a265e1167fed60b7be3f1dd14883f8c178b120566077e38cdb6f432b22f92cfba84db9e7ddaf8f6e6450f3b888a892560f8dbdfb640bf8ddc4a9936fab SHA512 1a64877cb9bd54ff0bb25f0020608eb5d9b62704f6874e1533753ec8a9834a5cbcb50996bde0c7bd0b18621e09f9dad775951862d84eb089a04863e9cc1fece6
+EBUILD webkit-gtk-2.44.4-r410.ebuild 7829 BLAKE2B c53726dabb79b327be04b7468d3de56f89533820ccabb5aaa1a7380bbe4eb984832c8a20dc4a9a07e8d7e522345ec6339d9f8ab05e900a0579c88911c9c1fbb5 SHA512 7798a5b06216aa056d8096aed2ffbf140c6d0dcb774a49f62fc5a0eac2f5ed710c006772b53d4ba2fccb04c08b841f97d95da3667a1560d5d9c141f8a88ec5a0
+EBUILD webkit-gtk-2.44.4-r600.ebuild 8570 BLAKE2B 490a86855a0f0f27c0ae43858f46f2e48a93a901ac4ef91b10eac426c5287514ede3cc29bde7d8f9d0aea17c53cf90e3d52219ce2463338caea5f8abce679ba8 SHA512 94a59ed3537b79d3750f742b1d42bd09704a31e122e5b3b48790311275195b0636c7ea90d9eb85dd58a898600ae90a1b7494ceb3d8a190e8b922242017642071
+EBUILD webkit-gtk-2.44.4.ebuild 7677 BLAKE2B 42d8395c7c59e2478905f794dcdd791e965bd42ed19eca8c47545359c888d49839766adf969a90edc8fa0b214e2cafd868dc40123684cfd234223d110309ae82 SHA512 fd0d908d4edbdd47b24a1f0fa8696a69f098a581af7f4d261edd398c0cd59c098ca31d9163b47873f2cae336865dea5089adc71c169f9fe43c952f87fc26304e
+EBUILD webkit-gtk-2.46.1-r410.ebuild 7919 BLAKE2B 53aaa0526bd07e9375d4bbdff0d986b5d398ca5e9db65fde2908d224c3a8a9d113cde940a8649fadb2ef1fcd43c7261abe3a34e0aa1aa0446f30e36d32fbbe09 SHA512 5c37d5230e9358734a69543ff73b4d1cfb6d110571a1711961dc0da752cb850a0f115bda56a1aede4fe503116f6e6c83cc09f29838f03611952b3f66262a41a2
+EBUILD webkit-gtk-2.46.1-r600.ebuild 8663 BLAKE2B 25c7a4b9fdeb6f8ddf1b905452932a5ad6a022bcfa9510d5e0d797ce79103cab8d97f5c4f64c8dd32bed216d2d79df3d26004f8e3a25d41681873dc092fbebc0 SHA512 d838fbcab29aadb0076681e239c6d8c151f6e082645aa8c43e7650a3a183785a5389ddf62db7e6130058e17cf13c3efc42ee761ca891406be9672d39af125c65
+EBUILD webkit-gtk-2.46.1.ebuild 7917 BLAKE2B fef623f3c402249c4d804e7ca4f47409c3b0ef3ace962d06f2550e9168b210f4af32089fdc4cc0ad8e0d7156a42dab092379d2ef426564ebe206395184d0f1f7 SHA512 8145b12ae9842e5da093443b7f6332a6367c8a377e61faa76a20b11b6705e1da0f4cad84d513cf29265ab22d0f10736bfbeabbf6ddb4d4d32ab7891ea2ddeaba
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/files/2.46.1-riscv-buildfix.patch b/net-libs/webkit-gtk/files/2.46.1-riscv-buildfix.patch
new file mode 100644
index 000000000000..7c9110280020
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.46.1-riscv-buildfix.patch
@@ -0,0 +1,43 @@
+From 2f69282c9271c76e8783412766a50477288e5888 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Thu, 3 Oct 2024 12:34:03 +0200
+Subject: [PATCH] JavaScriptCore/jit/GPRInfo.h: fix typo in RISCV64Registers
+
+RICSV64Registers -> RISCV64Registers
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ Source/JavaScriptCore/jit/GPRInfo.h | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Source/JavaScriptCore/jit/GPRInfo.h b/Source/JavaScriptCore/jit/GPRInfo.h
+index fa7bf0aac48de..df5871957b3f5 100644
+--- a/Source/JavaScriptCore/jit/GPRInfo.h
++++ b/Source/JavaScriptCore/jit/GPRInfo.h
+@@ -779,16 +779,16 @@ class GPRInfo {
+     static constexpr GPRReg wasmBaseMemoryPointer = regCS3;
+     static constexpr GPRReg wasmBoundsCheckingSizeRegister = regCS4;
+ 
+-    static constexpr GPRReg regWS0 = RICSV64Registers::x6;
+-    static constexpr GPRReg regWS1 = RICSV64Registers::x7;
+-    static constexpr GPRReg regWA0 = RICSV64Registers::x10;
+-    static constexpr GPRReg regWA1 = RICSV64Registers::x11;
+-    static constexpr GPRReg regWA2 = RICSV64Registers::x12;
+-    static constexpr GPRReg regWA3 = RICSV64Registers::x13;
+-    static constexpr GPRReg regWA4 = RICSV64Registers::x14;
+-    static constexpr GPRReg regWA5 = RICSV64Registers::x15;
+-    static constexpr GPRReg regWA6 = RICSV64Registers::x16;
+-    static constexpr GPRReg regWA7 = RICSV64Registers::x17;
++    static constexpr GPRReg regWS0 = RISCV64Registers::x6;
++    static constexpr GPRReg regWS1 = RISCV64Registers::x7;
++    static constexpr GPRReg regWA0 = RISCV64Registers::x10;
++    static constexpr GPRReg regWA1 = RISCV64Registers::x11;
++    static constexpr GPRReg regWA2 = RISCV64Registers::x12;
++    static constexpr GPRReg regWA3 = RISCV64Registers::x13;
++    static constexpr GPRReg regWA4 = RISCV64Registers::x14;
++    static constexpr GPRReg regWA5 = RISCV64Registers::x15;
++    static constexpr GPRReg regWA6 = RISCV64Registers::x16;
++    static constexpr GPRReg regWA7 = RISCV64Registers::x17;
+ 
+     static constexpr GPRReg patchpointScratchRegister = RISCV64Registers::x30; // Should match dataTempRegister
+ 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
index 3ffac20cf573..7430151ef077 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
index 9d3cb02e7fb6..253092a76ba6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
index a830d60eec0e..6481f9002b02 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.1-r410.ebuild
new file mode 100644
index 000000000000..d7ad93f005eb
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.1-r410.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..13} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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"
+
+S="${WORKDIR}/${MY_P}"
+
+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 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 can be found in Source/cmake/OptionsGTK.cmake.
+#
+# * Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream.
+#
+# * media-libs/mesa dep is for libgbm
+#
+# * >=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
+#
+# * Cairo is only needed on big-endian systems, where Skia is not officially
+#   supported (the build system will choose a backend for you). We could probably
+#   hard-code a list of BE arches here, to avoid the extra dependency? But I am
+#   holding out hope that this might actually get fixed before we need to do that.
+#
+# * dev-util/sysprof-capture is disabled because it was a new dependency in 2.46
+#   and we don't need any more new problems.
+#
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libgcrypt:0=
+	dev-libs/libtasn1:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libjpeg-turbo:0=
+	media-libs/libepoxy[egl(+)]
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	media-libs/libwebp:=
+	media-libs/mesa
+	media-libs/woff2
+	net-libs/libsoup:3.0[introspection?]
+	sys-libs/zlib:0
+	x11-libs/cairo[X?]
+	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
+	x11-libs/libdrm
+	avif? ( media-libs/libavif:= )
+	gamepad? ( dev-libs/libmanette )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0[egl,opengl,X?]
+		media-plugins/gst-plugins-opus:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	jpegxl? ( media-libs/libjxl:= )
+	keyring? ( app-crypt/libsecret )
+	lcms? ( media-libs/lcms:2 )
+	seccomp? (
+		sys-apps/bubblewrap
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+	spell? ( app-text/enchant:2 )
+	systemd? ( sys-apps/systemd:= )
+	X? ( x11-libs/libX11 )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	app-accessibility/at-spi2-core
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	dev-util/unifdef
+	sys-devel/bison
+	sys-devel/gettext
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+
+		if ! tc-is-clang ; then
+			ewarn "Upstream recommends that Clang be used to compile WebkitGTK:"
+			ewarn "  https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html"
+		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
+
+	eapply "${FILESDIR}/2.46.1-riscv-buildfix.patch"
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# 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"
+
+	# 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)
+	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+
+	# 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_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF
+		-DENABLE_WEBGL=ON
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		# 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_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=OFF
+		-DUSE_SYSPROF_CAPTURE=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
+	# 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 "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.1-r600.ebuild
new file mode 100644
index 000000000000..8c4f3556c6b3
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.1-r600.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..13} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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"
+
+S="${WORKDIR}/${MY_P}"
+
+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 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 can be found in Source/cmake/OptionsGTK.cmake.
+#
+# * Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream.
+#
+# * media-libs/mesa dep is for libgbm
+#
+# * >=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 and <webkit-gtk-2.44:4.1 as since
+#   2.44 this SLOT ships the WebKitWebDriver binary; WebKitWebDriver is
+#   an automation tool for web developers, which lets one control the
+#   browser via WebDriver API - only one SLOT can ship it.
+#
+# * at-spi2-core (atspi-2.pc) is checked at build time, but not linked
+#   to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14
+#   a11y support is used?
+#
+# * Cairo is only needed on big-endian systems, where Skia is not officially
+#   supported (the build system will choose a backend for you). We could probably
+#   hard-code a list of BE arches here, to avoid the extra dependency? But I am
+#   holding out hope that this might actually get fixed before we need to do that.
+#
+# * dev-util/sysprof-capture is disabled because it was a new dependency in 2.46
+#   and we don't need any more new problems.
+#
+RDEPEND="
+	!<net-libs/webkit-gtk-2.38:4
+	!<net-libs/webkit-gtk-2.44:4.1
+	app-accessibility/at-spi2-core:2
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libgcrypt:0=
+	dev-libs/libtasn1:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gui-libs/gtk-4.14.0:4[aqua?,introspection?,wayland?,X?]
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libjpeg-turbo:0=
+	media-libs/libepoxy[egl(+)]
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	media-libs/libwebp:=
+	media-libs/mesa
+	media-libs/woff2
+	net-libs/libsoup:3.0[introspection?]
+	sys-libs/zlib:0
+	x11-libs/cairo[X?]
+	x11-libs/libdrm
+	avif? ( media-libs/libavif:= )
+	gamepad? ( dev-libs/libmanette )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0[egl,opengl,X?]
+		media-plugins/gst-plugins-opus:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	jpegxl? ( media-libs/libjxl:= )
+	keyring? ( app-crypt/libsecret )
+	lcms? ( media-libs/lcms:2 )
+	seccomp? (
+		sys-apps/bubblewrap
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+	spell? ( app-text/enchant:2 )
+	systemd? ( sys-apps/systemd:= )
+	X? ( x11-libs/libX11 )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	app-accessibility/at-spi2-core
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	dev-util/unifdef
+	sys-devel/bison
+	sys-devel/gettext
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+
+		if ! tc-is-clang ; then
+			ewarn "Upstream recommends that Clang be used to compile WebkitGTK:"
+			ewarn "  https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html"
+		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
+
+	eapply "${FILESDIR}/2.46.1-riscv-buildfix.patch"
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# 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"
+
+	# 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)
+	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+
+	# 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_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		# 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_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=OFF
+		-DUSE_SYSPROF_CAPTURE=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
+	# 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-6.0
+	doins -r "${S}"/Documentation/{jsc-glib,webkitgtk,webkitgtk-web-process-extension}-6.0
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.1.ebuild
new file mode 100644
index 000000000000..ae809ea078f4
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..13} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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"
+
+S="${WORKDIR}/${MY_P}"
+
+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 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 can be found in Source/cmake/OptionsGTK.cmake.
+#
+# * Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream.
+#
+# * media-libs/mesa dep is for libgbm
+#
+# * >=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
+#
+# * Cairo is only needed on big-endian systems, where Skia is not officially
+#   supported (the build system will choose a backend for you). We could probably
+#   hard-code a list of BE arches here, to avoid the extra dependency? But I am
+#   holding out hope that this might actually get fixed before we need to do that.
+#
+# * dev-util/sysprof-capture is disabled because it was a new dependency in 2.46
+#   and we don't need any more new problems.
+#
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libgcrypt:0=
+	dev-libs/libtasn1:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libjpeg-turbo:0=
+	media-libs/libepoxy[egl(+)]
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	media-libs/libwebp:=
+	media-libs/mesa
+	media-libs/woff2
+	net-libs/libsoup:2.4[introspection?]
+	sys-libs/zlib:0
+	x11-libs/cairo[X?]
+	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
+	x11-libs/libdrm
+	avif? ( media-libs/libavif:= )
+	gamepad? ( dev-libs/libmanette )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0[egl,opengl,X?]
+		media-plugins/gst-plugins-opus:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	jpegxl? ( media-libs/libjxl:= )
+	keyring? ( app-crypt/libsecret )
+	lcms? ( media-libs/lcms:2 )
+	seccomp? (
+		sys-apps/bubblewrap
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+	spell? ( app-text/enchant:2 )
+	systemd? ( sys-apps/systemd:= )
+	X? ( x11-libs/libX11 )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	app-accessibility/at-spi2-core
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	dev-util/unifdef
+	sys-devel/bison
+	sys-devel/gettext
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+
+		if ! tc-is-clang ; then
+			ewarn "Upstream recommends that Clang be used to compile WebkitGTK:"
+			ewarn "  https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html"
+		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
+
+	eapply "${FILESDIR}/2.46.1-riscv-buildfix.patch"
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# 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"
+
+	# 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)
+	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+
+	# 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_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF
+		-DENABLE_WEBGL=ON
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		# 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_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSPROF_CAPTURE=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
+	# 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 "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}