gentoo auto-resync : 15:04:2024 - 12:04:02

author: V3n3RiX <venerix@koprulu.sector> 2024-04-15 12:04:03 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-04-15 12:04:03 +0100
commit: 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 (patch)
tree: e514d1b9999d088064bee1e34a3a3c500d6d7a07 /net-libs
parent: d993571e2ee444d08f4e9e90d493ee37338657e3 (diff)
27 files changed, 1620 insertions, 453 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8272a9209bf4..e87fd14a110a 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/dleyna/Manifest b/net-libs/dleyna/Manifest
index 5e7f34227088..2cb9ed35ce4c 100644
--- a/net-libs/dleyna/Manifest
+++ b/net-libs/dleyna/Manifest
@@ -1,6 +1,3 @@
-AUX meson-1.2.0.patch 1105 BLAKE2B ca7ef61e431d29839fd6e750fba923f68ec45a9f472a68021429dd1b9aef6444abe09ecee86a1bc65aeacff3d566453cd567047f128c3534099034964a819fba SHA512 6c701f7a90223c152d4387fae7a8159d21513f5fc431e6642284e6dd7f84b6bcb4994b14f26b716430a31c793543c7e6985ccd1eb30fb256e1038bb342c9ccf6
-DIST dLeyna-v0.8.2.tar.bz2 149691 BLAKE2B c9837da15c18b25c0e9021776cabdcffe52acfaac0f2858ab004b554d9a212ca45cc08f2893383248c5bb5ce57df854d79c329f80511b9f098663326f1badecc SHA512 25a62ad6b623a8d67d90af608d0fa68e4dcef916c5b44f51eb927f6e276555b978414c95f59a680c5938c7b67abe0cc09afa4e58d068f115d73ce6cb40959144
 DIST dLeyna-v0.8.3.tar.bz2 149796 BLAKE2B e1fc2d1d5fa6178856d5114b55dbaae5a969ab7f2b5716ab70c1359755b21927ed0ecfd8d943520254a1ead2b2db368838787f0954bc312712a8075ea3f94896 SHA512 a62c643467b2f75efb9e794802b3bc183a5f8cfe9b80eeaee627aeaa471d7fb107cf1bde549c274ecd86ca06ad5870a481316e1101647c9d7e6243114b5dd06e
-EBUILD dleyna-0.8.2.ebuild 1244 BLAKE2B 59a8ef3c00733a48f4d3865d095cfaa7a0ceb052d371fad276dc424511e4039a015e1114e4ec055a79ba9672c20efefb7403a19cae2074806de91dfe87c4f63c SHA512 19e3e89116b377aa48dbaac21d5d5d0d3da6fc5f76fd17c6384a38f9f4a2398def2723225c3418ab90478e7ca2bd37754e38cd44f74901b07c3ef6450332d4f6
 EBUILD dleyna-0.8.3.ebuild 1206 BLAKE2B 86f4e63381cb4f0f830ea7860fccf18d05d4a95d578d1b6948f9c7a3eeeef9ab99232ecaaeb87498d5287fe06d98bbf439dbb900771323babb51da4bc5240b53 SHA512 a52abd7bcac25503de1048808e60ecdcac961263036b61a2a938523e3726fb66e3964182686d7989989a892ecab915bfed74365025b605fd7aef060eb3b5c12c
 MISC metadata.xml 347 BLAKE2B f530e4051daea6e7c842e14aab33cd08680f7414dd5bb06fb0c4e7aafc9c851daff77752e77e1f12b333e992854ae97217f78d30a2be2b601ea3465b4e0ff31e SHA512 e5d55300134824082f76ed5fd0a9e5753ef74e98796b17da4c47e7b5e0e5480e82b3e6db6d4880e2ca00b12e01c1514736a41ae0967226283d329f576ab497a3
diff --git a/net-libs/dleyna/dleyna-0.8.2.ebuild b/net-libs/dleyna/dleyna-0.8.2.ebuild
deleted file mode 100644
index d54fefa954cd..000000000000
--- a/net-libs/dleyna/dleyna-0.8.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1
-
-DESCRIPTION="A set of services and D-Bus APIs to simplify access to UPnP/DLNA media devices"
-HOMEPAGE="https://gitlab.gnome.org/World/dLeyna"
-SRC_URI="https://gitlab.gnome.org/World/dLeyna/-/archive/v${PV}/dLeyna-v${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0/6" # soname of libdleyna-core-1.0.so
-KEYWORDS="amd64 ~loong ~riscv x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=net-libs/gssdp-1.6.0:1.6=
-	>=net-libs/gupnp-1.6.0:1.6=
-	>=net-libs/gupnp-av-0.12.9:0=
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=net-libs/libsoup-3.0:3.0
-	dev-libs/libxml2
-
-	${PYTHON_DEPS}
-
-	!net-libs/dleyna-connector-dbus
-	!net-libs/dleyna-core
-	!net-libs/dleyna-renderer
-	!net-misc/dleyna-server
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/dLeyna-v${PV}
-
-PATCHES=(
-	"${FILESDIR}"/meson-1.2.0.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddbus_service_dir="${EPREFIX}/usr/share/dbus-1/services"
-		-Dman_pages=true
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-}
diff --git a/net-libs/dleyna/files/meson-1.2.0.patch b/net-libs/dleyna/files/meson-1.2.0.patch
deleted file mode 100644
index 222ba8c5ea20..000000000000
--- a/net-libs/dleyna/files/meson-1.2.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
-
-From 61d24fdccadc1c9a94f1351744376edcc2048105 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 17 Jul 2023 13:29:55 +0100
-Subject: [PATCH] subprojects: Fix typos for Meson 1.2 compatibility
-
-Bug: https://bugs.gentoo.org/909405
-Bug: https://bugs.gentoo.org/909431
---- a/subprojects/gssdp-1.6.wrap
-+++ b/subprojects/gssdp-1.6.wrap
-@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git
- revision = master
- depth = 1
-  
--[provides]
--dependency_name = gssdp-1.6
-+[provide]
-+dependency_names = gssdp-1.6
- 
---- a/subprojects/gupnp-1.6.wrap
-+++ b/subprojects/gupnp-1.6.wrap
-@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git
- revision = master
- depth = 1
-  
--[provides]
--dependency_name = gupnp-1.6
-+[provide]
-+dependency_names = gupnp-1.6
- 
---- a/subprojects/gupnp-av-1.0.wrap
-+++ b/subprojects/gupnp-av-1.0.wrap
-@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git
- revision = master
- depth = 1
-  
--[provides]
--dependency_name = gupnp-av-1.0
-+[provide]
-+dependency_names = gupnp-av-1.0
- 
--- 
-GitLab
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 7f0a8836dce1..1e6f8f079e8d 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -7,8 +7,11 @@ DIST gnutls-3.8.0.tar.xz 6378480 BLAKE2B 64784e9c0ac4dcab2c9e90d7d17d0bd8a002122
 DIST gnutls-3.8.0.tar.xz.sig 684 BLAKE2B c5dbed12b8233ed8502dac16b77d6043591296f4b9ddb0445271e8fe875c2a05b9663ad6523cca6355faaa9d244cc6e6fb8ff0d65fee47b36ab6b57f57d89f64 SHA512 9db8db74aa0ebd871287b07b6a8a9f4ce90188633618e669fe07cb8bb314b624c14761f6fe1970e2fbffa87f7c0d6daa4b0fa838bd05f74b8b18cd1b5325c654
 DIST gnutls-3.8.3.tar.xz 6463720 BLAKE2B 27a4bb4d8a5697e2187113351b2ad1e849bca7bcfb556c1b54fc2d02bef16e2789e7c437ac8db8fe6d2bcfc0e3e3467bbff2dd5d2fc0adb9bf8bda81cb89e452 SHA512 74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84
 DIST gnutls-3.8.3.tar.xz.sig 580 BLAKE2B 25875eb17d9e59bf1f1b6a61dfc7657d838ac154dbb3e26c8df1995884077878ca607de62a8ce3b9287df1ea7ff523c0abc7c4548f1ca789c308eb6bda0edbaa SHA512 5b2ca0648ca5feeda1de933de2bbaf71fadb70e830a8f0d494d2f0380b6d0d7b79445257cc79e59bba1a7ff639ab4573da3e3e124eb80c20ac6141e29a4827ff
