gentoo auto-resync : 29:07:2022 - 09:06:52

21 files changed, 558 insertions, 13 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9bdf65c81b96..5e36237b7f3e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index a420a65c1d75..cae9a492e380 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,5 @@
 DIST glib-networking-2.72.0.tar.xz 265060 BLAKE2B 2ffb25b059db40fcf9b65b104cd50d81dda9482bc75031d62c10f70eaaa2e9fcfcdfb2b718253255a2565d7b6bc9ead2214167d1b5f482c0ddd3af8573dd2ef5 SHA512 2b42aebcf496f51604005f6f3243ed7e613ab3d485742b7d8af10e103b07eefd8931cc86c1cb021889fe1415ad98bf4d877a3f33203cb53688cc2c41373a8ce4
 DIST glib-networking-2.72.1.tar.xz 265308 BLAKE2B 84264df5e094a4c57d86edd57fdedb11ad00eec5937eb056de34ec3d38a0e0e2ec3d71a5ad4ab0386c45681c8784b792ca6ded9c048d93c3ed1ad47d2f31f44e SHA512 243f54f4fbce40211f276c4f56e4e40507ecb0b23527a04b2d5bd67185c017f736f088c71ebf225e69e1ae8efa5b835edd68ea5c96df3ff69a25fd391e5c52d0
 EBUILD glib-networking-2.72.0-r1.ebuild 2004 BLAKE2B 7940597d2b326c67ce959273b033da365eb5f46825e837b02104947ec7557cd578b7b38605c495ed9fb89f8f0f827a64638a8f48846ae66965b61fb1dee9e470 SHA512 afdd73225c34ee65730ef93815a45de4787c8d42fab4212d4f24612c5935a43dd4980e421a6563efdd02b8089c737b507b43eaad30c98ef787b15a41a58401ec
-EBUILD glib-networking-2.72.1.ebuild 2011 BLAKE2B 7ceb8c79478b66938a3094d8b65e17a5ce6b418e00c637dc84c6af285fe9977f585950018d4394b12682e1f78daaf7a0d41e2e228adda7da114dc4b00929beb5 SHA512 30ec3fb8ae63bfe1e6ca2c996bb9a38101ff8dca165a94d3835c12ddebde27591ea42528cf275811a2b947a0c24dd53fae9faeaf75c0fc349f17b155f658b7ba
+EBUILD glib-networking-2.72.1.ebuild 2010 BLAKE2B eb855b92c86421f59bbe76919ef34496b444fdc17810b9d7c3fa994c364190e463672e2d27c87d1de97d8b6ea7427bc88f4cf7daf252155c16cdec6fc81115a6 SHA512 290514675fa320e84aeb90022d64ecd7be6294413cbec91eb036d8e1729f0733c8f1c82541d6a55808e1fa77a1c489fdc59acf1d2159b13a7ea287c685f072cd
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.72.1.ebuild b/net-libs/glib-networking/glib-networking-2.72.1.ebuild
index f5cb25001455..1d264a583567 100644
--- a/net-libs/glib-networking/glib-networking-2.72.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.72.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 8ce3b471c817..585e7a8106fb 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,7 @@
 DIST gnutls-3.7.6.tar.xz 6338276 BLAKE2B 9f3cce8dfc0b88f2c42d1d2633417dac649a265407b620b6d15967e5210debb99d287ef31d2b9dc37a527ac1e5b9db4c240b98a63293078fbd2e26ac694bf3d3 SHA512 f872339df80ec31d292821ff00eaafbe50e0bd4cdbb86e21e4f78541cd0a26d843596d5e69c91de4db8ce7d027fc639ae6462b57d89fb116162ae63c5a97486a
 DIST gnutls-3.7.6.tar.xz.sig 685 BLAKE2B eae022d6cb0d772e465257411381afd97f3dfd19d6f794a1c3e0f8c3c1232a8a1b91269ca7252a5662782183b11ca393c31efe3f88171a526884400fd0534528 SHA512 c969da9a938b9d29a70cea3b00cce337f9a4c4304aae7f501ef6263894f81a420395ddbe1b005f35dff2e900d3fac75e288f10bbfde0ebea034f7e257bb16d0e