+DIST gnutls-3.8.5.tar.xz 6491504 BLAKE2B 30ea0e213b426df896af7cddfc39a7c50fd3130f99ced8386dc55e851122a37f6171722d2cb4abb68b9d2523cd3ba044b01248d740571a3bdd0cadf555894cdf SHA512 4bac1aa7ec1dce9b3445cc515cc287a5af032d34c207399aa9722e3dc53ed652f8a57cfbc9c5e40ccc4a2631245d89ab676e3ba2be9563f60ba855aaacb8e23c
+DIST gnutls-3.8.5.tar.xz.sig 119 BLAKE2B 62ff7b33fb80422774f8252f574560679b7dc4fa56fa680a4cf570320fa9692aa6f8b6a7e4683a684572287cfd22168f58679d2dc4cc507dc50269ed126990fd SHA512 b0f7a8ec348765112cac75fd732e066adaa1595bb83024cfeff6633aba35277d8aceda145c733c3d95f1e0eb4d34fead2479abdb08d6041362094a235460fa67
 EBUILD gnutls-3.7.8.ebuild 4510 BLAKE2B 071712c5a26ac5208b8c3b76e8e30cd697bfe46c15c0ac9de5290e7c3a438ee50e84d77d2dd7fa56e7f1a0f6367d79d0ce41f8142cc135213307f4753ea960f2 SHA512 ed2aa57344cae948b72a5d3929d9fbfb85317a31d74b3c686bd2da1e054266d879289d461fb67c1bfa51a9c77acd11b9e0f0ae577afd80cdcd27081b04935990
 EBUILD gnutls-3.7.9.ebuild 4518 BLAKE2B 1677d20875850c62130350dcbc92b61f51c6aa5de64d16179944caad10616859f082c11bf327d57f836b7cc24e3803821b61e2df4fc2c17862d35a26a033aaeb SHA512 e30ea13f425d0a6eba30b1235e3a6240e9f0481df318c7f0b6699088bb8c98c07e146a891c8ccd8efe0cc0b8f70a8456d84e62f8db118ad8ae380e679769259b
 EBUILD gnutls-3.8.0.ebuild 4569 BLAKE2B 4b3dbdec9ab063ef44ec516c91b3777028d627e89260885a033756be8e0edcecd7c0e0c4f27f9ea8c2e2cf929b6f729c62bc265b64a8ed9ed7785bfe442ba274 SHA512 81d3331058c8dc1a121d2b618462ad07797b5b3f118842e6fb634b1d7bef27d1a8657ca04319b16b709989987b91cd4de8e582516840abfd3c74bd60f357e0cb
 EBUILD gnutls-3.8.3.ebuild 4683 BLAKE2B b19f9797b93c00e98106ece1395fcb0625ae071fbcdc31efc539f081c2770f5e61e0288bbddeb5e2b41fbfaddbe4b27ca7e68048def487d5397e80a8af52cd96 SHA512 f533871504131a7bb76fac115460b01a564c52ae72c9ed0fbe1b4a2e1388e7512f8144891adfeea4853ed55a13137d05ed7fef8516c8933a790847ac320319ab
+EBUILD gnutls-3.8.5.ebuild 4683 BLAKE2B dfd03e9f80c1c9142ba16145414d4c9204fc79a5d5b3e956a8042ac93f7aa12e1207ae031e6b3e4df17fe309367a96eb9b2fed94eecca8c8da90137cc2d39856 SHA512 8e2aad44f15ef216cc2a641bb955c878dcd7eea71209db38cf7df6381a1b9d1647b6e724a13d3fa2f997ac3d28ad111e2fb49548dcba832a3e3be0d2e46949d7
 MISC metadata.xml 1141 BLAKE2B 70657c924a576930a14064d750074cce08bfe3f99970987aca13f9f1dc49024d8a99de54336b5e51f7cee4fa944045a323cf8384e0363189c4ee60962b185a42 SHA512 467370ffa9762eff75e73ffcb959c7bbe65528b33256c871b702be90c7b6f06e6b60a0a358c81dadba43388ec803a9dabe09a6f7cb3616ee3c65eaa6416140ee
diff --git a/net-libs/gnutls/gnutls-3.8.5.ebuild b/net-libs/gnutls/gnutls-3.8.5.ebuild
new file mode 100644
index 000000000000..19002c19728c
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.8.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
+inherit libtool multilib-minimal verify-sig
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
+
+LICENSE="GPL-3 LGPL-2.1+"
+# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot
+# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds.
+# Subslot format:
+# <libgnutls.so number>.<libgnutlsxx.so number>
+SLOT="0/30.30"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
+REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)
+"
+BDEPEND="
+	dev-build/gtk-doc-am
+	>=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test-full? (
+		app-crypt/dieharder
+		|| ( sys-libs/libfaketime >=app-misc/datefudge-1.22 )
+		dev-libs/softhsm:2[-bindist(-)]
+		net-dialup/ppp
+		net-misc/socat
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20240415 )
+"
+
+DOCS=( README.md doc/certtool.cfg )
+
+HTML_DOCS=()
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs
+	MIN
+	alignof
+	static_assert
+)
+
+src_prepare() {
+	default
+
+	# bug #520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=( doc/gnutls.html )
+
+	# don't try to use system certificate store on macOS, it is
+	# confusingly ignoring our ca-certificates and more importantly
+	# fails to compile in certain configurations
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	# Note that this may add a libltdl dep when enabled. Check configure.ac.
+	libconf+=(
+		--without-tpm
+		--without-tpm2
+	)
+
+	# hardware-accel is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# -fanalyzer substantially slows down the build and isn't useful for
+	# us. It's useful for upstream as it's static analysis, but it's not
+	# useful when just getting something built.
+	export gl_cv_warn_c__fanalyzer=no
+
+	local myeconfargs=(
+		--disable-valgrind-tests
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with brotli)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		$(use_with zlib)
+		$(use_with zstd)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 2f85e7ba0092..8521c43258bd 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,7 +1,5 @@
 DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8
-DIST gssdp-1.6.2.tar.xz 2081568 BLAKE2B d11ea1f5d5980c6380dd3a072fc6d8a33894e4cd5c5978862b1fe99ecaed679cee2ecd37a80aa374bb255c8771520501243f334092261465e641a772561a15e0 SHA512 501e2839022b3c175b17b27b8b1134021631726eca331ab7b64f895be770f5b754c50cdfaa03e833a3d95180471cda6a87b17ffeff661f3de228a5b70a2a6cbb
 DIST gssdp-1.6.3.tar.xz 108080 BLAKE2B f9deddf2b221eda9c3d7a6e6fa78cfb6388d3f3549caf166ebf7ac41f6edf39b8bc2521838ae5d954c743f844d5e7ba28b50f5a7beb6b2d70241782275c50fe4 SHA512 e5c9851032538cf093ed8c34a71c5d171eafb2edc5d3f3f5f0284005d4b1cca29ffca34b7f7d38b4a68a86c9bd888dd7a5a8e758dbd926bc4b4c995ea0b1110b
 EBUILD gssdp-1.4.0.1.ebuild 1564 BLAKE2B 9c8ee9713318d5f7999ad7dcab16b57a8e13a5902a10a3a79f75c391bbdc81c72ac60f93c7495136903d487f3667cd0d43615793e5a854a10af0b815a0992271 SHA512 ae40c74510b40291473899f956a101af41fe39ec6ad42c1719e609e1a7c768dfe6e644c35f4776e2fc3c129a8dd55d95f6464f469841d796b0697695670031ea
-EBUILD gssdp-1.6.2.ebuild 1864 BLAKE2B 00578ee41b9222ba9b629cd88d664e88e9a3ad1343e21a0a174fb803ddbbb50327d16032d82c216822cdac62a36c97525579a68ed969775daee0c457a30a89de SHA512 4db1fa21918a039cbbb7d109bf7e9d3b871b772f7363dc475b29727d1e3610896c87d55179bdfb4b20afda9279d95b178d39c8d9e9c1936219eb3a940182990d
 EBUILD gssdp-1.6.3.ebuild 1864 BLAKE2B 191ac15a8f94c56f5c4ff267f4198f3223530c170f33f15f54a97c10e16c249f586fde71e5816fe29a0eceec92cb362c614bd3e58d3cc9fa06be690b4151b270 SHA512 97c8a74ec7dbe6c77cf0f07c63a7b476dcedb410a7fdd697954ccdab049cae722c86919684b273c0d325415ee89c4b41d29dc46175d3bb681ca5046091055c08
 MISC metadata.xml 419 BLAKE2B 1f4dd2f5b4eefdc297d9e6faea3cc02358629d82a5dd5641d18ddeca4d8bfd64c97c36ab7b52b076ab43cb96ab07d5472824d8af3a7294abbfe6bf798577bc83 SHA512 43338b7d35dc7a426f9e4a555f9ec6cee5f96de2077158c22552a56c2cd6573cb29aa986c740dada0e1739fccb1db78289f4263cf012360609a4a568cb802731
diff --git a/net-libs/gssdp/gssdp-1.6.2.ebuild b/net-libs/gssdp/gssdp-1.6.2.ebuild
deleted file mode 100644
index 40f5e9915a31..000000000000
--- a/net-libs/gssdp/gssdp-1.6.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
-
-LICENSE="LGPL-2+"
-SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="gtk gtk-doc +introspection man +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-# has file collision with Slot 0 (/usr/bin/gssdp-device-sniffer), so we remove that from this build
-# and depend on the other slot that has the file as well
-RDEPEND="
-	>=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.99.0:3.0[${MULTILIB_USEDEP},introspection?]
-	gtk? ( gui-libs/gtk:4 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	man? ( virtual/pandoc )
-	>=net-libs/gssdp-1.4:0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		net-libs/libsoup:3.0[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool gtk sniffer)
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool man manpages)
-		$(meson_native_use_bool vala vapi)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	if use gtk-doc ; then
-		mkdir "${ED}"/usr/share/gtk-doc || die
-		mv "${ED}"/usr/share/{doc,gtk-doc}/gssdp-1.6 || die
-	fi
-
-	if use gtk; then
-		rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0
-	fi
-}
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 6a94e675d995..11fe026df7a8 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -5,4 +5,5 @@ AUX ldns-1.8.3-swig-4.2.0.patch 2935 BLAKE2B 15626ba3f3835bc9e3f86a639177eb6ceb8
 DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9
 EBUILD ldns-1.8.3-r1.ebuild 1943 BLAKE2B d37692bced21132fb8da0c52219641fe340a10bc8e63c1e756fa04765fb6fa5bc621973f029c3c291bc296daec6e322ea0dc33896e59dd0f324ddbeae6f31b16 SHA512 7a612d4b5a1dbbb833059529905b94ec272f0bde71fe60295ab54a52be37f17909fcaa5e0752de6f5e453ef568c07cda32d4bfa453caaecfad55f9068dc793c5
 EBUILD ldns-1.8.3-r2.ebuild 1996 BLAKE2B e5dbca6c36a8a230a51482b1c1b7db3b25d27ab51416fb9350d8d8d61fedbc299289c36b3415c9238e386f16b4fc8ff640367f03554d945bfce9a2fd81eae32f SHA512 976894604aed6d47baabceed8a0185312daa589ce9ec7b433dff899462b181fdc6120c4cef490e03c78ca445cb3ba51d43d1dd92d5c34bb885f23437c6b369b0
+EBUILD ldns-1.8.3-r3.ebuild 1965 BLAKE2B e5dd228cbfbf229580dd4c983541b3cb509bb8d30e0bd3a2c3b5e7c2bde2c71e584350c2f26333c0219c6b021817de93d6b7b23bbe766968fb94c03a3d565d7b SHA512 0bada3ec2b1ddf9d794ffd404b18e665b887cba7780efae3df357590de79831c8b8ded07f54ef4d217971c98810007e94e8325b0e6607ab578817bcee854a77a
 MISC metadata.xml 616 BLAKE2B 17f79a6324d889cc626bb3fceef622a45f112587618bad54422503d7a43914c46a03563f5e0b8d9d170e25c2e77666325607e485d421853359cbae13e7f00b34 SHA512 a764ec840b5dc9cc90c5952b93e2e226914c9eaca52f18f0c4f4d7d128bd1b2bc1eea9e699720d37b2c041fb6b01e0b298ac7f000ed72f0a7e0e2dce733febff
diff --git a/net-libs/ldns/ldns-1.8.3-r3.ebuild b/net-libs/ldns/ldns-1.8.3-r3.ebuild
new file mode 100644
index 000000000000..8b6b4d2afbe2
--- /dev/null
+++ b/net-libs/ldns/ldns-1.8.3-r3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools python-single-r1 multilib-minimal
+
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # missing test directory
+
+BDEPEND="
+	python? ( dev-lang/swig )
+	doc? ( app-text/doxygen )
+"
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+	>=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
+	examples? ( net-libs/libpcap )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+PATCHES=(
+	"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
+	"${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-configure-strict.patch"
+	"${FILESDIR}/${PN}-1.8.3-swig-4.2.0.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Drop after 1.8.3
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--with-ssl="${EPREFIX}"/usr \
+		$(multilib_native_with drill) \
+		$(multilib_native_use_with examples) \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins libdns.vim
+}
diff --git a/net-libs/libcloudproviders/Manifest b/net-libs/libcloudproviders/Manifest
index ed8c4656d081..f974108b0f3f 100644
--- a/net-libs/libcloudproviders/Manifest
+++ b/net-libs/libcloudproviders/Manifest
@@ -1,5 +1,3 @@
-DIST libcloudproviders-0.3.5.tar.xz 23652 BLAKE2B 653f1aa96692f97415b9c7f84ac15e8843210853b40323e65d22b3e2448732abb25695cf879356078997db22cd34ce34e72a542e6f1e1fec08ba83c482492b02 SHA512 054e704955395d4b5dda728c184fa0e2ea5e020da7048bbb5b85f313e85114c4a5c1c641c7d1502391f4f3d46f22a6ea2afb76010ffd121daf60220feefa1ae4
 DIST libcloudproviders-0.3.6.tar.xz 23844 BLAKE2B af5864fa9f4de8842dce80efb53b7b6ff73a679589a49b4edf55c77e0e49114dd5da8dbdc6950574a758483b09168e90e27ded05b0ef501bf9b454341196f7ff SHA512 4ffd9c6202a608128dce2542a29910a87910d46df57dd19e6dfe70e80001b27d2bc5d90a37cb9036ac60a317edc5c1be9d5fd8adb215500c34a07e23064a293f
-EBUILD libcloudproviders-0.3.5.ebuild 1070 BLAKE2B e5d5116a75c90931c8c62c8ba051b9d19c002100f7f3c1da5440d6becb5a9c1f899ab84b0f370dd82d353c9ce84a2bda201c13545a3abcd94b3f2561b92be46d SHA512 f3cd841dacc408dc81ee28ba1b2d11269ec13331032b48db38249c5f437a394449cfd9c66dc0f209e6bf250d72adaa0c8dcfd1c7daa2168034e2e8aeeec7b382
 EBUILD libcloudproviders-0.3.6.ebuild 1070 BLAKE2B e5d5116a75c90931c8c62c8ba051b9d19c002100f7f3c1da5440d6becb5a9c1f899ab84b0f370dd82d353c9ce84a2bda201c13545a3abcd94b3f2561b92be46d SHA512 f3cd841dacc408dc81ee28ba1b2d11269ec13331032b48db38249c5f437a394449cfd9c66dc0f209e6bf250d72adaa0c8dcfd1c7daa2168034e2e8aeeec7b382
 MISC metadata.xml 358 BLAKE2B 5411f132651dd738aaaa1aad4bc8b1d28b08082c76c375145c660435e63c8422382c96b290bc3c194becd8251572b21528200e29badbd73274bd335f877677ac SHA512 4ce53f86d353badca979470dff17f1e30e1d7ad820561dcb348148d1e7cb6435319b1ed2ed2522d897763536a7680843aa7c5204807ce7f22b94cdb4bf172fd4
diff --git a/net-libs/libcloudproviders/libcloudproviders-0.3.5.ebuild b/net-libs/libcloudproviders/libcloudproviders-0.3.5.ebuild
deleted file mode 100644
index 9ae5a267cd4a..000000000000
--- a/net-libs/libcloudproviders/libcloudproviders-0.3.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson-multilib vala
-
-DESCRIPTION="DBus API that allows cloud storage sync clients to expose their services"
-HOMEPAGE="https://gitlab.gnome.org/World/libcloudproviders"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="gtk-doc +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.56:2[${MULTILIB_USEDEP}]
-	introspection? ( dev-libs/gobject-introspection )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc enable-gtk-doc)
-		-Dinstalled-tests=false
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapigen)
-	)
-	meson_src_configure
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/net-libs/libgrss/Manifest b/net-libs/libgrss/Manifest
index 558393c396fd..02689c7ed9fb 100644
--- a/net-libs/libgrss/Manifest
+++ b/net-libs/libgrss/Manifest
@@ -1,3 +1,3 @@
 DIST libgrss-0.7.0.tar.xz 362360 BLAKE2B d93337ab50edf9b5d0762a624fbf0db29faca556e5d13d51659c6199d9dcbf71bc8334b8a9c6a2830d9496b86d066949fc7b072439b63f3a528ef36b77c61bc0 SHA512 22a4f13ee979932575c6efd25bfd2fb184ea113aa34254d9e4bfb64cfbbd9b277dd235b8c9be037baf8c85bea7ba3bc1478ec3c7a3c87e63aeddb1774959c780
-EBUILD libgrss-0.7.0.ebuild 598 BLAKE2B c59b0992a2056b0a6e6fdd53816caf9bbd19c3a00ef2977934b12cf4a2bd73982d55946247d5bcac12791482dacb55774d6e1043fa7034717a18d10ed29e76a5 SHA512 49555076cd31005f20ee23b7d2b79bc806092f637471546969c660f787b5857425b29a093b8fa96e61c207479a9594f25ad6a8797ca53816c0356b8aa4fbf508
+EBUILD libgrss-0.7.0-r1.ebuild 685 BLAKE2B 6553a9fc73359e24529763eae53ee609c36d905c5ff7f488dca87ec9aeab03e89895d1da4a7a8f919be28b3c28d98ae5b71c5f90728b673d9136ffcb05a81058 SHA512 16217211062dc8c91f22d2daa29e204a6f2c9dccc22b83b3a0d51b503f8b71bcbe192932b30deec750a9b4ff7d2fa8bec0d9681f05a6abf3f737026b633ac232
 MISC metadata.xml 348 BLAKE2B 1566eef053ff71da85dbdb811bf422edc9d32d0dcd7c6c67a50f2e4da13fd2ba1c6bfd10c77e932afb71df03ce41f58f0e2cbe40dcc9da6102e82521b6cf606c SHA512 b8a31db60441855bb319d2bae9dd24799cbc05f6d08d6d4156046111438aa4527e92bc867b3fbbe9a0f3ce6c1571b94e4a94d50dcfd2f4f7dfaf562131233f13