+DIST gnutls-3.7.7.tar.xz 6351664 BLAKE2B a66037ecc6da660ff12949f50012840263c2e0b174079e41b62a2d884f060cee56f0c64a2815d07321a54b08cce016d2b4c8f0e059636c1ab5f7db9c8d64c7c6 SHA512 ba00b20126379ec7e96c6bfa606cfb7bb0d9a5853318b29b5278a42a85ae40d39d8442778938e1f165debcdb1adaf9c63bcec59a4eb3387dd1ac99b08bcc5c08
+DIST gnutls-3.7.7.tar.xz.sig 685 BLAKE2B 53d76a06ed5a74664d6c193459eb310f06e87dd3db97aca9e9fa78837677df58d8de66f187c182b9375786ee0308c5da55f08414183c959c7acb4527c38cd7c7 SHA512 6463bc4661e20051ff9f31c1a557cece34d06b748f4e24f98e807ddc72a3daa9348aa9f0afa83a0f9cd226421c575210eec1936fbeb9a55849e2c397ace9d03d
 EBUILD gnutls-3.7.6.ebuild 4767 BLAKE2B 06efaab9ed7e1fac0b84daf3c4c2574ec727e4dc4c3a8a1285db286d5e47e094f5ce22f57753362b9565bfd0b75a63cddffc7257127aeab6663bd75cbf4917e2 SHA512 2e882b0a30a000abbe1297ef1d48239ee59c7a97782d085418d39fa7ebab33fb2035e12aa555da57ce251399b0289ed8c3555b849e5b0e0ddbbb85bf597691bd
+EBUILD gnutls-3.7.7.ebuild 4776 BLAKE2B 0b9faccfc562c88bbadbd1909219fd75b3e298a7414d97a6e32b5b3fdf5256be10665f137efff740c29cf08afed2c6b02b8b725a903842c54a1cc0564154c0d0 SHA512 8fecdeccac71a720962c47f671aae5eb2c6fe7b0ff31c2b5371f6e5378453922c5fa4043a84b40b4de9a4b4fce84e046e7bd8ec9be54d960f7ec8569a750405c
 MISC metadata.xml 1336 BLAKE2B 9278a179b80a8613198cba0c9e03c3be3135aab13a85da638d4db582d93235177e46c02b1b71b9e3ee1dbbedc204c0393085147d0b15aa0d6a3fb5716a7ca834 SHA512 66564b03a0a39797c34945308b94065e66b1cc662ebeec80207bf4131f9fc62bf34d010ec22811acb2c98776f0f7cbebb29eaa8fd49351becab9901d46df6249
diff --git a/net-libs/gnutls/gnutls-3.7.7.ebuild b/net-libs/gnutls/gnutls-3.7.7.ebuild
new file mode 100644
index 000000000000..2257a4122b73
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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+"
+SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
+
+REQUIRED_USE="test-full? ( cxx dane doc examples guile 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}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	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-util/gtk-doc-am
+	>=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist(-)]
+		net-dialup/ppp
+		net-misc/socat
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20220320 )"
+
+DOCS=( README.md doc/certtool.cfg )
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug #520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# 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 )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && 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=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(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)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(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/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
index 38d5a69ef779..1e5ad77d9c9d 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,5 +1,5 @@
 DIST libdmapsharing-2.9.39.tar.gz 757492 BLAKE2B e9f47d793be05845d1afb6eb4a785cbd131ceac1e3146bdfb5c6914f584df2fb8db10b829447a6ac084e7a9e0576202485019b1e724cc033f11163fb1bb21b95 SHA512 7003b947e1982735b647c1fa8e7e80e05322acf4ed4b5c1c28708da00a0bfe3eecac01bc2ddf59966e7db045f14fc78e749a2859d7e909bcea41164939f15b4a
 DIST libdmapsharing-2.9.41.tar.gz 765880 BLAKE2B d64245ef6ffefb7a3f8b6c994e385427afe9b1aa22882da3f2fad82457fda6c48bea61314c6f4b8e82888284e98f4202338582dab2fd412c5e5cc96d7ff5f145 SHA512 304ba87428a39d2b9fd6d4cdc196f59e1aaf2ce3bb15f30acc2c9ca51ec8f86c9b499cf46cf938231e3088808475daba4fc55c44bcbef693be1b500dae4ab028
 EBUILD libdmapsharing-2.9.39.ebuild 1257 BLAKE2B 2418e6f216b1a5f74b9fb9bb254caf5531823384c0e26202faf9e73d1bb1386e744c6a26b1fdb3d56512d00f33c53f52e0070307c6ad5ae0bee3054cdb36a248 SHA512 b01affd992121e26e62fa288ec9bfb76e643ede5edcd3830d5c5d72d14d4e21ab938a33193ee45fa6e35960cfbef96f99f6e061d91a82e81a8e797e4b71ff597
-EBUILD libdmapsharing-2.9.41.ebuild 1252 BLAKE2B d56c8bf5d22bea4328952021e4c7b5914bb042e773868ad98cf940b4ca33b92f932425d2c46bfc84776c0bc31c6cf68cc17b9c2fded7fcea8ab8ec21596d2d49 SHA512 857491732664ad95de6dadd235c80828fb376b6332b918ea07ed4665d320c3faeed54421768f0b670570fef740d693dc2bd646b67b5c3f90b738ac221a68a933
+EBUILD libdmapsharing-2.9.41.ebuild 1251 BLAKE2B 4d03883ec0f45f7ae2a3c02cf4ff4b8c133e8f89d7629055c7e512bf0fd1ede64003b3247f08db9d6a256a22b32cde9e7f19830c31f38992a602d48538d32cea SHA512 77a87db370cca67fa6acad9c398fc07e24384879fd529d809361aa531ffd707637283625dbfa459a5cee4287adfdd99f33b63e387c244a810ddbad15a8bcb9eb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.41.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.41.ebuild
index d287c63b0e2a..0ca9ab752b1a 100644
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.41.ebuild
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.41.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.flyn.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="3.0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index d8670b0bfcfd..522f3a0e218a 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
 DIST libqmi-1.30.6.tar.xz 1242612 BLAKE2B 318af914b595f0442f7929be53c128dcd111e12913814bb52e683fff814b7aa00a32d40f8eae367db469a7adef6c146fb692d5908951cec4337f21e9a266a400 SHA512 6dc9819bb45063ea827b989e99e8e889db0ce6ebec62586003ea385bd54bd76f3e79d63e3f2b57e19da5f42ed87d7aa11aa024a805ec86a6b203981eb7922a76
 DIST libqmi-1.30.8.tar.xz 1244844 BLAKE2B c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1 SHA512 60567e82eb35ed7ab3d65f1073e19ca8faa68e909f96e498b8f9d8ce2a987156e0a580f9c212416c4e0740d2ad05cb93f4dfeae9b2d048f0eb53ab6a83f6d024
 EBUILD libqmi-1.30.6.ebuild 1242 BLAKE2B d4caeb7134774ebaf08147c555c1781a198f4923ddc28acfb0e0ba790050644ec86172b51a21c707800882135ce42fb9dd939bfae9a190f901e0b54d22883381 SHA512 e947b68dcb01bcedec37ede4d6dff4b0d79db06c192b5c0ba2b3f35d567a66ed6eca6cef84b0ea6ad0f79bba8c64dbdeaf80056b92cea4f4f661f6ad86927a5b