diff --git a/net-libs/libgrss/libgrss-0.7.0.ebuild b/net-libs/libgrss/libgrss-0.7.0-r1.ebuild
index ac7138803a21..2720d499d99a 100644
--- a/net-libs/libgrss/libgrss-0.7.0.ebuild
+++ b/net-libs/libgrss/libgrss-0.7.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+introspection"
 RDEPEND="
 	>=dev-libs/glib-2.42.1:2
 	>=dev-libs/libxml2-2.9.2:2
-	>=net-libs/libsoup-2.48:2.4
+	>=net-libs/libsoup-2.48:2.4[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.42 )
 "
 DEPEND="${RDEPEND}"
@@ -24,3 +24,7 @@ BDEPEND="
 	>=dev-build/gtk-doc-am-1.10
 	virtual/pkgconfig
 "
+
+src_configure() {
+	gnome2_src_configure $(use_enable introspection)
+}
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
deleted file mode 100644
index cc5d32e9d1f9..000000000000
--- a/net-libs/libpri/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libpri-1.4.13-multilib.patch 2541 BLAKE2B 082b9e44d102ddac090faa2efebb9047ed469d762ea00f4836ba131ced6041b0e6f03a7a124797d637df90c9b636202ca90d3d670af63a6e746a871b748e5a28 SHA512 7e6b43e64c5a4fd791090d3b20008a2bc1b9deeedf613ef6e72ec6b5dc105449705bedac5f4628d9d53963ae9649ad22480daa114de40f83854d045c2f3d9247
-AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e706b7fd6043ca8012a74c79b900b00f9a98414812d50b5a6b26acee1bc5b382831ed11bf5636ec6fb4807163017d62f687e9c SHA512 3d057a8bc1401e4580dcdbb401c697cc25117b8ab9fc4feedba39bd980dc9745423eae7cc75fe48c3684b07459d0f5de11717020d3e7726ca89de7c6a8a3861d
-AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
-DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
-EBUILD libpri-1.6.0-r1.ebuild 740 BLAKE2B 0c88633ff817ab2abc1641aca1f8621ed55d5fe1c0bce36941d79b5da3a9fe5e7dbedbd0937d24e7cf2ff0505dcce3fda65cf38adbb00999f8083a7fa8329c7d SHA512 6859f0dad845b89a53a3f2f3c2aabb88e2d4256b427fdef8db881254673b5abc26773bf511a07eb0f7e8cfb98ff67b9ed1caeed7c57a88dc336cc47ad1502ade
-EBUILD libpri-1.6.0.ebuild 746 BLAKE2B 028f857458573225c5eddb50f1db4c42b3a1b922087de1fcd1fc91fb1fb3c4555cc3998db1ae4cb8152421a211c62f0d6d873f533c5f544a08520c0d55d3514f SHA512 12792947d821171592025f5d252c1ee76a04c7c8895bb243372a11142cd60d266c6b856d70b2de42ff7f8ffcb4482c247ffef4ee9d79c3ed003d528042502b64
-MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-libs/libpri/files/libpri-1.4.13-multilib.patch b/net-libs/libpri/files/libpri-1.4.13-multilib.patch
deleted file mode 100644
index 22eec7e50059..000000000000
--- a/net-libs/libpri/files/libpri-1.4.13-multilib.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- libpri-1.4.13/Makefile.orig	2012-09-26 17:46:23.000000000 +0200
-+++ libpri-1.4.13/Makefile	2012-10-10 08:04:44.000000000 +0200
-@@ -71,7 +71,7 @@
- CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
--libdir?=$(INSTALL_BASE)/lib
-+LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- ifneq ($(findstring Darwin,$(OSARCH)),)
-   SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
-@@ -145,27 +145,27 @@
- 	fi
- 
- install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
--	mkdir -p $(INSTALL_PREFIX)$(libdir)
-+	mkdir -p $(LIBDIR)
- 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
- ifneq (${OSARCH},SunOS)
- 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
--	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
--	#if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
--	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so)
--	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
--	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
-+	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
-+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
-+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
-+	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
- else
- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
--	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
--	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so)
--	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
-+	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
-+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
- endif
- 
- uninstall:
- 	@echo "Removing Libpri"
--	rm -f $(INSTALL_PREFIX)$(libdir)/$(STATIC_LIBRARY)
--	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
--	rm -f $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY)
-+	rm -f $(LIBDIR)/libpri.so.$(SONAME)
-+	rm -f $(LIBDIR)/libpri.so
-+	rm -f $(LIBDIR)/libpri.a
- 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
- 
- pritest: pritest.o $(STATIC_LIBRARY)
diff --git a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch
deleted file mode 100644
index 963e730c6fda..000000000000
--- a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -uNr libpri-1.4.13.ORIG/Makefile libpri-1.4.13/Makefile
---- libpri-1.4.13.ORIG/Makefile	2012-10-27 13:22:57.902838938 +0100
-+++ libpri-1.4.13/Makefile	2012-10-27 13:23:36.746837229 +0100
-@@ -120,7 +120,7 @@
- SOFLAGS += -m32
- endif
- 
--all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) $(UTILITIES)
-+all: $(DYNAMIC_LIBRARY)
- 
- update:
- 	@if [ -d .svn ]; then \
-@@ -139,7 +139,7 @@
- 		echo "Not under version control";  \
- 	fi
- 
--install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
-+install: $(DYNAMIC_LIBRARY)
- 	mkdir -p $(LIBDIR)
- 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
- ifneq (${OSARCH},SunOS)
-@@ -147,13 +147,11 @@
- 	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
- 	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
- 	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
--	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
- 	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
- else
- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
- 	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
- 	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
--	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
- endif
- 
- uninstall:
diff --git a/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch
deleted file mode 100644
index 1928e5d871fb..000000000000
--- a/net-libs/libpri/files/libpri-1.6.0-respect-user-flags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -uNr libpri-1.6.0.ORIG/Makefile libpri-1.6.0/Makefile
---- libpri-1.6.0.ORIG/Makefile	2017-09-19 10:37:05.176546588 +0100
-+++ libpri-1.6.0/Makefile	2017-09-19 10:37:41.029544605 +0100
-@@ -24,10 +24,6 @@
- # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING
- #ALERTING=-DALERTING_NO_PROGRESS
- 
--CC=gcc
--GREP=grep
--AWK=awk
--
- OSARCH=$(shell uname -s)
- PROC?=$(shell uname -m)
- 
-@@ -68,7 +64,7 @@
- 	$(STATIC_OBJS)
- CFLAGS ?= -g
- CFLAGS += $(CPPFLAGS)
--CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-+CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
- CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
-@@ -108,17 +104,12 @@
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
--else
--  ifneq ($(CODE_COVERAGE),)
-+ifneq ($(CODE_COVERAGE),)
-     LIBPRI_OPT=
-     COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-     COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
--  else
--    LIBPRI_OPT=-O2
--  endif
-+else
-+    LIBPRI_OPT=
- endif
- 
- ifeq ($(CPUARCH),i686)
-@@ -197,7 +188,7 @@
- 	ranlib $(STATIC_LIBRARY)
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
--	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+	$(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf $(DYNAMIC_LIBRARY) libpri.so
- 
diff --git a/net-libs/libpri/libpri-1.6.0-r1.ebuild b/net-libs/libpri/libpri-1.6.0-r1.ebuild
deleted file mode 100644
index f32cac3d821e..000000000000
--- a/net-libs/libpri/libpri-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.6.0-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_compile() {
-	tc-export CC
-	default
-}
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpri/libpri-1.6.0.ebuild b/net-libs/libpri/libpri-1.6.0.ebuild
deleted file mode 100644
index aff3b4dccc25..000000000000
--- a/net-libs/libpri/libpri-1.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.6.0-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_compile() {
-	tc-export CC
-	default
-}
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpri/metadata.xml b/net-libs/libpri/metadata.xml
deleted file mode 100644
index 6aebbc46f559..000000000000
--- a/net-libs/libpri/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jaco@uls.co.za</email>
-		<name>Jaco Kroon</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d260947005f3..364ed45bb24d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,9 +2,12 @@ AUX 2.42.1-arm64-non-jumbo-fix.patch 1491 BLAKE2B 2902c8f26730fe92c3604ef264ed4b
 AUX 2.42.3-arm64-non-jumbo-fix-925621.patch 1025 BLAKE2B 6a9641b4c05b62c143b2be5ed1d2d8563839466d56831b4dcba503c8892848155f753b0c892407882e41d9cdebd418eff68b94918ed098526813feb1cb87c435 SHA512 238531fe2cc6dff154527abafb8d9c3f0586a82122675d763a440d8dd58162840ebd0539b2ca5c797b203707b4b4470207e509f050220881bc5474660b057ab7
 AUX 2.42.4-wasm-assert-fix.patch 1631 BLAKE2B fe7272f849a816e85440ac3df0d33338ec1335e1b55508ea910be02ce103ea8907d401f8553761514d42164e1d771391abe7bcbcd18765358255569fd70e50f1 SHA512 83b1737e232d09128f18cc9662fc6d614bb1274f53d839fbf4048d5e4160b71a880229b46e6e99e914db93a936415d805821fbc82beb9b2ee54f6505a8ebe395
 AUX 2.42.5-x86-build-fix.patch 1375 BLAKE2B 0ce7224b81fbcf6602845cc5ba454c6e2c86301fb9b075c435308e420c42ed907fec18ef8e0c4e00f2b78cf3776531d9092f6c62fa176f149d21713da6fc52ee SHA512 aad29eecab37d12a983aa5748c08761458769643d1c9cd87c017c58a4ac00c0c6f3cf7f04d0b30e846485def9414a75a46f29256ca7a7dec89aa25b081b6f1dd
+AUX 2.44.1-branch-patchset.patch 11288 BLAKE2B 0966d524063bc6137464eca431d161ac3b8ec0687f5cb2fa318d95734ceebd6bf9a4bef8db39b135f02a5e64ab453a9e74b3484db1411cf8ad85292d9d4cf034 SHA512 7f2420e49e085fecd630a62866ba2df0470e89f5bf92251436e9aca55200a158b96e866bf15bef283abf4b81d484d9747368fcd3ed2c58d0650aee1df9d9cd52
+AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802
 DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839
 DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401 SHA512 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293
 DIST webkitgtk-2.42.5.tar.xz 34651836 BLAKE2B 4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516 SHA512 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0
+DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
 EBUILD webkit-gtk-2.42.3-r410.ebuild 8114 BLAKE2B a98e45846e051838f8571c58c7af729a855e21cabaf00c178c59e053c01306db7b794b82b30af42e580582eb1ade94c3eafd9dde7c64e37b7d1846e9370e859b SHA512 c38679ce3a3d60c87a68f7839a34ab801e2a19d097d62617f26d5971b01cbe0a8a43f927faae3ac12dcfaed9d2f382dd4564cc6c43d9b3873a5de3216a85ebbe
 EBUILD webkit-gtk-2.42.3-r600.ebuild 8011 BLAKE2B 2f22d541295bb6bfbc2887f71f4e12ecee0b675ddf3c0a782c1b5fed21edf78c341f6b40133a60f8bcce86b67d994841016c1bb2921d84b86ae0cf5daf6b774a SHA512 1721c6c842b0185b771dfac6fb906d22f6ef5e55067c968f059464c94da5bb1c7a4d0475966bd5aa422591c3cd78a84d7f7a93c035b0cd3b577760b7c974e301
 EBUILD webkit-gtk-2.42.3.ebuild 7840 BLAKE2B 06c043a689ecfecb778258c46f1335deb5cf81ad5fb0e1392fa98bdf78b3bccbdb3160dea797d5eea1ebbee1b9bd53af077713ee7101bd1b2d94132be20d8db7 SHA512 0ad3bef0dc844646a082bf52702f245cddc88625e285eb9530bfd9cc672e29f777b5d69595dea60ed894e717d46dc600d244a216c52b469c78617d603be4b98c
@@ -14,4 +17,7 @@ EBUILD webkit-gtk-2.42.4.ebuild 7994 BLAKE2B 82e95102f93c9a7570465ddcac8bff269ab
 EBUILD webkit-gtk-2.42.5-r410.ebuild 8357 BLAKE2B 25eb56f967c3bbe027aac813172f3dd085a050f8ba5317ddf20c1419d0eef9013400da0e42bf67d8a493f0554c705af5b04af81b546bd4042352a0f4c3cf3183 SHA512 bd8077991e35e85e42d87c5d97be5da7598bf9cd9717e2fadd3e85b994153661ee63411d24d344d3633321e116486a8750346ba80c72b62df7da19c671e0333d
 EBUILD webkit-gtk-2.42.5-r600.ebuild 8254 BLAKE2B 65f98baf6944bd1697d2e46a4de7e5cdf40daa49b3b203ae7e713a533143d7a9776a090245fb5a0cf6a4dca352d86738d80e4c131bc9e9e1a9799084a78f0421 SHA512 058f62feea3ad21302b3570e624da3d6541bcd647ebb0138a0ad3f8bcafa8d3478643931d96d36a8b4dd3e70fb78c4d71c56eda3662ecce90bae0813229c4d16
 EBUILD webkit-gtk-2.42.5.ebuild 8083 BLAKE2B 3ce4294d67e5f4a8b1bf48fa61238717f432f316a1792a91190fbb9bf1464e10c444747062a0cc9428d44a82fd7dd2d9d252a8b061b9d0ffa1e70b80d7479ef8 SHA512 e9ca9909412e4ca90ec406bf5a708db9cf98b31905a38daf085633b15c9002c924a9804c5d71d16468014201126fbbbb8fd91f9eda2ce38376237d65410f096a
+EBUILD webkit-gtk-2.44.1-r410.ebuild 8159 BLAKE2B e2bcfccb365a9983a6aeb03a0e28a5e4c24157484afdd6f48285ad479f6787dce5b70e0e3c8eb879e414e9611a5023c78af76fced21aa6bb74237057fe0eea6c SHA512 eeab6b8936a8cf28dfee4ba3e64199f6beefbac766380d9c848fe98e0355542cb22fa878ffff48e9591b25e45ead51851976a190b33d0d94512f71f9a27610a4
+EBUILD webkit-gtk-2.44.1-r600.ebuild 8852 BLAKE2B 92608e15adf9238649e14c35904305ba0ac88541318142376a5ad67b2af94714e2c1d571d4ee67e6ba928a867a1f665996bc506ff2c687e0a203328c1f6bdccf SHA512 eda82b9a2f6e6d7e3a0b482fa1fd4717e90dc69290d39fae523729f11a80234e56f14298797fa217103a4f3a6238076997b630174ca84b053f6bda7fc0b5bfeb
+EBUILD webkit-gtk-2.44.1.ebuild 8007 BLAKE2B 1fd491405b39fe4b80800b20ecf109ceccd2c5d95e1165a2ca5030df79d7122e4783d896fbcb5d6484d8482e61ffe053eb2ec2b9d649be83f0fdf45435cac716 SHA512 23c43fae570a07aaf756e43f5a707bb57f181dce30945f69b9b81eb914f376e3057673cd67f3cf62aab2ca0deb2989f760f18ebe4dcefe288f9fa78478b8455c
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch b/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch
new file mode 100644
index 000000000000..869c85e84a6e
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch
@@ -0,0 +1,262 @@
+From 53ca279739365f9a604fba0a673f0539dfd67c55 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Mon, 8 Apr 2024 10:21:34 -0700
+Subject: [PATCH 1/6] Cherry-pick 277203@main (bd1249cc9c4f).
+ https://bugs.webkit.org/show_bug.cgi?id=272309
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+    Workaround restrict error in GCC 12
+    https://bugs.webkit.org/show_bug.cgi?id=272309
+
+    Reviewed by Darin Adler.
+
+    In GCC 12.3.0:
+
+    In static member function ‘static constexpr std::char_traits<char>::char_type* std::char_traits<char>::copy(char_type*, const char_type*, std::size_t)’,
+        inlined from ‘static constexpr void std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_S_copy(_CharT*, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:431:21,
+        inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Allocator>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_M_replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.tcc:532:22,
+        inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:2179:19,
+        inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::insert(size_type, const _CharT*) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:1936:22,
+        inlined from ‘std::ostream& WTF::operator<<(std::ostream&, Int128Impl)’ at /host/home/tingping/Projects/WebKit/Source/WTF/wtf/Int128.cpp:268:17:
+    /usr/include/c++/12/bits/char_traits.h:435:56: error: ‘void* __builtin_memcpy(void*, const void*, long unsigned int)’ accessing 9223372036854775810 or more bytes at offsets [2, 9223372036854775807] and 1 may overlap up to 9223372036854775813 bytes at offset -3 [-Werror=restrict]
+      435 |         return static_cast<char_type*>(__builtin_memcpy(__s1, __s2, __n));
+          |                                        ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
+
+    * Source/WTF/wtf/Int128.cpp:
+    (WTF::operator<<):
+
+    Canonical link: https://commits.webkit.org/277203@main
+
+Canonical link: https://commits.webkit.org/274313.129@webkitglib/2.44
+---
+ Source/WTF/wtf/Int128.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WTF/wtf/Int128.cpp b/Source/WTF/wtf/Int128.cpp
+index 3962059d0cb9..c04f6d74543a 100644
+--- a/Source/WTF/wtf/Int128.cpp
++++ b/Source/WTF/wtf/Int128.cpp
+@@ -265,9 +265,9 @@ std::ostream& operator<<(std::ostream& os, Int128Impl v) {
+       (flags & std::ios::basefield) == std::ios_base::fmtflags();
+   if (print_as_decimal) {
+     if (Int128High64(v) < 0) {
+-      rep = "-";
++      rep.append("-");
+     } else if (flags & std::ios::showpos) {
+-      rep = "+";
++      rep.append("+");
+     }
+   }
+ 
+-- 
+2.43.0
+
+
+From 8ce83c4bf224122e0062248752a3ed014efc67e5 Mon Sep 17 00:00:00 2001
+From: Tim Nguyen <ntim@apple.com>
+Date: Wed, 3 Apr 2024 09:22:37 -0700
+Subject: [PATCH 4/6] Cherry-pick 277007@main (1870b119a450).
+ https://bugs.webkit.org/show_bug.cgi?id=272044
+
+    CrashTracer: com.apple.WebKit.WebContent at WebCore: WebCore::ValidatedFormListedElement::updateValidity
+    https://bugs.webkit.org/show_bug.cgi?id=272044
+    rdar://117727866
+
+    Reviewed by Ryosuke Niwa.
+
+    It speculatively fixes a bug that RadioButtonGroup::m_members may contain a nullptr WeakRef.
+
+    * Source/WebCore/dom/RadioButtonGroups.cpp:
+    (WebCore::RadioButtonGroup::isEmpty const):
+    (WebCore::RadioButtonGroup::remove):
+    (WebCore::RadioButtonGroup::setNeedsStyleRecalcForAllButtons):
+    (WebCore::RadioButtonGroup::updateValidityForAllButtons):
+
+    Canonical link: https://commits.webkit.org/277007@main
+
+Canonical link: https://commits.webkit.org/274313.132@webkitglib/2.44
+---
+ Source/WebCore/dom/RadioButtonGroups.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Source/WebCore/dom/RadioButtonGroups.cpp b/Source/WebCore/dom/RadioButtonGroups.cpp
+index ba07a3fbdf09..4bbae6cbb72f 100644
+--- a/Source/WebCore/dom/RadioButtonGroups.cpp
++++ b/Source/WebCore/dom/RadioButtonGroups.cpp
+@@ -31,7 +31,7 @@ namespace WebCore {
+ class RadioButtonGroup {
+     WTF_MAKE_FAST_ALLOCATED;
+ public:
+-    bool isEmpty() const { return m_members.isEmpty(); }
++    bool isEmpty() const { return m_members.isEmptyIgnoringNullReferences(); }
+     bool isRequired() const { return m_requiredCount; }
+     RefPtr<HTMLInputElement> checkedButton() const { return m_checkedButton.get(); }
+     void add(HTMLInputElement&);
+@@ -47,7 +47,7 @@ private:
+     bool isValid() const;
+     void setCheckedButton(HTMLInputElement*);
+ 
+-    HashSet<WeakRef<HTMLInputElement, WeakPtrImplWithEventTargetData>> m_members;
++    WeakHashSet<HTMLInputElement, WeakPtrImplWithEventTargetData> m_members;
+     WeakPtr<HTMLInputElement, WeakPtrImplWithEventTargetData> m_checkedButton;
+     size_t m_requiredCount { 0 };
+ };
+@@ -60,7 +60,7 @@ inline bool RadioButtonGroup::isValid() const
+ Vector<Ref<HTMLInputElement>> RadioButtonGroup::members() const
+ {
+     auto sortedMembers = WTF::map(m_members, [](auto& element) -> Ref<HTMLInputElement> {
+-        return element.get();
++        return element;
+     });
+     std::sort(sortedMembers.begin(), sortedMembers.end(), [](auto& a, auto& b) {
+         return is_lt(treeOrder<ComposedTree>(a, b));
+@@ -155,7 +155,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button)
+         }
+     }
+ 
+-    if (m_members.isEmpty()) {
++    if (m_members.isEmptyIgnoringNullReferences()) {
+         ASSERT(!m_requiredCount);
+         ASSERT(!m_checkedButton);
+     } else if (wasValid != isValid())
+@@ -170,7 +170,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button)
+ void RadioButtonGroup::setNeedsStyleRecalcForAllButtons()
+ {
+     for (auto& checkedButton : m_members) {
+-        Ref button = checkedButton.get();
++        Ref button = checkedButton;
+         ASSERT(button->isRadioButton());
+         button->invalidateStyleForSubtree();
+     }
+@@ -179,7 +179,7 @@ void RadioButtonGroup::setNeedsStyleRecalcForAllButtons()
+ void RadioButtonGroup::updateValidityForAllButtons()
+ {
+     for (auto& checkedButton : m_members) {
+-        Ref button = checkedButton.get();
++        Ref button = checkedButton;
+         ASSERT(button->isRadioButton());
+         button->updateValidity();
+     }
+-- 
+2.43.0
+
+
+From 93bde17ed761f5de54726de83ced4959303794c6 Mon Sep 17 00:00:00 2001
+From: Abrar Rahman Protyasha <a_protyasha@apple.com>
+Date: Mon, 1 Apr 2024 22:42:12 -0700
+Subject: [PATCH 5/6] Cherry-pick 276925@main (59cedf7135bc).
+ https://bugs.webkit.org/show_bug.cgi?id=271962
+
+    Linker error when logging ViewportConfiguration to TextStream in Release configuration
+    https://bugs.webkit.org/show_bug.cgi?id=271962
+    rdar://125713559
+
+    Reviewed by Sihui Liu.
+
+    WebCore::operator<<(WTF::TextStream&, WebCore::ViewConfiguration const&)
+    is defined behind !LOG_DISABLED, which means in Release configuration,
+    the linker cannot find this definition.
+
+    This patch fixes the linker error by removing the relevant !LOG_DISABLED
+    checks around both the operator<< overload definition and the
+    description()/dump() declarations, since said methods are referenced by
+    the operator<< overload.
+
+    * Source/WebCore/page/ViewportConfiguration.cpp:
+    (WebCore::ViewportConfiguration::setIsKnownToLayOutWiderThanViewport):
+    (WebCore::ViewportConfiguration::dump const):
+    * Source/WebCore/page/ViewportConfiguration.h:
+
+    Canonical link: https://commits.webkit.org/276925@main
+
+Canonical link: https://commits.webkit.org/274313.133@webkitglib/2.44
+---
+ Source/WebCore/page/ViewportConfiguration.cpp | 4 ++--
+ Source/WebCore/page/ViewportConfiguration.h   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WebCore/page/ViewportConfiguration.cpp b/Source/WebCore/page/ViewportConfiguration.cpp
+index 51abb1154515..c58bc368cd6c 100644
+--- a/Source/WebCore/page/ViewportConfiguration.cpp
++++ b/Source/WebCore/page/ViewportConfiguration.cpp
+@@ -674,8 +674,6 @@ bool ViewportConfiguration::setIsKnownToLayOutWiderThanViewport(bool value)
+     return true;
+ }
+ 
+-#if !LOG_DISABLED
+-
+ TextStream& operator<<(TextStream& ts, const ViewportConfiguration::Parameters& parameters)
+ {
+     ts.startGroup();
+@@ -747,6 +745,8 @@ String ViewportConfiguration::description() const
+     return ts.release();
+ }
+ 
++#if !LOG_DISABLED
++
+ void ViewportConfiguration::dump() const
+ {
+     WTFLogAlways("%s", description().utf8().data());
+diff --git a/Source/WebCore/page/ViewportConfiguration.h b/Source/WebCore/page/ViewportConfiguration.h
+index acd5a92ae089..1a7c27225a4b 100644
+--- a/Source/WebCore/page/ViewportConfiguration.h
++++ b/Source/WebCore/page/ViewportConfiguration.h
+@@ -148,9 +148,9 @@ public:
+     WEBCORE_EXPORT static Parameters imageDocumentParameters();
+     WEBCORE_EXPORT static Parameters xhtmlMobileParameters();
+     WEBCORE_EXPORT static Parameters testingParameters();
+-    
+-#if !LOG_DISABLED
++
+     String description() const;
++#if !LOG_DISABLED
+     WEBCORE_EXPORT void dump() const;
+ #endif
+ 
+-- 
+2.43.0
+
+
+From aff53249f2d491d082094a2aa57008c46e55d278 Mon Sep 17 00:00:00 2001
+From: Erica Li <lerica@apple.com>
+Date: Tue, 19 Mar 2024 18:27:04 -0700
+Subject: [PATCH 6/6] Cherry-pick 276379@main (d036679431a5).
+ https://bugs.webkit.org/show_bug.cgi?id=271028
+
+    ASAN_SEGV | WebCore::LocalFrame::injectUserScripts.
+    rdar://124432384
+    https://bugs.webkit.org/show_bug.cgi?id=271028
+
+    Reviewed by Ryosuke Niwa.
+
+    Frame might be detached early, null checking before injectUserScripts from image document.
+
+    * Source/WebCore/html/ImageDocument.cpp:
+    (WebCore::ImageDocument::createDocumentStructure):
+
+    Canonical link: https://commits.webkit.org/276379@main
+
+Canonical link: https://commits.webkit.org/274313.134@webkitglib/2.44
+---
+ Source/WebCore/html/ImageDocument.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp
+index f91478f138fe..67d3ed0d09af 100644
+--- a/Source/WebCore/html/ImageDocument.cpp
++++ b/Source/WebCore/html/ImageDocument.cpp
+@@ -230,7 +230,8 @@ void ImageDocument::createDocumentStructure()
+     rootElement->insertedByParser();
+     rootElement->setInlineStyleProperty(CSSPropertyHeight, 100, CSSUnitType::CSS_PERCENTAGE);
+ 
+-    frame()->injectUserScripts(UserScriptInjectionTime::DocumentStart);
++    if (RefPtr localFrame = frame())
++        localFrame->injectUserScripts(UserScriptInjectionTime::DocumentStart);
+ 
+     // We need a <head> so that the call to setTitle() later on actually has an <head> to append to <title> to.
+     auto head = HTMLHeadElement::create(*this);
+-- 
+2.43.0
+
diff --git a/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch b/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch
new file mode 100644
index 000000000000..ee5a1c222e70
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.44.1-non-unified-build-fixes.patch
@@ -0,0 +1,322 @@
+From 211b73efb2a416f3b464d9d74da0aa8f93abe016 Mon Sep 17 00:00:00 2001
+From: Don Olmstead <don.olmstead@sony.com>
+Date: Fri, 8 Mar 2024 17:27:09 -0800
+Subject: [PATCH] Non-unified build fixes, early March 2024 edition
+ https://bugs.webkit.org/show_bug.cgi?id=270719
+
+Unreviewed non-unified build fix.
+
+* Source/JavaScriptCore/jit/JITSizeStatistics.cpp:
+* Source/WebCore/Modules/model-element/ModelPlayerClient.h:
+* Source/WebCore/css/CSSCrossfadeValue.h:
+* Source/WebCore/css/CSSImageSetOptionValue.cpp:
+* Source/WebCore/css/CSSImageSetOptionValue.h:
+* Source/WebCore/css/CSSReflectValue.cpp:
+* Source/WebCore/css/CSSReflectValue.h:
+* Source/WebCore/css/CSSShadowValue.h:
+* Source/WebCore/css/CSSValuePair.cpp:
+* Source/WebCore/css/CSSValuePair.h:
+* Source/WebCore/dom/SlotAssignment.h:
+* Source/WebCore/dom/TrustedType.cpp:
+* Source/WebCore/rendering/svg/RenderSVGPath.cpp:
+* Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp:
+* Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp:
+* Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp:
+* Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp:
+* Source/WebKit/GPUProcess/graphics/RemoteImageBufferSet.cpp:
+* Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp:
+* Source/WebKit/UIProcess/BrowsingContextGroup.cpp:
+* Source/WebKit/UIProcess/FrameProcess.cpp:
+* Source/WebKit/UIProcess/ProvisionalPageProxy.cpp:
+
+Canonical link: https://commits.webkit.org/275863@main
+
+(cherry picked from commit 38c6ecad0ea32e80cb3e811c3ff759074006791f)
+---
+ Source/JavaScriptCore/jit/JITSizeStatistics.cpp               | 1 +
+ Source/WebCore/Modules/model-element/ModelPlayerClient.h      | 1 +
+ Source/WebCore/css/CSSCrossfadeValue.h                        | 3 ++-
+ Source/WebCore/css/CSSImageSetOptionValue.cpp                 | 1 -
+ Source/WebCore/css/CSSImageSetOptionValue.h                   | 4 ++--
+ Source/WebCore/css/CSSReflectValue.cpp                        | 2 --
+ Source/WebCore/css/CSSReflectValue.h                          | 4 ++--
+ Source/WebCore/css/CSSShadowValue.h                           | 4 ++--
+ Source/WebCore/css/CSSValuePair.cpp                           | 1 +
+ Source/WebCore/css/CSSValuePair.h                             | 1 +
+ Source/WebCore/dom/SlotAssignment.h                           | 1 +
+ Source/WebCore/rendering/svg/RenderSVGPath.cpp                | 2 ++
+ .../WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp | 2 ++
+ Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp      | 2 ++
+ Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp      | 2 ++
+ .../WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp | 2 ++
+ .../Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp  | 1 +
+ Source/WebKit/UIProcess/ProvisionalPageProxy.cpp              | 1 +
+ 18 files changed, 25 insertions(+), 10 deletions(-)
+
+diff --git a/Source/JavaScriptCore/jit/JITSizeStatistics.cpp b/Source/JavaScriptCore/jit/JITSizeStatistics.cpp
+index f1bc2780343a..b2ffd81ee34d 100644
+--- a/Source/JavaScriptCore/jit/JITSizeStatistics.cpp
++++ b/Source/JavaScriptCore/jit/JITSizeStatistics.cpp
+@@ -29,6 +29,7 @@
+ #if ENABLE(JIT)
+ 
+ #include "CCallHelpers.h"
++#include "JITPlan.h"
+ #include "LinkBuffer.h"
+ #include <wtf/BubbleSort.h>
+ #include <wtf/TZoneMallocInlines.h>
+diff --git a/Source/WebCore/Modules/model-element/ModelPlayerClient.h b/Source/WebCore/Modules/model-element/ModelPlayerClient.h
+index 9343d5102015..b9cf2857eee2 100644
+--- a/Source/WebCore/Modules/model-element/ModelPlayerClient.h
++++ b/Source/WebCore/Modules/model-element/ModelPlayerClient.h
+@@ -25,6 +25,7 @@
+ 
+ #pragma once
+ 
++#include "LayerHostingContextIdentifier.h"
+ #include "PlatformLayerIdentifier.h"
+ #include <wtf/Forward.h>
+ #include <wtf/WeakPtr.h>
+diff --git a/Source/WebCore/css/CSSCrossfadeValue.h b/Source/WebCore/css/CSSCrossfadeValue.h
+index eafa3bb5e828..86b87be608fe 100644
+--- a/Source/WebCore/css/CSSCrossfadeValue.h
++++ b/Source/WebCore/css/CSSCrossfadeValue.h
+@@ -25,11 +25,12 @@
+ 
+ #pragma once
+ 
++#include "CSSPrimitiveValue.h"
+ #include "CSSValue.h"
++#include <wtf/Function.h>
+ 
+ namespace WebCore {
+ 
+-class CSSPrimitiveValue;
+ class StyleImage;
+ 
+ namespace Style {
+diff --git a/Source/WebCore/css/CSSImageSetOptionValue.cpp b/Source/WebCore/css/CSSImageSetOptionValue.cpp
+index 9becc5444e10..2b7812e419a2 100644
+--- a/Source/WebCore/css/CSSImageSetOptionValue.cpp
++++ b/Source/WebCore/css/CSSImageSetOptionValue.cpp
+@@ -27,7 +27,6 @@
+ #include "CSSImageSetOptionValue.h"
+ 
+ #include "CSSImageValue.h"
+-#include "CSSPrimitiveValue.h"
+ 
+ namespace WebCore {
+ 
+diff --git a/Source/WebCore/css/CSSImageSetOptionValue.h b/Source/WebCore/css/CSSImageSetOptionValue.h
+index 60ef16534b24..c65ddccc04b5 100644
+--- a/Source/WebCore/css/CSSImageSetOptionValue.h
++++ b/Source/WebCore/css/CSSImageSetOptionValue.h
+@@ -25,13 +25,13 @@
+ 
+ #pragma once
+ 
++#include "CSSPrimitiveValue.h"
+ #include "CSSValue.h"
++#include <wtf/Function.h>
+ #include <wtf/text/WTFString.h>
+ 
+ namespace WebCore {
+ 
+-class CSSPrimitiveValue;
+-
+ class CSSImageSetOptionValue final : public CSSValue {
+ public:
+     static Ref<CSSImageSetOptionValue> create(Ref<CSSValue>&&);
+diff --git a/Source/WebCore/css/CSSReflectValue.cpp b/Source/WebCore/css/CSSReflectValue.cpp
+index 371e6ed16087..6049d4af7d2d 100644
+--- a/Source/WebCore/css/CSSReflectValue.cpp
++++ b/Source/WebCore/css/CSSReflectValue.cpp
+@@ -26,8 +26,6 @@
+ #include "config.h"
+ #include "CSSReflectValue.h"
+ 
+-#include "CSSPrimitiveValue.h"
+-
+ namespace WebCore {
+ 
+ CSSReflectValue::CSSReflectValue(CSSValueID direction, Ref<CSSPrimitiveValue> offset, RefPtr<CSSValue> mask)
+diff --git a/Source/WebCore/css/CSSReflectValue.h b/Source/WebCore/css/CSSReflectValue.h
+index c67d2ad0dc4b..84f7b1d0e7e1 100644
+--- a/Source/WebCore/css/CSSReflectValue.h
++++ b/Source/WebCore/css/CSSReflectValue.h
+@@ -25,12 +25,12 @@
+ 
+ #pragma once
+ 
++#include "CSSPrimitiveValue.h"
+ #include "CSSValue.h"
++#include <wtf/Function.h>
+ 
+ namespace WebCore {
+ 
+-class CSSPrimitiveValue;
+-
+ class CSSReflectValue final : public CSSValue {
+ public:
+     static Ref<CSSReflectValue> create(CSSValueID direction, Ref<CSSPrimitiveValue> offset, RefPtr<CSSValue> mask);
+diff --git a/Source/WebCore/css/CSSShadowValue.h b/Source/WebCore/css/CSSShadowValue.h
+index 26857028cf36..7d6d25980f72 100644
+--- a/Source/WebCore/css/CSSShadowValue.h
++++ b/Source/WebCore/css/CSSShadowValue.h
+@@ -20,13 +20,13 @@
+ 
+ #pragma once
+ 
++#include "CSSPrimitiveValue.h"
+ #include "CSSValue.h"
++#include <wtf/Function.h>
+ #include <wtf/RefPtr.h>
+ 
+ namespace WebCore {
+ 
+-class CSSPrimitiveValue;
+-
+ // Used for text-shadow and box-shadow
+ class CSSShadowValue final : public CSSValue {
+ public:
+diff --git a/Source/WebCore/css/CSSValuePair.cpp b/Source/WebCore/css/CSSValuePair.cpp
+index 7c64d5a9e353..a3e169a697c7 100644
+--- a/Source/WebCore/css/CSSValuePair.cpp
++++ b/Source/WebCore/css/CSSValuePair.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include "config.h"
+ #include "CSSValuePair.h"
++
+ #include <wtf/Hasher.h>
+ #include <wtf/text/WTFString.h>
+ 
+diff --git a/Source/WebCore/css/CSSValuePair.h b/Source/WebCore/css/CSSValuePair.h
+index 0fc85298ca62..44c4d97c01ab 100644
+--- a/Source/WebCore/css/CSSValuePair.h
++++ b/Source/WebCore/css/CSSValuePair.h
+@@ -26,6 +26,7 @@
+ #pragma once
+ 
+ #include "CSSValue.h"
++#include <wtf/Function.h>
+ 
+ namespace WebCore {
+ 
+diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
+index 9f9e1159e10a..478ca88bfca6 100644
+--- a/Source/WebCore/dom/SlotAssignment.h
++++ b/Source/WebCore/dom/SlotAssignment.h
+@@ -30,6 +30,7 @@
+ #include <wtf/HashSet.h>
+ #include <wtf/Vector.h>
+ #include <wtf/WeakHashMap.h>
++#include <wtf/WeakHashSet.h>
+ #include <wtf/WeakPtr.h>
+ #include <wtf/text/AtomString.h>
+ #include <wtf/text/AtomStringHash.h>
+diff --git a/Source/WebCore/rendering/svg/RenderSVGPath.cpp b/Source/WebCore/rendering/svg/RenderSVGPath.cpp
+index e9977db1c8b6..eba99e3a49d3 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGPath.cpp
++++ b/Source/WebCore/rendering/svg/RenderSVGPath.cpp
+@@ -30,12 +30,14 @@
+ #include "RenderSVGPath.h"
+ 
+ #if ENABLE(LAYER_BASED_SVG_ENGINE)
++
+ #include "Gradient.h"
+ #include "ReferencedSVGResources.h"
+ #include "RenderLayer.h"
+ #include "RenderSVGResourceMarkerInlines.h"
+ #include "RenderSVGShapeInlines.h"
+ #include "RenderStyleInlines.h"
++#include "SVGElementTypeHelpers.h"
+ #include "SVGMarkerElement.h"
+ #include "SVGPathElement.h"
+ #include "SVGSubpathData.h"
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp
+index 85f79031ed4e..2b379fa4ebfe 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp
+@@ -23,8 +23,10 @@
+ #include "RenderSVGResourceLinearGradient.h"
+ 
+ #if ENABLE(LAYER_BASED_SVG_ENGINE)
++
+ #include "RenderSVGModelObjectInlines.h"
+ #include "RenderSVGResourceLinearGradientInlines.h"
++#include "SVGElementTypeHelpers.h"
+ #include <wtf/IsoMallocInlines.h>
+ 
+ namespace WebCore {
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp
+index d65a81f773eb..27abd9b6e0f7 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp
+@@ -24,6 +24,7 @@
+ #include "RenderSVGResourceMarker.h"
+ 
+ #if ENABLE(LAYER_BASED_SVG_ENGINE)
++
+ #include "Element.h"
+ #include "ElementIterator.h"
+ #include "FloatPoint.h"
+@@ -34,6 +35,7 @@
+ #include "RenderLayerInlines.h"
+ #include "RenderSVGModelObjectInlines.h"
+ #include "RenderSVGResourceMarkerInlines.h"
++#include "SVGElementTypeHelpers.h"
+ #include "SVGGraphicsElement.h"
+ #include "SVGLengthContext.h"
+ #include "SVGRenderStyle.h"
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
+index 81321523d0e4..86c59ca6fab6 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
+@@ -22,6 +22,7 @@
+ #include "RenderSVGResourceMasker.h"
+ 
+ #if ENABLE(LAYER_BASED_SVG_ENGINE)
++
+ #include "Element.h"
+ #include "ElementIterator.h"
+ #include "FloatPoint.h"
+@@ -33,6 +34,7 @@
+ #include "RenderSVGModelObjectInlines.h"
+ #include "RenderSVGResourceMaskerInlines.h"
+ #include "SVGContainerLayout.h"
++#include "SVGElementTypeHelpers.h"
+ #include "SVGGraphicsElement.h"
+ #include "SVGLengthContext.h"
+ #include "SVGRenderStyle.h"
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp
+index 7d70fd721d73..25a9b293468e 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp
+@@ -23,9 +23,11 @@
+ #include "RenderSVGResourceRadialGradient.h"
+ 
+ #if ENABLE(LAYER_BASED_SVG_ENGINE)
++
+ #include "RenderSVGModelObjectInlines.h"
+ #include "RenderSVGResourceRadialGradientInlines.h"
+ #include "RenderSVGShape.h"
++#include "SVGElementTypeHelpers.h"
+ #include <wtf/IsoMallocInlines.h>
+ 
+ namespace WebCore {
+diff --git a/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp b/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp
+index a0c521a767f1..3d4c130de7fa 100644
+--- a/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp
++++ b/Source/WebKit/Shared/WebGPU/WebGPURenderPassDepthStencilAttachment.cpp
+@@ -31,6 +31,7 @@
+ #include "WebGPUConvertFromBackingContext.h"
+ #include "WebGPUConvertToBackingContext.h"
+ #include <WebCore/WebGPURenderPassDepthStencilAttachment.h>
++#include <WebCore/WebGPUTextureView.h>
+ 
+ namespace WebKit::WebGPU {
+ 
+-- 
+2.43.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
new file mode 100644
index 000000000000..94f180c00cbc
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -0,0 +1,257 @@
+# 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..12} )
+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"
+
+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 found at 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 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6
+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=
+	dev-libs/libtasn1:=
+	>=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.5.4[egl(+)]
+	>=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
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=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:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	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 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	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
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+
+	# Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix
+	eapply "${FILESDIR}"/${PV}-branch-patchset.patch
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.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"
+
+	# 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_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
+		-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_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-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 "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.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
new file mode 100644
index 000000000000..2085212d4260
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -0,0 +1,269 @@
+# 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..12} )
+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"
+
+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 found at 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
+# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep
+# TODO: 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?
+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=
+	dev-libs/libtasn1:=
+	>=gui-libs/gtk-4.6.0:4[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.5.4[egl(+)]
+	>=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
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=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:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	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 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	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
+	!<net-libs/webkit-gtk-2.44:4.1
+"
+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
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+
+	# Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix
+	eapply "${FILESDIR}"/${PV}-branch-patchset.patch
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.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"
+
+	# 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_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-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=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_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-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.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
new file mode 100644
index 000000000000..8659742dfec1
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.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..12} )
+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"
+
+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 found at 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
+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=
+	dev-libs/libtasn1:=
+	>=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.5.4[egl(+)]
+	>=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
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=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:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	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 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	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
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+
+	# Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix
+	eapply "${FILESDIR}"/${PV}-branch-patchset.patch
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.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"
+
+	# 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_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
+		-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_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-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 "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"
+}
author	V3n3RiX <venerix@koprulu.sector>	2024-04-15 12:04:03 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-04-15 12:04:03 +0100
commit	7fa8a1e3f149eea4c844c47cfe26136ed7614c58 (patch)
tree	e514d1b9999d088064bee1e34a3a3c500d6d7a07 /net-libs
parent	d993571e2ee444d08f4e9e90d493ee37338657e3 (diff)