-EBUILD libqmi-1.30.8.ebuild 1274 BLAKE2B 59b385ed839554f7c1af5ddbf10039c9a7792eff43b035ab8618e34a77913ca148b01b120c51d2442a36c9d80c0263f4be19978bf07cdd67547b9edb3055f128 SHA512 9dda22b5dfb286317875902d46524edcde2df7c453f2aa2f743570e3521b96e56ffe8a8f254567fb6e611c0be4f7d06dfab00152a381ab304ccd24d76c91975b
+EBUILD libqmi-1.30.8.ebuild 1273 BLAKE2B 5da9493a535677aba9e375716426e5ff833020d4f598072ccf727b455f973eec14bc9dcbc876b293182bbc69f7cfd2c1fcc113932df60523f3b557c042ce48c1 SHA512 51d81f42272701623c162aaa6bbaba75254df28e6700c347f9a6d1f24a43a7e99e1b53f765c34550e6c553dc9d8036a5496790be261da379c103ec1fc5af0b1e
 EBUILD libqmi-9999.ebuild 1274 BLAKE2B 59b385ed839554f7c1af5ddbf10039c9a7792eff43b035ab8618e34a77913ca148b01b120c51d2442a36c9d80c0263f4be19978bf07cdd67547b9edb3055f128 SHA512 9dda22b5dfb286317875902d46524edcde2df7c453f2aa2f743570e3521b96e56ffe8a8f254567fb6e611c0be4f7d06dfab00152a381ab304ccd24d76c91975b
 MISC metadata.xml 491 BLAKE2B cbc6db0da5ce117f66475c8a20f1449f6bbb99f1717ac85d29285f6acb2ff7ecadeab7bc7dfa6aa1b5fa9c1a1f79ac5f4074a880cb5f90888f350c2979bb311d SHA512 cf7f4a7084246db2d968cd81a0b79d0f9e389977989912067c1b142e6dc25a9b1c1e6b0caf6038682a38a8d0273c0cfb087286ca5d92b117317d6e99c2858d1a
diff --git a/net-libs/libqmi/libqmi-1.30.8.ebuild b/net-libs/libqmi/libqmi-1.30.8.ebuild
index 56d9060d775c..f1cdfb14e1bb 100644
--- a/net-libs/libqmi/libqmi-1.30.8.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.8.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libqrtr-glib/Manifest b/net-libs/libqrtr-glib/Manifest
index 5737640f274f..de786b16f793 100644
--- a/net-libs/libqrtr-glib/Manifest
+++ b/net-libs/libqrtr-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libqrtr-glib-1.2.2.tar.bz2 26398 BLAKE2B e52cab3e4ac85c53a51782d7d6b3658060282f2e75e1ce2ff2e0c52dfb3343f5ba43c03f58c25eed73c2bc16254672a828318daae00bd2900ffda9ff23b38d27 SHA512 b21df1685c2474c1124e6f6bf12c552a06a28986284fde876210a3a6db8c19872a5458cae622bb22020ffd278167f52eba38d763ba633e783fa708863832bade
-EBUILD libqrtr-glib-1.2.2.ebuild 895 BLAKE2B dbccbd070596415ea07ddb58923d18e095ce054da7ffc8876523d75f814a56bd22518e4aab467508055925d4d56d1869d833e80c9da21ebddba0d5429d1a4362 SHA512 07cc6f2c1591858049306a41df9cf1755881492f3032a365024b9bf371c5b1990baa5cc74e22570559641b2f04da8197cdaa58bd1ae9049a601d167a0088346f
+EBUILD libqrtr-glib-1.2.2.ebuild 894 BLAKE2B 4a2eafcfb5cfd26b35bff5f3fe23b8a837753b724a0aba301ab5af8b92c83181ebbb7dbb4ec614c651bcf8ed6627cc248790b77dcc03852b5be81e0657d9d33c SHA512 7a0729d32760e700e66d81d41ede2da3f84f5092c354004734b219800fd4af718c0119152c582c624537568ee4363fa5988d22742fff6bd2215806e61da1787a
 MISC metadata.xml 327 BLAKE2B 1bc75a5f4160e28aa0824fb73a8a7ca267c66a371ad768101a5ab4654d4b02a82607be5ba20a2039bc0842932a43e2c77b9e350d509705457cc2921e9a30d49e SHA512 f11b8ad6e0ce009aeae86dafd556578f6dd2ebec9bbd71367c6c534880461de0bba4cc9f7cc69a77f521b9102f5629201ebccc87511a00aa1a2ab80057448c47
diff --git a/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
index e361d5ff82be..7a045907704c 100644
--- a/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
+++ b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/${PN}/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index da73c62df1b5..ccdacfe8c950 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,5 +1,9 @@
+DIST libtorrent-rasterbar-1.2.16.tar.gz 4163867 BLAKE2B 2cb4c79d83854bf3e5fc1b2ff9a361539b7690d0df3c2c15f2df1c7b9e782df51fbab57920a3bac56dff872c829a49303d66d33cdc10586ccc01dad3e83b149c SHA512 2bad1bf1604f99b85567056f798bfb78cdd663612291536d1145141e61f843aced416f7608911793c948d77802ef5b3088197b914c100a4278c94033eb304d4b
+DIST libtorrent-rasterbar-1.2.17.tar.gz 4167440 BLAKE2B 06e785e7ffa0e4f506b3f56f72bf5de96322ecc1d1ece542998b23412e72a73f230065c980cf2e86582b7d312b8623e22e3cd7b1974b44b287f95054e82c1513 SHA512 d2c702d8d942fb1e49e803f0684336bead40c219bf68764e193c34d335de03f0dcfb94f46d41447a7d95ec7063f314f64da0c385f3d5df310539b231063f6c0f
 DIST libtorrent-rasterbar-2.0.6.tar.gz 4431174 BLAKE2B 4951a102b68a5a7ba9a98d771ca638e8438b2aeaa95f5d7bf616542c7a02d28e184ee1bf5b7a55cd91a068cd2d4e9756c479e4ddb5eabe89d8aa833d70aa7502 SHA512 4a5d710706040ef6193967dbb13998cb0ddebe7e95c3bf8aec0812876027c68c32b001fd3f07cd4ff1b819660a8d46ae8c7077e72caf92572288a51cdec7daea
 DIST libtorrent-rasterbar-2.0.7.tar.gz 4453469 BLAKE2B b04884c55cb96031f6bfcef786ea101d18bb9310ec2e1ed528e27d8f625712855726575beae127f24c007144bb85e1eba293da748ad06794c58ebd9b38ec5aac SHA512 30e558245a261ccf3f23815a037477ae6da1a02da0b7b3aa40383058c5782a341a11ae684f959efc1c9b39e31475ec31451b9ff4b2db3c0bfccc4d42bd6d69c1
+EBUILD libtorrent-rasterbar-1.2.16.ebuild 1730 BLAKE2B b3247cc2c885eb9275df12778332bce3e4af294ef9af41fe84632adf8c435fa2b229ca6d43ab20ee83bc5dc991a63fdc32f565bb7348846db736abdb4e43b463 SHA512 9f4606ec105412f3e69be8f34f3b8f9c3f1248bb2abb01a7898bb0c071dcd367108d7caece087dee81997f09b184f00296db19d64f239537f894a5b4a69c9952
+EBUILD libtorrent-rasterbar-1.2.17.ebuild 1730 BLAKE2B b3247cc2c885eb9275df12778332bce3e4af294ef9af41fe84632adf8c435fa2b229ca6d43ab20ee83bc5dc991a63fdc32f565bb7348846db736abdb4e43b463 SHA512 9f4606ec105412f3e69be8f34f3b8f9c3f1248bb2abb01a7898bb0c071dcd367108d7caece087dee81997f09b184f00296db19d64f239537f894a5b4a69c9952
 EBUILD libtorrent-rasterbar-2.0.6.ebuild 1850 BLAKE2B 2b4fe24bef99ac335a888f653d4d2402e0cfeb919704931186354bb37fd29898b795672759e2811fc9035d7973d59b6fd9fce722aabe2f64bf458c7a1b799bb7 SHA512 28ce23d78b2f0bf91b4be1c21433971e47c1805feec0b9f0dd28eab906d30ee00495e1fa601e14fc291b89874bf16ab0afa29d57ea4e924b178720f264174e9f
-EBUILD libtorrent-rasterbar-2.0.7.ebuild 1851 BLAKE2B 3cefb7b25d67e46f6e1d1c2c6000c2fa2b321a029e5d5c7b74461cc2f7bdf457c256f36289d3a0ee24fa0d84e664079dd9b271c762726fb19cbb21537f088443 SHA512 dba82575180c909b129cd783537d0d874fc98f70524050492db397449672928382d4af804da71b4b0b690338ce051f615d5e77d79f12299fa6bd806eee17942f
+EBUILD libtorrent-rasterbar-2.0.7.ebuild 1900 BLAKE2B 255166d6ba24c8b118e716da3908540e98dd41ecf056e260b52eeb3108ea747a3e653e5b17f2d0f9e07e8470ad27457844cd1c1d8087b04b1aa6d2aa256941d3 SHA512 8a47dd87dac17d9c326753f6806ef39ac5353ba27318a98ece7d751de4007514f957352f8341e3090bba7a1a1ff1576c14265c2304df1abd51d2e6a83044584c
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild
new file mode 100644
index 000000000000..ee7e88d32406
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=[threads(+)]
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost[python,${PYTHON_USEDEP}]
+		')
+	)
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-Dbuild_examples=OFF
+		-Ddht=$(usex dht ON OFF)
+		-Dencryption=$(usex ssl ON OFF)
+		-Dlogging=$(usex debug ON OFF)
+		-Dpython-bindings=$(usex python ON OFF)
+		-Dbuild_tests=$(usex test ON OFF)
+	)
+
+	# We need to drop the . from the Python version to satisfy Boost's
+	# FindBoost.cmake module, bug #793038.
+	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Needs running UPnP server
+		-E "test_upnp"
+	)
+
+	# Checked out Fedora's test workarounds for inspiration
+	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.17.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.17.ebuild
new file mode 100644
index 000000000000..ee7e88d32406
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.17.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dht debug python ssl test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=[threads(+)]
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost[python,${PYTHON_USEDEP}]
+		')
+	)
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-Dbuild_examples=OFF
+		-Ddht=$(usex dht ON OFF)
+		-Dencryption=$(usex ssl ON OFF)
+		-Dlogging=$(usex debug ON OFF)
+		-Dpython-bindings=$(usex python ON OFF)
+		-Dbuild_tests=$(usex test ON OFF)
+	)
+
+	# We need to drop the . from the Python version to satisfy Boost's
+	# FindBoost.cmake module, bug #793038.
+	use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" )
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Needs running UPnP server
+		-E "test_upnp"
+	)
+
+	# Checked out Fedora's test workarounds for inspiration
+	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild
index 1e94d55e8111..2f3e3831c0b8 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild
@@ -70,5 +70,6 @@ src_test() {
 
 	# Checked out Fedora's test workarounds for inspiration
 	# https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
+	# -j1 for https://bugs.gentoo.org/854603#c1
+	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test -j1
 }
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index b86bed791d9f..d4aae7ff3211 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -7,4 +7,4 @@ AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.9-r3.ebuild 2132 BLAKE2B 64f1167fac712834d7f2fcff076fa2840cd2e2f402cc0e692f8c669a973ec470117eaab5d1636bd5994227612be49981b3f04c883f1b3ba922e2359f63ffa346 SHA512 b721894617c110e27a0b12dd068e57daee948165ab156dd794908c619d21affc8f460bdff56881c536b6efdb8ffc83c5ecb5935f73952cab1e7d3b5d265054ce
-MISC metadata.xml 412 BLAKE2B 0c84a591f559e156e38d074ebf645ae696371af6ed9bce2d844841059347653d18ffa6e96f92e92aab7ec95e7310a1a28e8a7ceb9ab562a6e2179e59bb9cd985 SHA512 1cde9c461ea2a3516c2aee1c7c8e7dd7e24b5cbc0d7d48a6443186f16083b869c7b6bfbeb7cf006af0ed90f3b85c911281f03a6a8ede92fdf5e04f51d8f0a73d
+MISC metadata.xml 488 BLAKE2B 2a257b013048d7a4cf82f818d72f7cd8538c608c3b64c1dcbd77d5a7c30845c3cdcf61339dc19f17f96bf3e4e5279c2d8828dc70eeded09855931a06a851a1d6 SHA512 111bfe8d5fc7538d0a7675c57e7324968a7caa8d1aa3c6bb30b66cbc3a2bd1dd6b45c533dda17d86bc83d8e82129d33271c02c2c5899d68ec8fcd3c0af68213c
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index 5480aa8168b5..176a6f49be32 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -9,4 +9,7 @@
 		<email>jsmolic@gentoo.org</email>
 		<name>Jakov Smolić</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">apache/serf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 1ca324fe4203..8872f5df594e 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,5 +1,5 @@
 DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee
 DIST uhttpmock-0.5.5.tar.bz2 47013 BLAKE2B 1b59801c13909525e05ec88f5ccfde1606cf427fc41896b14411344281046148bbe652162726aa643610bda447d04c64041a292b46838a3b98b849d670ce6909 SHA512 0fa6e03095c7b66ebd02736b95222b66e1232e5854839a352ee2ec59822ab027bdcf6c871b23433da46725a9807232b0b6bdd0c4cb8a59a23604787acd3d5f0f
 EBUILD uhttpmock-0.5.3.ebuild 951 BLAKE2B deebdde5fe5ea3bb4c52e702d7c31bc8b9ff4a02f8eb57c6fdd9e807b40703efb695db748857a5312e3a6c9709b3d29fb43995968f9548c4d2e3072deb8679e8 SHA512 0cef7db098128365115e38704fda13238d14d628873542945f5418de6d46bc68edc461c58b1ff5a6669d609716cbe458ff1b18169ac3ab9d7245d8f8a10908f1
-EBUILD uhttpmock-0.5.5.ebuild 972 BLAKE2B a1c94a62f2c49dac088e338d2a9da4bdb89e17b6861014d53bb0eb17f9d09313bf015cf30974a3bed936a1aa279b21f1f852fa048af7899cf184aceff7e378a6 SHA512 63ccd00a4c3437ce5dd48d979fdcdb35b29deb3a60bf1b81b39132a91f5fd4962e61de9710dd9dec0413d146fc608d757663705260e4e35c7dbd8cd44b8c72e4
+EBUILD uhttpmock-0.5.5.ebuild 971 BLAKE2B 433e62eb87999004c5ac8436c6857985cba3bd1f9cc52c67416c8fda0678cb17f141e484751073b92b335411f28a9554beb53325b555f32434ff3cbb69526aac SHA512 5392213dbcc2d5503de507b0a0875ecd51b25859cff5f66e48b51fa2089ba0691b398039b8578f1885f9f8716524f192ffa1cf39caec7b9b32375057027f08c6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.5.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.5.ebuild
index 5119b778510b..eaaca327cd6e 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.5.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.5.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="gtk-doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38.0:2
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5bae7ce06b39..16ff2c80132e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
 DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
+DIST webkitgtk-2.36.5.tar.xz 26602060 BLAKE2B 4a450356bb5e142f8c5c9d27433183532b7d3a2e451032cd837bf8a12ba58bd997eb4f2c6ff5ab37891af8485efb5d57aa02321448a93b0864c2a25b3b194cf8 SHA512 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545
 EBUILD webkit-gtk-2.36.3.ebuild 7409 BLAKE2B e2f941a57bb827f86ae95e98af0187b0a4a301402470165be293e03efd9cd96834866bf7c69eefe3369d26a7926afb6b5b46061362b166652dcf29e581f120c5 SHA512 3d6226815a55d0b67550c6a0a405f7f4442715c528ed653858b6152f61ac36db6c080e9eb44fc504d61830a84da56a265e6f6dd2abb38227d9ff752393bd2cc8
 EBUILD webkit-gtk-2.36.4.ebuild 7427 BLAKE2B 7ae6ba5a5657542bd4aa9ee4a4346f7dda2ec1e0e370292a2826d976eab629d4d437ba231c7ec68fd397a2203ed4dd20824ab512ab361e6d232f61c6faf9b626 SHA512 9dce5c9d7009b097febf480d6c61c7b22ba406bf07bb07c0e74f51bc9adb4e8f0ed0d3ccd4dffea5d7a91740342ddba016c4a4d1fc3ad3275d4f5b208c849249
+EBUILD webkit-gtk-2.36.5.ebuild 7431 BLAKE2B 448433c468ab5cd2ed5d7f3e052f884096f68b467c1a715d7e76cd0bebb070360ea6f9b448de55d38ef4249809ff330e3dd84ed79fb0c60ff68453a1f0e7984c SHA512 94decf9608f83c87d3d46bcbbf06659089e3518325b36610c2ee42d172064a868b23e9f5a6aca9b0e6661b819238eae4e231e64c67b5541fdcb201fc2fa4d882
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
new file mode 100644
index 000000000000..ac5ee1a431b0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}