gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /net-misc
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
78 files changed, 1473 insertions, 1205 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 63546fe53967..2dc843f2df8f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index cbadc0f86599..51fdf177ffd7 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,7 +5,9 @@ AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
+DIST apt-cacher-ng-debian-3.7.4-1.tar.gz 524480 BLAKE2B ebb450af29439910fe35a558ae6f7ea02337bfbbe5a8efcb20a803e779deedd7901358a71b69745a53036fb8db9db3c9112fc09b47055f07dfe225f3df95202d SHA512 a2aa3218d8cf216cef7177f30bfb90b9961460add2a90823e15952e38d19b0dd527e3cecd029bbf1f10abcfcfd11d406bc9019919d1efccf0d9d69bb7cc1a173
 DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792
 EBUILD apt-cacher-ng-3.6.3_p1-r2.ebuild 2614 BLAKE2B 1f02755ebf1c2c270ef3bc9c1c8f6f0aa0630d4045ddfed294493ece4a9c4f9926d3655a1fe6703eca2d7c80fea710a2cad5e1a28ef7e8cd2557b0f36dabd63d SHA512 b51821cdc6a2eb0eaa0c1b91a68dd48d2afae89bce14d50bfe3c74617a9039a5891897b5d32d5348b769f00882e36a25ef426ce2f03db8791ad4889738fbc087
+EBUILD apt-cacher-ng-3.7.4_p1-r1.ebuild 2695 BLAKE2B 88532a7170b10fd4460237ecc6d312235068c327ba947c62b73db73078ba1a44993cc5539bdb621e397c678643f71c9d786c45f82c9c3c5a6d19b0de4d695e55 SHA512 9b08de7e4afc2c813c87325cda9e6fd2567afd843a75a9dad1aaf600ec844859b21fc29b0f3150d84a475d8ff31b31c8eab9a60ab1a0cef625f2639e9bc2ef37
 EBUILD apt-cacher-ng-9999.ebuild 2571 BLAKE2B a10affa9280d6289bc7e6b64b4eb487be57de5e4339383c5d4620057c87192d156b7c29b2be0118124f0da408c9038a7ad9f2ea4c2d67d3ba4cdcc9902e86fad SHA512 6a68080dd1aae9ae441344bb1057aba4ff02839e058e8219d6551dc5c0f6cd90e1d9c79592424acdd85b2aa175a89ee0160f35d12f36a3740befbdca9149e37d
 MISC metadata.xml 388 BLAKE2B 5f7ddcd8cc39af27c73c68d4225cdea159ba54c45e54e20b384afe591c227ac4be20d818cf9b47a7d297326583b0b2d18855dc4176f37c36eb257e5c26810c1f SHA512 06d02f487d476a0f9c4aa387f64857b5d42d9ffb79ea451429b3464d9ec2de66243bfd8080848eed76af95350fcc36944c756326c2c54ed72824a0a0e1976f52
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild
new file mode 100644
index 000000000000..290c31128e2b
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake tmpfiles
+
+MY_PV="${PV/_p/-}"
+MY_P="${PN}-debian-${MY_PV}"
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html"
+SRC_URI="https://salsa.debian.org/blade/${PN}/-/archive/debian/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+DEPEND="acct-user/apt-cacher-ng
+	acct-group/apt-cacher-ng
+	app-arch/bzip2
+	dev-libs/libevent:=[threads]
+	dev-libs/openssl:0=
+	net-dns/c-ares:=
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:0 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.1-flags.patch"
+	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
+	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fixup systemd/CMakeLists.txt cmake version requirement
+	sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
+
+	# Make sure we install everything the same way it used to be after
+	# switching from mostly custom src_install to relying on build system
+	# installation
+	sed -e "/install/s/LIBDIR/CFGDIR/" \
+		-e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
+		-e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
+	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DHAVE_FUSE_25=$(usex fuse)"
+		"-DHAVE_LIBWRAP=$(usex tcpd)"
+		"-DSDINSTALL=$(usex systemd)"
+	)
+
+	cmake_src_configure
+
+	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	# README is a symlink to doc/README and README automatically gets
+	# installed, leading to a broken symlink installed. Fix this by removing
+	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
+	rm README || die
+	dodoc doc/README
+
+	newinitd "${FILESDIR}/initd-r3" "${PN}"
+	newconfd "${FILESDIR}/confd-r2" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" "${PN}"
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}/cron.daily" "${PN}"
+
+	# USE=fuse installs acngfs, don't install manpage without the bin
+	if use !fuse; then
+		rm doc/man/acngfs.8 || die
+	fi
+
+	if use !doc; then
+		rm -r doc/html || die
+	fi
+
+	dosbin scripts/expire-caller.pl
+
+	keepdir "/var/log/${PN}"
+	fowners -R ${PN}:${PN} "/var/log/${PN}"
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/net-misc/arpsponge/Manifest b/net-misc/arpsponge/Manifest
index 048be50fc0de..c6cd47515908 100644
--- a/net-misc/arpsponge/Manifest
+++ b/net-misc/arpsponge/Manifest
@@ -1,5 +1,5 @@
 AUX arpsponge.confd 285 BLAKE2B baf40857becaaf0060845c73dfe96040d1ea6d8383117b94bce246d7f257a75154a3dc0cd90b6f936e3d65a90e3c1e3f40f3c9babd940aab684f9be98156d5be SHA512 fc42640e5e5bfa155050ad289587a9e36909ab1043df210393d90437c22f7e1ecb72cdd7b9e61b1fc13e36f62c2ddac7677b57516b945352af08325090f8c0ca
 AUX arpsponge.initd 396 BLAKE2B bdf60346d600fd0d6f64d8d63d6056ec3b7684d15cc434a07c3845f5569b8b9b61cae3a166c77a4592184a4b20f5f0905c94eca193a35bf7d458db54f1bc23a9 SHA512 cbb775b632ca7e351322edcd1e3258cc45f5f617e3afa7797696756050aa5dc7a7a9abdb58a054f64c5fb3016f2792c017af838ab26462b8ade6c81c5fb40e17
 DIST arpsponge-3.17.11.tar.gz 103641 BLAKE2B 928ee848f0dc84304d5984ae8216fcc6d348deac03bb0e8e3178c27655d9b1550b426b58a4291c239b913e55316e8ad74519997c5b2a88783391e92e5c37c368 SHA512 70c5f16b568457ec1d88126f981d0c7cd0e85bff902dd3e4a33d9bff90475475231111ead583ded12e30301d185104e4b8119088d52a6c6091f2601822ca83f3
-EBUILD arpsponge-3.17.11.ebuild 1539 BLAKE2B c5a03fcb317203f0b3c87163c65d2740d1671334b9c99d76e93fe092994a5298d5deaeafe3ed7e79fd8392e59915a7ff966586c762b516f976b5bb54cf85fb97 SHA512 50ab37008210bcc645e598ee7c309017535e5463fda194293c34e35053fd87fb029dfb9910c4552a926b450aa320ef79bee1c667bfe1f8c2e1b03327182720c0
+EBUILD arpsponge-3.17.11-r1.ebuild 1555 BLAKE2B 9e45de49ac28406ad4f6d39267cfe8e92da24e0f000b18b908d7ec5ca723d9b33954aa0e469370e612af8916f4a44a0ab25639cff88adb6dcf39dc675bcda23d SHA512 919dfc77f5d150d6c6f34ff7fb6ece0410dd1e29d8c6a00e7b67a51f0960c27c508e8e71364e2cac6e5244cbe705b306b93c2bdbf526b4d0c558455b3b5d7752
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-misc/arpsponge/arpsponge-3.17.11.ebuild b/net-misc/arpsponge/arpsponge-3.17.11-r1.ebuild
index 5e23076d9806..e7e6ac97a607 100644
--- a/net-misc/arpsponge/arpsponge-3.17.11.ebuild
+++ b/net-misc/arpsponge/arpsponge-3.17.11-r1.ebuild
@@ -1,15 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit perl-module
 
 DESCRIPTION="Sweeps up stray ARP queries from a peering LAN"
 HOMEPAGE="https://github.com/AMS-IX/arpsponge"
 SRC_URI="https://github.com/AMS-IX/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
 KEYWORDS="~amd64"
+# bug #692912
+RESTRICT="test"
 
 RDEPEND="
 	dev-lang/perl
@@ -27,13 +31,11 @@ RDEPEND="
 	virtual/perl-Sys-Syslog
 	virtual/perl-Time-HiRes
 "
-
-DEPEND="${RDEPEND}
-	sys-devel/make
-"
+DEPEND="${RDEPEND}"
 
 src_install() {
 	perl_set_version
+
 	insinto ${VENDOR_LIB}/M6
 	doins lib/M6/ReadLine.pm
 
@@ -56,6 +58,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/arpsponge.initd" arpsponge
 	newconfd "${FILESDIR}/arpsponge.confd" arpsponge
+
 	dosbin sbin/asctl sbin/arpsponge sbin/aslogtail
 	doman man/asctl.8 man/arpsponge.8 man/aslogtail.8
 	dodoc doc/command_mapping.txt doc/arpsponge_architecture.txt
diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest
index 675a966892e8..5002b17e8134 100644
--- a/net-misc/clusterssh/Manifest
+++ b/net-misc/clusterssh/Manifest
@@ -1,4 +1,4 @@
 DIST App-ClusterSSH-4.16.tar.gz 96151 BLAKE2B c0b4ee36f42cb26853c264686fa6084133e0a75f9dba6e7233e341a2dedbb3c41642dd255bf6fa01b7285c9c3edd43485d3014b6d41957d6476382dcd00866a2 SHA512 3d4fc2aa681ea815020375bb3bb0f9a070e1638c5a4e38b1b279c58f9644a568bb687e0e611919afa48a32b44ff4e25cd5661c7d1330978f851bc506282f020e
-EBUILD clusterssh-4.16.ebuild 1229 BLAKE2B 1154bcf945c001fc872b7eb43f63649a4510e3c8b73c6514b1891c5b5a5036a80e8bceec01a83b249430bc7d193ea95621cc29bacaf2673f001d3833bc7c5e96 SHA512 2f3355c04002c5f892e3ef94bfbfcb06ee90205aa50cc423c3134e713f025b6cd76cadbdaf00641400f950d5a0cc5f713ab6a5fa6a9c639f1d48d60c228fbd8e
-EBUILD clusterssh-9999.ebuild 1231 BLAKE2B 32d8c9645d2e51879e2aea40fc8931966671fca1bc8608d01147990e85d8b876b3fc468e1626e30184556089f6165ffb1117ddede6f9cbec1e9879538713181e SHA512 577e581cd93e9e666b958f49269c819af4668f6afbd613ad3a5e93e5d2221dac2347a1b41278336aff733dc52865a1a2dea474b60f15972955a7391b64b13244
+EBUILD clusterssh-4.16.ebuild 1230 BLAKE2B f18b44d0ddea41cc775b89f0fcd74d8a802ade8baf7fabf1e573e187156aabdb49207a5050f6d3bb03ab33167ea3f74ce2a69fb6dffd29929940664fc8fd7ea6 SHA512 3c62f2f29c1ce626bb865d59ecc4d6622d23a4df22648faf5194a48a7b8bb01fc5ba786230ec152c75c43cb64618178917debe3134156f027d7d92047892cf69
+EBUILD clusterssh-9999.ebuild 1232 BLAKE2B ed4b262fd975e118af69039e61d1121c2c98ab7a8f7e4198086d2069642c10994f3df8f01b987b04799410dba605dfebf589bcb768491e08523a60660982bfea SHA512 59111944d2e6c444de0e7ddb036d8c756b0e6910abf27925909230f99b917b648d3ef3c5d71ec2669a6e298a484e2fb462b9b54cd7a1d18cf8695674d3481d2c
 MISC metadata.xml 969 BLAKE2B 7c844e13199afe65bf147d91606c7e733345c68d08b1a8538c45f1ccbdcda892c6a9330a6633d2b5efe007a9b2356d07e7189a0765a8321363aecf5228e3d877 SHA512 e0bbbf566f6360c79303d4c36dc5e894f60524e6aaa3fcfb8950e89c06371c6b627322591d76ef9aaf6c657884b6831e2bd15f684c396f30ba05e20d9a40be5b
diff --git a/net-misc/clusterssh/clusterssh-4.16.ebuild b/net-misc/clusterssh/clusterssh-4.16.ebuild
index c98759fb454f..5cde5cedf0cd 100644
--- a/net-misc/clusterssh/clusterssh-4.16.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.16.ebuild
@@ -5,20 +5,22 @@ EAPI=8
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
 HOMEPAGE="https://github.com/duncs/clusterssh"
+
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/duncs/clusterssh"
 	inherit git-r3
 else
-	DIST_AUTHOR="DUNCS"
-	DIST_NAME="App-ClusterSSH"
 	# Use dev-perl/Gentoo-PerlMod-Version to update this on bumps!
 	# DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION})
 	#DIST_VERSION="$(ver_cut 1-2)"
 	#die "|$(ver_cut 1-2)_$(ver_cut 3)|"
+	DIST_AUTHOR="DUNCS"
+	DIST_NAME="App-ClusterSSH"
 
 	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
+DIST_TEST="do parallel"
 inherit perl-module
 
 LICENSE="GPL-2"
@@ -51,5 +53,3 @@ BDEPEND="
 	dev-perl/Module-Build
 	dev-perl/Test-Differences
 	dev-perl/Test-Pod"
-
-SRC_TEST="do parallel"
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
index 7d85bec61967..7627c4d16310 100644
--- a/net-misc/clusterssh/clusterssh-9999.ebuild
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
 HOMEPAGE="https://github.com/duncs/clusterssh"
+
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/duncs/clusterssh"
 	inherit git-r3
 else
-	DIST_AUTHOR="DUNCS"
-	DIST_NAME="App-ClusterSSH"
 	# Use dev-perl/Gentoo-PerlMod-Version to update this on bumps!
 	# DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION})
 	#DIST_VERSION="$(ver_cut 1-2)"
 	#die "|$(ver_cut 1-2)_$(ver_cut 3)|"
+	DIST_AUTHOR="DUNCS"
+	DIST_NAME="App-ClusterSSH"
 
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
+DIST_TEST="do parallel"
 inherit perl-module
 
 LICENSE="GPL-2"
@@ -51,5 +53,3 @@ BDEPEND="
 	dev-perl/Module-Build
 	dev-perl/Test-Differences
 	dev-perl/Test-Pod"
-
-SRC_TEST="do parallel"
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 17bfaad5d167..b6fb28643ef9 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,23 +1,16 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-7.82.0-certs-processing.patch 853 BLAKE2B 5e05d6f31a93fd81ee597d88c1adeef97ac805befd2615044ad09d41c4b8c8b69f0689b21c2765c547c1dffa695d18791ee4c9301ae9b9e873621fd74eb6107a SHA512 839f262bec4b3730810a3cc849b571c1f7b9482d1c6f37fed9f56e7c3ccf1e07c0eb91bdf973846162bd0e259973e5dc90581db0a9cc7a808924948894437890
 AUX curl-7.83.0-http2.patch 1109 BLAKE2B f1cfcbcd68e046151e5d61c3d95e92cfdec9e412bc51375f08fcb7af508cea19fe48aabdd817949ecde61f9d6ba10d4051f3fe418ce7ca73326847e4bc6b4b04 SHA512 e98eb9129929bd00b1c8387da3668689b4da77b9641761766cf02f28909da5bad8bd506b59b5ce4cd066262a08341d2fa1d39803233c832e998be9a84ecbcab2
+AUX curl-7.84.0-easylock.patch 856 BLAKE2B a77854a75a06ad66ef4dc7d6a2555fe2678f4bfd170e961c35e5ad2a82a62891d125ead2d15a311e2a8951404732c755a03636dd4bf4dd3ad16e8bf32ff4f7ca SHA512 7b94f941577d5b0a240e4e879a7e4c659dbdd4ff50d67465bd1a0adf30f5e37a0af7f15b71810feb05d19b833359b069f86aa3ac4c396fd8ba8ed2012b60fb8f
+AUX curl-7.84.0-include-sched.patch 625 BLAKE2B 8c7ecdbc8ffd7cafac915c2d12db1ea98acbd166f18eba538ecd4666152653c36784569f1945b095480120c61124573b094e26ce26c8b85f62baedb40e20d758 SHA512 4be64eff67e56c2584f6c9ee0c9c7b7aca55fc15c8d4be6f9f79da9bb3c1bb1532bcb80eb4f87be2db1058dd41a32e366bfe83988d28b4b263fbb6679b5ec806
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
 DIST curl-7.79.1.tar.xz.asc 488 BLAKE2B cf1864b15ee4b47a61a03968c4fd9526d4c8d0c5a8a0a1357de61758640e6dfda57334df1e63afd94c0064b7e61527623dd20446b27fa0130e0bf92c647d9820 SHA512 4f7930fde0a21358cf0bd8d5cbde5a05efc34202265b4744e59f49d9dc269987f47b4ead77c33e2ae03acabd7b6d6a731c69b91999eea70542f49d9ea0c2ba94
-DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab
-DIST curl-7.80.0.tar.xz.asc 488 BLAKE2B 5cde8a91059bb19b9ee9b1aa4c3225522398a0d5837edf3d99b7f9ea758e5df2a729ce1d0a9763967c2319c30d94ba80ff50888dec07665a818216d42b91feee SHA512 e11adb85fb061bba8838f435f6afb200924f24cb7351d9a8208ec3d317d8ef8c1e16f06dedfc623acc749931015c42dcd86236a53602c6632b3a750841345b05
-DIST curl-7.81.0.tar.xz 2486388 BLAKE2B bf8a3a03564648a9d7a5b4e7a523d840230f03237cf9eb5b07dcb4f531b036eb8111c1944bedd0c1df188e09a09468b3487d24ea50781124bc33d194546691f4 SHA512 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df
-DIST curl-7.81.0.tar.xz.asc 488 BLAKE2B 9280f10b14ddd95a1405fda79f8c51528c91c5e86b8f90d16d20d7f11d212e6e4391377eed971d0b0b27f5f4692c702e9d7a11705f0558ad39df38608d6a0648 SHA512 ca32a639900a9f8211005227dfb594f809c5ca5ec1eb87e944ef33cca60e4844f5b6ebe49de79fba53068e5dee9652b1d43a7d3a74e05419a2ffb5b40dab8176
-DIST curl-7.82.0.tar.xz 2446764 BLAKE2B 838accae4a45c090909cff91477a023789a79535691c80e507fd9e9712861b0c08e25ecd26079cb8ac8946cdf429a50991a7521e7b550b43c19e455625bc0750 SHA512 a977d69360d1793f8872096a21f5c0271e7ad145cd69ad45f4056a0657772f0f298b04bdb41aefd4ea5c4478352c60d80b5a118642280a07a7198aa80ffb1d57
-DIST curl-7.82.0.tar.xz.asc 488 BLAKE2B 9da4ea63671621df956aa5dc191cfc6c8d2a8b1958416ca58ffc04d43ed65b89244968588879e6bd3299ca8f60b1eccb34dede012f8a2a37acf3ca34021da958 SHA512 1f14d8ab55360ba735dff916369ee318e98767718394654ce9443b6013509b6d3ed5597685b142e9823cec7496373b709a8656515d66039c06783879655151fe
-DIST curl-7.83.0.tar.xz 2472560 BLAKE2B 0669f40265a56e7549e8038ed8421680d7264bff44dcc0692cf9f5248621311be5e228314710149bf9d2ccbe739f929039e04402c1d04a1362d0bbf08cb8cdc7 SHA512 be02bb2a8a3140eff3a9046f27cd4f872ed9ddaa644af49e56e5ef7dfec84a15b01db133469269437cddc937eda73953fa8c51bb758f7e98873822cd2290d3a9
-DIST curl-7.83.0.tar.xz.asc 488 BLAKE2B a8f6dcf00f1b01b457a7eecc8364538393f414df60757f3664709c62b6007023a34ddf4ecb4688734e396031d30905b490dd0c115f09a9428db6a6be97cdf72c SHA512 8fb90f9692f4fdb82ea49f0e5151219b2334da5d3910f28e787bb688fb055b8b028ccf75cdcc15cd9f86d780d479f88f902fef7d7b9e007a4b849cb25c6c13cc
 DIST curl-7.83.1.tar.xz 2474940 BLAKE2B 491427b12f082c2246ef6cb2a129340079db28bd93b4381889e7328bef1d61a79bb57cba4b8372759baa4f6e77644966ed95cfa8f839ee9db634786757fb1ce0 SHA512 2f63327d6d3687ba36fb7b8d5d3d15599eca33ebfb08681613612ea9c4b629d3b6ce4d2742fa1ebd7a997ed332001d3a4c798985f9277c83b9e7a9aecdb1b1ee
 DIST curl-7.83.1.tar.xz.asc 488 BLAKE2B 78f7a6d9a32cab97e9ce26430eb2be2bc4e20552cf8c59238f30f127e9d7af5b4f9808c3fe0846c18c8f7a67b49f2f75d865d17b7760bb664872934799949441 SHA512 f0d29de315488c844eb81ed5a89ed6334910970224c8cac43e7e6f2d58c35ad0064c0b6122e69b3a34ce91f4b56873c63e2e8aea1c602ef40711bfd62a01b191
+DIST curl-7.84.0.tar.xz 2477944 BLAKE2B 811a63285f39a598bc4fd73ae4b8e23e5146b93dcf3eea805345792b7dddd85bbd54240d9871a0dc9f058d58fd7ea7f4efbcb82727218e8afaaae3600bad55e1 SHA512 86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce
+DIST curl-7.84.0.tar.xz.asc 488 BLAKE2B d74dea89fa89b6ed0a928e01987669f7dde0bcbb30423ea0f3af9f31eea1e059d458629d80455d772264d744fab236d4f506545afa1bfbd6ded7e2b27192a7c8 SHA512 80ff5274277ad97448fa53511bab6e8a1c302bcb25fc0916d78b8dc6c6af43d944c37c4ed46668b651cc639ec4964780725117ca0e85168ea66ad7cc98d29702
 EBUILD curl-7.79.1-r1.ebuild 8166 BLAKE2B 69d521028d1ff2d37b270539c8ad37a8033923d60ad057a347b843587a035c0afb829361fb605ef4186243657bef6a94156e493321161c62d16ecc2b4a73d0f0 SHA512 05ef78d4080f609ff1a5deb191d1d7d09ddfe58c617cd8688c231c4e71268784ebc9c2eee1a5a023488868d23b15db7b04718e6e7a3b4dbe17ac9880eeaa1eb9
-EBUILD curl-7.80.0-r1.ebuild 7715 BLAKE2B 13c87739394cb6a67ba281c62ff526f90cf1a569bb1efde7062b7c68ed778df5a21cde4539fce35e9585121618db7bafa57546b3bbdd9f7db0e9449284ab2ad0 SHA512 e7f91f01ff332f7a72aeceed4f739da7b8d950ca0574e541c4992e9a254168102d3337c09d18748ae326b20cb64d6eee78bdc672ef4497b5a925aa7f1d475f1f
-EBUILD curl-7.81.0-r1.ebuild 7715 BLAKE2B 43b427e5dcc240c051bfb8e01d876af9b1cf73a6016035893bc3024d7ceccfd72615bd327f5898a58ddd6c772953d7d2a30613cb70bca92cdbdf904bd6782ab2 SHA512 b76b11e4cae0026c4a887218be05dc49ec261e493891183dec84d07f1238437a12598a9db7ddf20731b69564479e1da2278457f41990ddd1d4da5a20deed9c31
-EBUILD curl-7.82.0-r2.ebuild 7787 BLAKE2B ce60b96c42b3803fd2bf8d55dba99267ce8ac34796bbdd93217e5e767aa4ab0e5bde123e8dab78ce5fa4dcdcbf7887fe9a16171dce06f30125acccf8b38048b7 SHA512 65c6d9765a799e28bdb32e35831c6de269758f2058aef9927b434de9ab6bb91e3db55225d7c7606099db8395e6997a3ca0c4d02e48b029851eea6edbeef43ba1
-EBUILD curl-7.83.0.ebuild 8371 BLAKE2B ff1769914582fea62d02521d4e9bf858151a6c4f4fd9460eefd88c8161dfec5ea1e4433044af508d022018c0428151f6fc5b032e99cbdf278690601ce9f01b2a SHA512 fd1f368701c446ef3c4c8e79b1fa5734ab618923b702d56dccfaef911ccb1d2ebf37398677e6c150e97496f683bf3bc39e36fab5afcc71b785730527dec4fc77
 EBUILD curl-7.83.1.ebuild 8274 BLAKE2B b9f06416a4b68a17616c90d91be3a629020110aaa7c3d9caac79937c3606982f0c28d4fe8a798311cdf623e62455d4c6aa8708faff46bb1805ed2a514bf014d9 SHA512 77992858391e805764c4b5b9eccff0e87465def7eeb105151e5a5754270d29e5e815d4239f90c6543dcad90dccac46cae843194e278ea8335aa1669a8deff4c8
+EBUILD curl-7.84.0.ebuild 8365 BLAKE2B 60758e9c23ab94612542434e0adb6602602128e455aff50c8f9da2cbdb58e27fa396bfd0011a3c461ac519e6faa25712ec80351bad3b45a7faf758aefdcbade6 SHA512 9d53b069da866f1acf875ee8615a11c8e0d5f8a88011f85ab7c8ec6e301de0d693df09d265670f0ae758aac5b923bd02a79ee0beffe5bc1454830ac876d1a652
 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
diff --git a/net-misc/curl/curl-7.80.0-r1.ebuild b/net-misc/curl/curl-7.80.0-r1.ebuild
deleted file mode 100644
index f1c2d6838600..000000000000
--- a/net-misc/curl/curl-7.80.0-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
-	verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
-IUSE+=" nghttp3 quiche"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-		)
-	)"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		openssl? (
-			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	#myconf+=( --without-default-ssl-backend )
-	if use ssl ; then
-		if use gnutls || use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		fi
-		if use mbedtls || use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use nss || use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use openssl || use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-
-		if use curl_ssl_gnutls; then
-			einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		elif use curl_ssl_openssl; then
-			einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-crypto-auth
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		--disable-ntlm-wb
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		$(use_enable ipv6)
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--disable-sspi
-		$(use_enable static-libs static)
-		$(use_enable threads threaded-resolver)
-		$(use_enable threads pthreads)
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--without-fish-functions-dir
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		--without-libpsl
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		$(use_with quiche)
-		$(use_with rtmp librtmp)
-		--without-rustls
-		--without-schannel
-		--without-secure-transport
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.81.0-r1.ebuild b/net-misc/curl/curl-7.81.0-r1.ebuild
deleted file mode 100644
index e47b2c09b3db..000000000000
--- a/net-misc/curl/curl-7.81.0-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
-	verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
-IUSE+=" nghttp3 quiche"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-		)
-	)"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		openssl? (
-			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	#myconf+=( --without-default-ssl-backend )
-	if use ssl ; then
-		if use gnutls || use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		fi
-		if use mbedtls || use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use nss || use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use openssl || use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-
-		if use curl_ssl_gnutls; then
-			einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		elif use curl_ssl_openssl; then
-			einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-crypto-auth
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		--disable-ntlm-wb
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		$(use_enable ipv6)
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--disable-sspi
-		$(use_enable static-libs static)
-		$(use_enable threads threaded-resolver)
-		$(use_enable threads pthreads)
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--without-fish-functions-dir
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		--without-libpsl
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		$(use_with quiche)
-		$(use_with rtmp librtmp)
-		--without-rustls
-		--without-schannel
-		--without-secure-transport
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.82.0-r2.ebuild b/net-misc/curl/curl-7.82.0-r2.ebuild
deleted file mode 100644
index e4a7ea60d92d..000000000000
--- a/net-misc/curl/curl-7.82.0-r2.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools prefix multilib-minimal verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
-	verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
-
-LICENSE="curl"
-SLOT="0"
-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="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
-IUSE+=" nghttp3 quiche"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-		)
-	)"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		openssl? (
-			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${P}-certs-processing.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	#myconf+=( --without-default-ssl-backend )
-	if use ssl ; then
-		if use gnutls || use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		fi
-		if use mbedtls || use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use nss || use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss --with-nss-deprecated )
-		fi
-		if use openssl || use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-
-		if use curl_ssl_gnutls; then
-			einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		elif use curl_ssl_openssl; then
-			einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-crypto-auth
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		--disable-ntlm-wb
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		$(use_enable ipv6)
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--disable-sspi
-		$(use_enable static-libs static)
-		$(use_enable threads threaded-resolver)
-		$(use_enable threads pthreads)
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--without-fish-functions-dir
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		--without-libpsl
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		$(use_with quiche)
-		$(use_with rtmp librtmp)
-		--without-rustls
-		--without-schannel
-		--without-secure-transport
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.83.0.ebuild b/net-misc/curl/curl-7.84.0.ebuild
index 041b6cd5a2e4..645a223aed8f 100644
--- a/net-misc/curl/curl-7.83.0.ebuild
+++ b/net-misc/curl/curl-7.84.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
 
 LICENSE="curl"
 SLOT="0"
-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"
+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="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
 IUSE+=" nghttp3 quiche"
@@ -95,9 +95,9 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-7.84.0-easylock.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	# Bug 842780, fixed upstream, drop on next version bump
-	"${FILESDIR}"/${P}-http2.patch
+	"${FILESDIR}"/${PN}-7.84.0-include-sched.patch
 )
 
 src_prepare() {
diff --git a/net-misc/curl/files/curl-7.84.0-easylock.patch b/net-misc/curl/files/curl-7.84.0-easylock.patch
new file mode 100644
index 000000000000..77ee610fc117
--- /dev/null
+++ b/net-misc/curl/files/curl-7.84.0-easylock.patch
@@ -0,0 +1,30 @@
+From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Tue, 28 Jun 2022 09:00:25 +0200
+Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool
+
+To work with more compilers without requiring separate libs to
+link. Like with gcc-12 for RISC-V on Linux.
+
+Reported-by: Adam Sampson
+Fixes #9055
+Closes #9061
+---
+ lib/easy_lock.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/easy_lock.h b/lib/easy_lock.h
+index 07c85c5ffdd19..9c11bc50c5f20 100644
+--- a/lib/easy_lock.h
++++ b/lib/easy_lock.h
+@@ -40,8 +40,8 @@
+ #include <sched.h>
+ #endif
+ 
+-#define curl_simple_lock atomic_bool
+-#define CURL_SIMPLE_LOCK_INIT false
++#define curl_simple_lock atomic_int
++#define CURL_SIMPLE_LOCK_INIT 0
+ 
+ static inline void curl_simple_lock_lock(curl_simple_lock *lock)
+ {
diff --git a/net-misc/curl/files/curl-7.84.0-include-sched.patch b/net-misc/curl/files/curl-7.84.0-include-sched.patch
new file mode 100644
index 000000000000..842310d2eaab
--- /dev/null
+++ b/net-misc/curl/files/curl-7.84.0-include-sched.patch
@@ -0,0 +1,24 @@
+https://github.com/curl/curl/commit/e2e7f54b7bea521fa8373095d0f43261a720cda0
+https://bugs.gentoo.org/855710
+
+From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 27 Jun 2022 08:46:21 +0200
+Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
+
+Patched-by: Harry Sintonen
+
+Closes #9054
+--- a/lib/easy_lock.h
++++ b/lib/easy_lock.h
+@@ -36,6 +36,9 @@
+ 
+ #elif defined (HAVE_ATOMIC)
+ #include <stdatomic.h>
++#if defined(HAVE_SCHED_YIELD)
++#include <sched.h>
++#endif
+ 
+ #define curl_simple_lock atomic_bool
+ #define CURL_SIMPLE_LOCK_INIT false
+
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 793795c7b771..0b18ebf6f5d2 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -1,4 +1,5 @@
 AUX dahdi-autoconf.conf2 1067 BLAKE2B f6c64135e4b47ce3eafd4b79b4e02ea8bc4d46ab36e30203cf061a5541fc2bdc9bdb2bf6050bc36c8d1e1b5f2ba07f72e83037eccd86ead45fdc97e8a4a3d767 SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a
+AUX dahdi-autoconf.init-3.1.0-r3 6674 BLAKE2B 08e9309034faea3f97ce9c82fbc79b88cafc6ca07fcf9c5f555e815fd13191c6287b0b85896cc7fe3e10fc4e5de29dfa2737313ebdc51b1e1dd9e98bff409fcb SHA512 d2990903350b1275777bcbd0e1c5e38630aca7627d73b2741aaec7ddc055c96ff7d7adc4c55f578cc0fd8f693f6927b4d77f7db7f273f89ba99a9326cf41b1a0
 AUX dahdi-autoconf.init2 5817 BLAKE2B c8186a6ff1188ed1d91b86db2b6e861297b5927c7a2cc95a95eb656d4149f2d01c2d8b91412e440f76e9fcb3ff530aef00dae04c38763bd84575cadecdfe2692 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d
 AUX dahdi-nondigium-blacklist.patch 507 BLAKE2B 5cd8264cfb6792db5fdb92b32dad33a224defb876807d260fbef9f72b943f56f8415a7f082752e261c03982c6b016fe1ce8034d98c6a1aac4cfee7c9d50b3ddb SHA512 4fdb4933e05e07812d1a94efb9bda9038aaadb8a1830cb9ba99d62346f2d007e827771f8de144ef09d6ee5adb1a571ca5ef8ae646c7f62bde8232af30468c2ac
 AUX dahdi-tools-3.1.0-cplusplusexternc.patch 695 BLAKE2B 8b3cbe872786017759d11bf5d23e6eb41de29003e047ab7244188e0603df6ea669b870216e15cdf4c77a41f7b4f5d10169853aaf839b6dc4d491c0a23121924b SHA512 eecfdb73558b8f4ea8b5ffb55ced8f863960cb1ee92196995ca69e30df4a55f07f59a0b429cfad40271b71b585130438b11861d3459fab87f02ced7032f57ded
@@ -8,4 +9,5 @@ AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c8
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
 EBUILD dahdi-tools-3.1.0-r2.ebuild 2152 BLAKE2B 2c84f625ba1d41d43a69841c8d4dcbe898e1f5c54c54b0a554b3e382c0861fa97b4d027fb63b1b4e4ae2fa7b32dd81389554af2cab3cedfad0c68c2288748537 SHA512 b4e76d483b67390b1a889d868118093d2d5db443d80ded95c0a3424b478a16da934b3911fa451ae7fca380f3a76fad6b821f2ca9ba91f87b27869f15d14b486c
+EBUILD dahdi-tools-3.1.0-r3.ebuild 2162 BLAKE2B dfc90c8ccdaf62e2456717aec490bf5248955149a7af8e7f7523349337ec9f8b2dedfa6ff4d7a830ac8180f2e53b0e056565972d170cd779872853639d9c29de SHA512 664ef6000fa11a95f7dfcad22cb7570603a46691e5a7ad7b7e869114f149fe93f73f39b84f97fa83ac260719aa2da342aa02720ab9457dbadb6425d554f8cbdb
 MISC metadata.xml 474 BLAKE2B 05062875e00c015c39cce4432a8197606dcbe1d40efb3058843c05defedd04304581a449b7a1abeb37ac96c5e6c9559ef9b36f7cbe1123783cc1822a25c5ee78 SHA512 bd60b375dd7863a16f525eb82c7c97d2a93032a93963ab764523fb774692b2ad107cb69eab4eacc695d67316307b91bac8e299a9c3d2689894d9dc174516c2a7
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r3.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r3.ebuild
new file mode 100644
index 000000000000..4cdea940512c
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 perl-functions udev
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="ppp"
+PATCHES=(
+	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
+	"${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
+	"${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch"
+	"${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
+	"${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
+)
+
+DEPEND="dev-libs/newt
+	net-misc/dahdi
+	sys-kernel/linux-headers
+	virtual/libusb:0
+	ppp? ( net-dialup/ppp:= )"
+RDEPEND="${DEPEND}
+	dev-lang/perl:=
+	dev-perl/CGI"
+BDEPEND="dev-lang/perl
+	sys-apps/file"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
+	sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed."
+	sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed."
+}
+
+src_install() {
+	local bashcompdir="$(get_bashcompdir)"
+	local bashcmd bashcmdtarget
+
+	emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install
+	emake DESTDIR="${ED}" install-config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r3 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+
+	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
+		die "Error parsing dahdi bash completion file for commands")
+
+	rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install."
+	# Delete *if* the libtool file exists, bug #778380
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r3 b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r3
new file mode 100644
index 000000000000..3841aca8d18a
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r3
@@ -0,0 +1,271 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Ultimate Linux Solutions CC
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before dahdi
+}
+
+dahdi_load_modules() {
+	local hwlist loc status mod mod_vname pciid desc
+
+	hwlist=$(/usr/sbin/dahdi_hardware)
+
+	if [ -z "${hwlist}" ]; then
+		einfo "No digium hardware found."
+		ebegin "Loading module dahdi_dummy"
+		/sbin/modprobe dahdi_dummy
+		eend $?
+		return
+	fi
+
+	echo "${hwlist}" | while read loc mod pciid desc; do
+		status="${mod:${#mod}-1:1}"
+		mod="${mod%[+-]}"
+		mod_vname="mod_${mod}"
+
+		einfo "Found $desc at $loc (module: $mod)"
+
+		if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
+			ebegin "Loading module $mod"
+			/sbin/modprobe $mod
+			eend
+
+			[ $? -eq 0 ] && eval "$mod_vname=loaded"
+		fi
+	done
+}
+
+dahdi_module_unload() {
+	local mod=$1 s
+	[ -d /sys/module/${mod} ] || return 0
+
+	for s in $(find /sys/module/${mod}/holders -type l); do
+		dahdi_module_unload $(basename $s)
+	done
+
+	ebegin "Removing dahdi module: $mod"
+	/sbin/rmmod $mod
+	eend $?
+}
+
+dahdi_gen_fxo_config() {
+	local port=$1
+
+	echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
+	[ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
+}
+
+dahdi_gen_fxs_config() {
+	local port=$1
+
+	echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
+	[ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
+}
+
+dahdi_gen_bri_te_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
+	echo "bchan=${basechan}-$(( basechan + 1 ))"
+	echo "hardhdlc=$(( basechan + 2 ))"
+	[ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
+}
+
+dahdi_gen_bri_nt_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
+	echo "bchan=${basechan}-$(( basechan + 1 ))"
+	echo "hardhdlc=$(( basechan + 2 ))"
+	[ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
+}
+
+dahdi_gen_e1_cpe_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 15 ))"
+	[ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_gen_e1_net_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 15 ))"
+	[ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_gen_t1_cpe_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},${port},0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}"
+	bchans="${basechan}-$(( basechan + 22 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 23 ))"
+	[ "${DAHDI_T1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_gen_t1_net_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}"
+	bchans="${basechan}-$(( basechan + 22 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 23 ))"
+	[ "${DAHDI_T1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_conf_span() {
+	local span=$1
+	local type=$2
+	local desc=$3
+	local port=$4
+	local basechan=$5
+	local vname="PRI_SPAN_${span}_NET"
+	local cfunc="dahdi_gen_"
+
+	# Analog we need to deal with on a port-by-port basis.
+	[ "${type}" = "analog" ] && return 0
+
+	echo ""
+	echo "# ${desc}"
+
+	case "${type}" in
+		digital-TE)
+			cfunc+="bri_te"
+		;;
+		digital-NT)
+			cfunc+="bri_nt"
+		;;
+		digital-[TE]1)
+			cfunc+="$(echo "${type##*-}" | tr 'TE' 'te')"
+			# Use CPE by default.  Unfortunately there is no easy
+			# way to detect CPE vs NET as far as I know and specifying
+			# in a config that you want NET mode seems the sanest way.
+			if yesno "${vname}"; then
+				cfunc+="_net"
+			else
+				cfunc+="_cpe"
+			fi
+		;;
+		*)
+			echo "# Don't know how to configure this (type=${type})."
+			echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
+			return 1
+		;;
+	esac
+
+	"${cfunc}_config" "${span}" "${port}" "${basechan}"
+}
+
+dahdi_gen_config() {
+	local type manufacturer devicetype basechan aport atype
+	local span=
+	local tfile="$(mktemp)"
+	local sfile="$(mktemp)"
+	local plocation=""
+	local isdnport=0
+
+	/usr/sbin/dahdi_scan > "${sfile}" 
+	exec 3<"${sfile}"
+	exec 4>"${tfile}"
+
+	echo "# Automatically dahdi-autoconf generated file ($(date))." >&4
+	echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >&4
+
+	while read LINE <&3; do
+		case "$LINE" in
+			\[*\])
+				if [ -n "${span}" ]; then
+					ebegin "Configuring ${manufacturer} ${devicetype} (${name})"
+					dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4
+					eend $?
+				fi
+				span="${LINE%?}"
+				span="${span#?}"
+			;;
+			type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
+				eval "${LINE%%=*}='${LINE#*=}'"
+			;;
+			location=*)
+				eval "${LINE%%=*}='${LINE#*=}'"
+				if [ "${location}" = "${plocation}" ]; then
+					isdnport=$(( isdnport + 1 ))
+				else
+					plocation="${location}"
+					isdnport=1
+				fi
+			;;
+			port=*)
+				# For analog cards only.
+				aport="${LINE#*=}"; aport="${aport%,*}"
+				atype="${LINE#*,}"
+				if [ "${aport}" -eq "${basechan}" ]; then
+					echo "" >&4
+					echo "# ${manufacturer} ${devicetype} (${name})" >&4
+				fi
+				case "${atype}" in
+					FXO)
+						dahdi_gen_fxo_config $aport >&4
+					;;
+					FXS)
+						dahdi_gen_fxs_config $aport >&4
+					;;
+				esac
+			;;
+		esac
+	done
+	
+	if [ -n "${span}" ]; then
+		ebegin "Configuring ${manufacturer} ${devicetype} (${name})"
+		dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4
+		eend $?
+	fi
+
+	echo "" >&4
+	echo "loadzone = ${DAHDI_ZONE}" >&4
+	echo "defaultzone = ${DAHDI_ZONE}" >&4
+	echo "## END OF AUTOCONFIGURED FILE ##" >&4
+
+	exec 3<&-
+	exec 4<&-
+
+	rm -f "${sfile}"
+	[ -r /etc/dahdi/system.conf ] && mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
+	mv "${tfile}" /etc/dahdi/system.conf
+}
+
+start() {
+	dahdi_load_modules
+
+	if [ ! -r /dev/dahdi/ctl ]; then
+		eerror "No DAHDI compatible cards detected."
+		return 1
+	fi
+
+	ebegin "Generating DAHDI Configuration"
+	dahdi_gen_config
+	eend $?
+}
+
+stop() {
+	dahdi_module_unload dahdi
+}
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index cd7c014873e6..73d1656bc37d 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -16,9 +16,10 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43
 DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
-DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
+DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157
 DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
+DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
-EBUILD dahdi-3.1.0-r2.ebuild 4797 BLAKE2B 0678c138c04c0d18e7b1220150615cc19bedc684ba8e22129439e938c80eed8af614314849e2d86811e18bacd78eb0baf4403784f658e5be4b473e66af0528ef SHA512 5846b09fe4cb0103c97f7eab2ae4e4a2ae4ad4872bb36979dac84378095611cfee432b1ff326d8fabb3d9d4d877fbbaa81a1fed93118c8acc7787d3159753101
 EBUILD dahdi-3.1.0-r3.ebuild 4805 BLAKE2B d6e722b3d9649293889ac3fd9374aa247a1b35b28a6d7fdc526568ed24ff42af392555b75550a82d9089af77d270abcb51edea4c6d7fdbab29e2ea92a80279a1 SHA512 3ccd4e65fead21091cb18bcf5bb9871160c55f7009afcdc3b5a1b2a7cc3cff03c79ee3f0895c8adc3a4312400151945490ecbf74d9acba726fd144f09e82f0b0
+EBUILD dahdi-3.1.0-r4.ebuild 5495 BLAKE2B c71798600838bc2bee130b40ffc689dfda07b4ccd60a78f205c567a5288779aaf0dce693843773c71c20b64e28e4f6923e1a9123d924a5c591bf20c7a2f4dccd SHA512 9d903c0749d278e7c5f78503cf04b8fde0b32328f065e669b3cc0dce7001c269aed4fa3e7c333c78b37655176000623e1a3dd3f0f3978fa8b757be193fc9f6a2
 MISC metadata.xml 570 BLAKE2B 9a86d4d85b8f3198da5e405d6eddff9196a5110d3928e96950bb35776288a107bb9a0a8ee683be94fa91e47bdb7457d0f4f3b545c23aaade69dfb9669287091a SHA512 dbef634f326db6041d861bbb86e6929bdd8999f2476d5d9d10c6f4866f83f3d3781fbec4713a159191f36c65ef63b483d82ab09f8e8671242e71b95d8ba7e844
diff --git a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
index 1bde322e9f43..05ae21da55a6 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,8 @@ inherit flag-o-matic linux-mod toolchain-funcs
 
 MY_P="${P/dahdi/dahdi-linux}"
 JNET=1.0.14
-GENTOO=3.1.0-r1-v2
+GENTOO_PATCHVERSION=3.1.0-r4
+GENTOO_SOURCEVERSION=3.1.0-r4
 S="${WORKDIR}/${MY_P}"
 
 JNET_DRIVERS="cwain qozap ztgsm"
@@ -16,7 +17,8 @@ DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Za
 HOMEPAGE="https://www.asterisk.org"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
 	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2
 	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
 	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
 	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
@@ -38,19 +40,21 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="flash oslec"
 
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
+PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
 
 CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
 
-pkg_pretend() {
+pkg_setup() {
 	use oslec && CONFIG_CHECK+=" ECHO"
-	check_extra_config
+	linux-mod_pkg_setup
 }
 
 src_unpack() {
+	local file drv
+
 	unpack ${A}
 	# Copy the firmware tarballs over, the makefile will try and download them otherwise
 	for file in ${A} ; do
@@ -68,6 +72,15 @@ src_unpack() {
 		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
 			die "Error linking ${drv}.h from jnet to DAHDI."
 	done
+
+	# Find the stuff from gentoo-sources (ie, modules that has been removed by
+	# upstream and we're re-adding).
+	DAHDI_GENTOO_MODULES=""
+	for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do
+		[[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/"
+		[[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o"
+		mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed."
+	done
 }
 
 src_prepare() {
@@ -94,7 +107,7 @@ src_compile() {
 src_install() {
 	einfo "Installing kernel module"
 	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \
 		LDFLAGS="$(raw-ldflags)" install
 
 	# Remove the blank "version" files (these files are all empty, and root owned).
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 9a07298e58d3..d75f65cb0155 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -4,8 +4,11 @@ AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a521
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
 DIST dropbox-lnx.x86-150.4.5000.tar.gz 103645837 BLAKE2B e6f304c99cfe419aed2afe58a6e4f86dbcb4c81ddc9aed82635b715f735c70b196827bcba169ac04f77520b74aa1ad87507072ab5e383398fd2e03a56f339af1 SHA512 90f5568ac372120497b090b60204b3a671b25c38aa93ec0b70d0071bf91c9d656001df3ff1fec2a66fdcf1acdee0b8cc70c110c4d7091d2fac63c389baa70607
 DIST dropbox-lnx.x86-151.4.4304.tar.gz 104019555 BLAKE2B d5aa1b0ce651c9b41a959bfa299349432252f9689f3b647090cc584b7b9812d606cc0cbb863178e926d91486343672b6d1df3912173d3fbefdc56e0e4c68d45c SHA512 55e673da79db0b2b8c94592c440c81c677aa34ea213de84c3539c52040a15a63bea6f593a48415f502690171bc5e8439de4e3ab29f5be01677e1fe211e73815b
+DIST dropbox-lnx.x86-152.4.4880.tar.gz 104241545 BLAKE2B 9564ce288aaec193142b203edd703498f72c7c21cff33a0b3a3b6450fe45d03cec375017e3805d84b604431ae427b63ddec605aba6fd64e3d1a6cc8516f35a5a SHA512 db305c224d29eb5c053bc535ab7f20ca43cfc85bd73972feae38ab4a7b0f1261c1e6a0b18840a4ebff7ce75119a02f78114a1b12a7115ccea6958702e331ab76
 DIST dropbox-lnx.x86_64-150.4.5000.tar.gz 105506526 BLAKE2B 44b13413b2480afd2849264c59e4d2fb17af014a56e9fbc7b75049b80e12d0ef86edfb1dfdfa3532f261280df7a19444307d862e9695dce3cf147ff39454742b SHA512 9f78e12047fad0c94331c4a12ef72d6afe0b8f044880a08cdc68ac7c9d2596325c5f732805870e656c36ab3825bcefed5542343f76c363811c68507cc8463cf7
 DIST dropbox-lnx.x86_64-151.4.4304.tar.gz 105875742 BLAKE2B ef3d84bf6483207b685ee5989788b4630a879a8b92a0cf6382e95f586c27358d856d74797876a08f85ce3f66d618a384d3afa1360a1a099984b6a965423f325e SHA512 ab3ec143365b9870b01969232b0faf102a51e0e385c3da33abc98381019a23162921242aca1a27b91885312776016f6e955ae42a44e98bb5f29c73be7949ff7f
+DIST dropbox-lnx.x86_64-152.4.4880.tar.gz 106098480 BLAKE2B ac28503b6e5e41521466658704ba7d69f8e9786dc366fbe93b0f69de869c5272ce6202c6bc5a8b757796c3d11537363dc47cf8d5b18edaf4ad94ab2d8f68ca1c SHA512 5f4f8c377f046bf35fac4c386528f487d5996a55d84b1e0ed018bacf1e5c20844cb8626e87a41925da7f423c9118dc9f606085103270162ae5bd237f868fde80
 EBUILD dropbox-150.4.5000.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
 EBUILD dropbox-151.4.4304.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
+EBUILD dropbox-152.4.4880.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-152.4.4880.ebuild b/net-misc/dropbox/dropbox-152.4.4880.ebuild
new file mode 100644
index 000000000000..0c3e0f739306
--- /dev/null
+++ b/net-misc/dropbox/dropbox-152.4.4880.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	if use X; then
+		doicon -s 16 -c status "${T}"/status
+		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+	fi
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 38befd5d157b..9b272905a025 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,6 +2,6 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.11.0.tar.gz 4115178 BLAKE2B 1b5f28c4602f949459816f57555bfebbedbabc9681b3d0d9eb3d7742a9b273644cf9c10b411baeb3b0c4b5ea3c340d1c0d8d6035cb0e7f38ba0c40fae1c5cd1b SHA512 ae2b3342b3b57ce6d656d0ebadfd73b5f2764f2164314f6b0deac170a82e6861349c37732e6914454918112124038b221dbd4882001b5de51a49326432ccd70f
-EBUILD gerbera-1.11.0.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c
-EBUILD gerbera-9999.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c
+EBUILD gerbera-1.11.0.ebuild 2250 BLAKE2B e3f38550533ef8c46fdc2aaf517591f59630cfde94324f86c4cd216868d5dc90aba34c2a23bfc6aa30f3427492f3bc3a0b273a42ace409f3de9d63915d8fbec4 SHA512 eca156513eed726374128bf5342d669283770cea356f8a1bd320d016f458e92973f242a2c3d48016c3fac4e95cd29a63536014716a76ffabecd4fa075fcf9133
+EBUILD gerbera-9999.ebuild 2250 BLAKE2B e3f38550533ef8c46fdc2aaf517591f59630cfde94324f86c4cd216868d5dc90aba34c2a23bfc6aa30f3427492f3bc3a0b273a42ace409f3de9d63915d8fbec4 SHA512 eca156513eed726374128bf5342d669283770cea356f8a1bd320d016f458e92973f242a2c3d48016c3fac4e95cd29a63536014716a76ffabecd4fa075fcf9133
 MISC metadata.xml 1205 BLAKE2B f0fbdc991782018368d65f2d5475ede1a1a0cb2a8a16de4e7c4ed7586057cac18a2d6fe9bb405c8267337e453b26c69e69042dac3bfd5ef858f23fa7c468ef2c SHA512 a231be2b6829fb2f59fa3e66c830a16358782c915e806bfbee919a6f7ebdf9d33d53aa6860814ba5a5c7251ce2562f313af592ab5fcda701a7673b334627b1a0
diff --git a/net-misc/gerbera/gerbera-1.11.0.ebuild b/net-misc/gerbera/gerbera-1.11.0.ebuild
index f069b91f13cf..41b42b9fc921 100644
--- a/net-misc/gerbera/gerbera-1.11.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.11.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	acct-user/gerbera
 	dev-db/sqlite
 	dev-libs/libebml:=
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-9.0.0:=
 	dev-libs/pugixml
 	dev-libs/spdlog:=
 	>=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp]
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index f069b91f13cf..41b42b9fc921 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	acct-user/gerbera
 	dev-db/sqlite
 	dev-libs/libebml:=
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-9.0.0:=
 	dev-libs/pugixml
 	dev-libs/spdlog:=
 	>=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp]
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 30e2b71ad30d..c80bda094818 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-42.2.tar.xz 165452 BLAKE2B 110d456dd6f91e00584755425b8dbad1e02ad9a0cef7a7325fcf8438c2e5cd64238fff7da17c6724f6b17ae24be4456e8470a2b519968d044386d3bf4cb36ab4 SHA512 620f2119bec845bf93226b1b873519c5609b7b6212232b33de2d1c420160378ad917c7b593b00c3e15a3b3c3788f3300ef89a226952afb6dae40f9fcc6782e16
+DIST gnome-remote-desktop-42.3.tar.xz 165424 BLAKE2B 43ff645dfcc75d0c97ab43840631f3c47337ed89c848fa65fb6c23b74f4ab2b9ada383c1cf17592e6a9382aac28f008d34c06d90f341731d1221ac86182ac666 SHA512 3545ec6b3f7f80315546d03ecb0c30ed554e879c743e1d7031ac65cf10e6d9d510553049393221be0be203a79b8be8bc96c0d3fe600be1ac3c0a1e24431ba945
 EBUILD gnome-remote-desktop-42.2.ebuild 1260 BLAKE2B e16100517cfefbade34a12ff2d2a68491a345c5be6e6396fee0471ae41457daa641a5a644d1c38440c6d5579abb86b8162c97b11f4cea240b750b339dca3b68a SHA512 d07d5b6a60cbafc21b979904944105b8e3996a21e5e88661d66246022ea7e968e0dd35b720c3f697ab77dfd8d1f5df04793821864ac1b3b042fbdbbf07f3e023
+EBUILD gnome-remote-desktop-42.3.ebuild 1260 BLAKE2B e16100517cfefbade34a12ff2d2a68491a345c5be6e6396fee0471ae41457daa641a5a644d1c38440c6d5579abb86b8162c97b11f4cea240b750b339dca3b68a SHA512 d07d5b6a60cbafc21b979904944105b8e3996a21e5e88661d66246022ea7e968e0dd35b720c3f697ab77dfd8d1f5df04793821864ac1b3b042fbdbbf07f3e023
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.3.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.3.ebuild
new file mode 100644
index 000000000000..b7ff4b497493
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	>=dev-libs/glib-2.68:2
+	>=media-video/pipewire-0.3.0:=
+	app-crypt/libsecret
+	x11-libs/libnotify
+	media-libs/libepoxy
+	x11-libs/libdrm
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-2.5.0:=[server]
+		>=sys-fs/fuse-3.9.1
+		>=x11-libs/libxkbcommon-1.0.0
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 7488c03f6863..b2e7ea96a881 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,6 +1,6 @@
-DIST gns3-gui-2.2.29.tar.gz 5043197 BLAKE2B 9a08f16a96448400a2826e94cf244a126527578fb6f09c6f207b106aa30c194c522f78d4803125a694bdda8bf464d8fa923bbf5e9cf4f79834028aa605ac218b SHA512 7a6ad191d772ae91739196baa64644b5fcebdd3baf8781e07ce0cbbc70b98b09930005b349b15940237798624912e466abce7eedda588fb32c43601247570ec8
 DIST gns3-gui-2.2.31.tar.gz 5043086 BLAKE2B 3b028b57406d86137fc4d0488cb588bf5821de1d79c4be80c7da6b8895fb594f90bc7018341d82d4e77db2e25510b8fdb191ce819904423ebbcc5caef612bf21 SHA512 ea894cf65b80dad985fbc2112d018750c42b3c0bd358f6f5a6a491748d12e90e2de01108658611c7ba890a55fa688853c3e98d9220c8cb28c772595fa586100e
-EBUILD gns3-gui-2.2.29.ebuild 1026 BLAKE2B aa0a46f4016ec2fbe7e04adce0833968596963c1d1d2b9cd2ee6b1b21121a81632d52e9f26625babd180386974f86beab1277383eb21d729bfae628eca4b42bb SHA512 a21c7c1814ad86299a538f6c614b49c5d3028093cdd04933651eac0d7bb22feb7ddb2ae126f3acfbd0e8befe5a5bdffc36d5c46203a103749ccccdd14b75c85d
+DIST gns3-gui-2.2.33.1.tar.gz 5044746 BLAKE2B ddd1cf1cfe8cf8ad0c9e2313161ecc9c13f0f0eac7edbafc5c0ccef55935f58f889d7ca358b8bddc658b425744a19f5f7a71e80481b31c369bf8450e11e2356a SHA512 2a9018f1d04835f288b2f633e6ef71a168418aebcc6f85e666cc4ef6694754e8840ad9aaaa7a61dffff54e4432cea33d84040d1dd18bda784c18315e145f9c69
 EBUILD gns3-gui-2.2.31-r1.ebuild 1028 BLAKE2B 9c671256241def910d47cd711ad5f98524c08233d5162cea5e3b9e566d26da709ce8f7b16ac6b887c60470ac3bb5acb7ff41d17e227676751cb2e3f031db249d SHA512 f932eab7abb0e82e90cd834c1c04932f8b8a7d218a01bb3aa12d493c13d69abdb06d62a37a0a7119b3daac52fa393bdb62f679ebb1c384fd56b7114a8de11b81
 EBUILD gns3-gui-2.2.31.ebuild 1028 BLAKE2B 1d7b4a0b5b4b26966cc1abb49d6c0d4f0c99e42dc303b498bebeef664be57afde6f24dd545d813fe288b3df800318e36b788d4fb78b7445d380068d0f03d4371 SHA512 5c407af4148e1fa26ce7bf20c607b78d625bc648f5ea9b08768e263256ed5f4df28dfc23bbeb899c8a3efcf5b37545dca26a5d80f8476f74e8241bd61f245563
+EBUILD gns3-gui-2.2.33.1.ebuild 1029 BLAKE2B 162df852bd6939e06738e54af998cad50a37078ccb0e5692aec774e771db3944a13c524499b5c6b8142d8e9157897d6be628819d5f3218ca577425c11e8c199b SHA512 245ee46e5b673ccf1853f5eb257bd9ae5f370dfff581a86470ac64347dc064d976f1d9ec0f6da615e8fc7b325c08fbad86a0a8ad85640e4890dc89c11ca1e2b6
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.29.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.33.1.ebuild
index 1c1a934e12ca..2253d1467a13 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.29.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.33.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx xdg
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
 
 #net-misc/gns3-server version should always match gns3-gui version
 RDEPEND="
-	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index b3f6c77bc95e..3c5d4bd8d229 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,6 +1,6 @@
-DIST gns3-server-2.2.29.tar.gz 10241179 BLAKE2B ae9df1414d679c49f3b0da84f6b07789a0343ee74cf1c744c7b8dc55ab5395a92cc223cddc0d04516f315d5483d4cc3260c0f815c81992a12127fc6694fbaa2a SHA512 1e5eaeb127efddd6f21e167de4b56a2713c8a4dbc470e2595f807d8283f4b9208564f910dc3ac4602049ee4b1267eaffb9c5787b2d556c4d27176d153c67fc05
 DIST gns3-server-2.2.31.tar.gz 10245461 BLAKE2B 488a91305408704accd4c7df936dde13e9a64404ac6a7e4ed7bdb94f996bb1bbd418d38523318603a8e93a7095c9fb8e30795c6b0dece70a45ed4758569b6711 SHA512 e8bf9357bc5a69e38dc27bc649af88c6ed39e6b5c63e2a1d374ec2a0784c7a6eadae3de0f4300a268fbf91ab55ad342e476573ca9a4bac609158d7d371a7a834
-EBUILD gns3-server-2.2.29.ebuild 2080 BLAKE2B 610964ac5108a4acf0fd7c75f575a3721e1e643c7bd9fc5e4d2008a66c562911461b16f5adcc952e8043a6a0fc092c0a10c0a187457ce90d0c3c95117abe7e2c SHA512 ece130239e1b43164b332e5b44cbfa87432fd57a5145a28dc428ed3d9b70c177f9acd9c2c5a6b8341b5eef167e76cb34aea9751216630d2afe83049249d8d547
-EBUILD gns3-server-2.2.31-r1.ebuild 2082 BLAKE2B 1e8b704bd367e64060f7e9489f4689d7abcca177ebb77eb4acc6e44dbacc0c5ef7a359b3a9273f9d9338f62af80b7443c18014078d878c61219904dbcabda59a SHA512 f5b9c1085743b62f94772129277f4ebd56a121b029675094e30a4c53ad1ff93168b72d166b510a522a646d8868243facf3fbba3a5fbeea8995fbc0351308db08
-EBUILD gns3-server-2.2.31.ebuild 2082 BLAKE2B e4bb2f8d1945076f5f736b2b07ab0c2f49c4a8e4ee3e49b0a7ef9f4f704f307922f746f6d99dc5e7cc69103880acb5f4e9c113e772fa512a395f5f7f704a1d4d SHA512 edb14145263381e914e40c88c72d5160d2085c0f8e0cd3828e935db341217b38eb6a615680002b194a644571ceca5f1029731891291a45222311d0bf8ddb02c8
+DIST gns3-server-2.2.33.1.tar.gz 10245850 BLAKE2B 069af8a0b77e7c7ce50903577fe0f037ddf574d9081f547686589ee7a48b71295c8c9f3fd9e47c9428e3d3b260828ddbb83188f29dd0cdb87f14fc7757032ad5 SHA512 af1207d92f64862a3f225bde70fa1bf10853c4ab7c661524d3ceed0fcf56388556cc257a31a0b2a741b90fcd793501ba54000d3b18c35d3ff0c47ca080488fc7
+EBUILD gns3-server-2.2.31-r1.ebuild 2082 BLAKE2B 28fafaf83e6c99bddd61f9e57f2b847e223cf4a2d2cd50774ca0b91f0eab028de6f6e7d5fca3b2879ce36bad1251ab1949365ad623d6d9ae511d8126e838161c SHA512 e140763c03d78769bc79b7615dd72618aacb586529594f970546ec4aaac4088f2904fc0b183e787cb79f277eaa44cfb2d4554542964343125844903c41441659
+EBUILD gns3-server-2.2.31.ebuild 2082 BLAKE2B a08edd08a381a217063f92ab533ab78546434604ed1a096e88b816ff923032e05d28dba8acbc5167be6e2777762bc3faade3df503d9c2afd739d55d4bd547019 SHA512 c7888cc3968590b8e71d236eeae246f7346d7b3407ec150a1a76ade50e2d97355e72d3e95167e6515a20929ae355c67c15758f9bcb6f1b94640bd28e94b6b90c
+EBUILD gns3-server-2.2.33.1.ebuild 2083 BLAKE2B 5bc59b3334b586c5eaffa135b39883a88f51145251213e07dacb8ab3bbdeaa3265ffd0d2e5f7fbdbf6dd49a9269a0a61f68d2f70aa0dc46877a9c4336cebc4f3 SHA512 aa992f0554b8b3bc143f488b8cdb3b9bee00683e979504e86b8597c8d4936f3e3d2f771831d70038e806cbbbaf509236338d485ed79b872127a0799b76ccfef3
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild
index f27244c73657..cdb46f4d488b 100644
--- a/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/gns3-server/gns3-server-2.2.31.ebuild b/net-misc/gns3-server/gns3-server-2.2.31.ebuild
index 8b5af5922125..ac4d69e7b4de 100644
--- a/net-misc/gns3-server/gns3-server-2.2.31.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.31.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/gns3-server/gns3-server-2.2.29.ebuild b/net-misc/gns3-server/gns3-server-2.2.33.1.ebuild
index af4f9ccadcd5..9866607bfa22 100644
--- a/net-misc/gns3-server/gns3-server-2.2.29.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.33.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 optfeature systemd
@@ -19,15 +19,15 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	app-emulation/dynamips
 	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.1[${PYTHON_USEDEP}]
 	>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}]
 	net-misc/ubridge
 	sys-apps/busybox
 "
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index e5fb90901c6e..70e1f69c00de 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,5 +1,5 @@
 DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
 DIST gsasl-2.0.0.tar.gz 3274625 BLAKE2B fb9ce9b3be0cbd0902128a3e8b57ad1f78c9259da646d3da56777b05922152c5e7f019a4c037a9e42a161153e87b140146eab2f2a55e33de9b52d6814a250fd3 SHA512 b7c4e3dfdaa50eaba38f3c0914dedb4bc689d1226fcf162e5bfb3942fa6ce1e96405715a747adca78150709f34830f699e9f995f04ce586cd3d0c14b275910e6
 EBUILD gsasl-1.10.0.ebuild 1904 BLAKE2B 3bc572a83c0dfa8837a6e8223bbbc2480a9a76746192884c4e85d6146ee0fa11b01fb38ba62a634f1f02be23a48fa86c68da085772cd3211fb30bf7b1c12b3bf SHA512 8daca23e2fbc2e6bb5fa0a4c671fcbb8f714043bead8e772d5735ff2f1879f0525dd20692281b90feaac735064a4732671617cfacc18b024d178d854acc0655d
-EBUILD gsasl-2.0.0.ebuild 1928 BLAKE2B bb27aa011b3c788ad42602e5017b6ad28a9dbcc46a84bde17db998ef89a6b6c9f4fa2b51b989eb8243558d0ae2e90bd1bf08abc2aee9a86762a5d1de81049473 SHA512 625c199482aa49fad63c6b93d1479a918323b6055ecd595821717d20e0553b4685fb02e09325c1bdd8ad36befd154164c8039bcde2dadbfe6863d59fb69490e1
+EBUILD gsasl-2.0.0.ebuild 1934 BLAKE2B bf4973bb647e30a85cc40d2e214bf8ccbbe80dbaaa5aa97ee912d85fdca441e7075333b7777f09d2b1324b4f56aa187761cac2f0a1f9e5d0fcf5676dcf3686c8 SHA512 7221cce4fe0cef7a5745acf957c00e768ed180a6d6dcb94484a183a0178b8fae3f6c739fd5d30af94c0517d8022d2bf7ad1e5aa7dcab8eacbda7854c5f2d6fba
 MISC metadata.xml 579 BLAKE2B 87f59c4a4c3ba2b3741aac713b47ec1357889afce3d06919705a5e31fba874ba5e0ba53c1a43cfb465d4c3ed138d465060f883afedd882547a39cefd58e20c01 SHA512 ccf34d49ff3453e97e1e4c2c9c769ea7ae201243d3756bd7154cf98581e704ae980a6e82ba8020993e42956a512111972ba2cc39e0f3fe789b1080ebe9e5f351
diff --git a/net-misc/gsasl/gsasl-2.0.0.ebuild b/net-misc/gsasl/gsasl-2.0.0.ebuild
index b784eb48e102..7c713703a870 100644
--- a/net-misc/gsasl/gsasl-2.0.0.ebuild
+++ b/net-misc/gsasl/gsasl-2.0.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
 REQUIRED_USE="|| ( client server )"
 
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index f3f4272ab467..a406f8fb0499 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,5 +1,5 @@
 DIST gupnp-tools-0.10.2.tar.xz 181020 BLAKE2B ae6666d0876cfa57df56720b178d4b9bb492d9dbc82582ecaa09d178e20f55b3d045085b20965af2a9efd30fb9de0155f29b824ef004dd67309ed2be0a1fe487 SHA512 acb48b6081851345a01bd4604f4c83beca0fcff627e9d282efd807f5c98739ca4967a428456487e27196d1be6d65dd9482a12267da146e4efe0f61fa5a43c7a2
 DIST gupnp-tools-0.10.3.tar.xz 180596 BLAKE2B 26140962cc24cda867465a4f94d251a26849db544fe1cb017ca86e6208f037b09e772109bfac150a9f6db845d1212af5a5c624d81958816349b3c60e45b80933 SHA512 a95a169c65e50d9953b79b96b92abbad709adc0bf74db47abaa529bd7989ebe2d41ae30ab340d09e5a727b61200d55a6d34b04d6981327b920d23a7c916babbe
 EBUILD gupnp-tools-0.10.2.ebuild 695 BLAKE2B e0ff0a4b21136529369cfe4b3dc2266494eca7a2e532a2e0394b12f2e59ea617fbc8bc06619a52476bc906ff6220f67ee0369b11bc23170282605b3eca4e20d3 SHA512 4a77c5525d8b3dfb4d4bcd217dc5f70e5c7690081a5d71730fd3e8a77c73fbfc3d43b1cdb96bd43d03a2be422d9b6ecef688c20ba97c443f29c6668b3710051a
-EBUILD gupnp-tools-0.10.3.ebuild 697 BLAKE2B 2cae77eb3730e2a09db2f63d940b42c99beae7ebb39c14e567d8b79b41a821f1753b1f90181ded9c3ff75e1fe2a0438101f1fd8d21281e60bca0f5003ba03808 SHA512 918eacea32dfb92d50d416f591628b2e15ee78f68bbffec24a07e3d9d4aa95e70d12b1ebf11f26e66309363a45e0ceecc81828087e8aecc8e23a892a9c3159c0
+EBUILD gupnp-tools-0.10.3.ebuild 695 BLAKE2B 8029775879538d43e563b6383f894f692e99ac01f7879a6e959cb697e2c3211da46810fa728219a4f8a2eaa6f9a156da1f7ddc156bd6e228f1aa0284c54274c0 SHA512 7725ac9160633f59ca27b08cc062882088734f75e7176a769e102b3ba10697c952991a82d798217a7230c6252cf43575210d077e5e51377ffd271934a7425eef
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
index 6655aaccb458..c47cd2e16235 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.10.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=net-libs/gssdp-1.2.0:=
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index bfbd99f61203..9c03474fa4a9 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -8,4 +8,4 @@ AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc73
 DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
 DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
 EBUILD icaclient-22.5.0.16.ebuild 5447 BLAKE2B 5bda643f7f078b7f07b2d3ab0a11a0f43ae5d0632a8250ec0eddae5f7df1ed8ec4bc7e709733989b86059190a806a6e4555cb8148eb2dc85154f0378dd2d9ed9 SHA512 0505b48016b8b1f465daf348bedefe5937b150127fbed1132be62df1dda558c2f86cbfc66070100fc7c19b16d6a10f465e20b25cd23f15e689b60926d13f18d7
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
index 115e9d64a669..d86008401e21 100644
--- a/net-misc/icaclient/metadata.xml
+++ b/net-misc/icaclient/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>henning@hennsch.de</email>
+		<name>Henning Schild</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index b71a915c894a..ba9657099806 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,5 @@
 DIST mobile-broadband-provider-info-20220315.tar.xz 84068 BLAKE2B 69b1805cdac393d733c7c4bd033f623d01260abe9be97108b1f7525a1e96935dd6b6582cd647e415a4f6329988cc105a220fbd3672b0d8c719e298ac53e0bcac SHA512 92da9e03f48d1a3e5807cab616627d0d31539dfee5c9650f78c5eb4371748366700ffe26f922ac061f877cd1bd5c3fb766e71fea0677eee007e68873c39c597c
 DIST mobile-broadband-provider-info-20220511.tar.xz 85064 BLAKE2B 7abb1d493cc39b9988a188edf260b5440bc8cb9e0879897df550ee63cb46c52721ee75dee304bbc93add3173a7ff56bd17bccf8dd062590ae583cee67e9093ab SHA512 7b3a9c0a2e618ef3ef0e29b947ab9f0a55f30bd738f0e976529e8f3ddbb60a738f623e718ea67fa6e6008275dbbe78ce3ed9852c005748a266f04e3dd65179a6
 EBUILD mobile-broadband-provider-info-20220315.ebuild 481 BLAKE2B 639e3a145dd1fe761073f041ce2fb920e82c8161a4c1c983fadaa8336971e3d1d54f3bf4f327140c2ee3a1f216dba2472ba335a943316642dc0ae46e16c5942b SHA512 747a29260d627457108ec78b0262850cd4bd5b9e397dbb6f50249180115e7e9bd9eefc2fbda961bd17053413dc99571e24020e2569e335ec345b8e3e8d884d1a
-EBUILD mobile-broadband-provider-info-20220511.ebuild 495 BLAKE2B 965640686d3108a286e6532ac320e4dd31dfeeaa193fee9c39be04c6820db7a03f7b9ca123a761aa42669f0efed99998ff0f7deac1c23fa033caac11e137a778 SHA512 728c18ba169f3e451f02dae6d69db50c3a12337ec6c4dd054472c74ffa6a1ad693d565f159244121373a479e0b893a1fe696218bbbfc45b53c5aba208c873701
+EBUILD mobile-broadband-provider-info-20220511.ebuild 493 BLAKE2B 80c30b4eef2023f6f2596186a195085f09e5e972a41c07d57dee2c0ff93cc70402674228048daa86317b9487a7812de978aade1cf5039716ccab8c2eff05850a SHA512 b67d5e824364f7462ee332de128a222487a5ee4232da893033ada879038eccbaae54d9ac0cd1f3a8a2c190d1d0e631ae987d8c82346719697706cb102adbfd7f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
index c7d2788a09a8..c163715b8061 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index fd642003d947..6d7818788cdd 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,5 +7,5 @@ DIST NetworkManager-1.38.0.tar.xz 5431664 BLAKE2B adc298681e339d6cfac9c7310a94a1
 DIST NetworkManager-1.38.2.tar.xz 5526780 BLAKE2B 54e9746d3bf41146bb2bbc1ec273c4e2ca0a458e1a488eba7e5f17572e6e8db02ccfcd5b884e00162e505512b24a38de77447944d979fbe40d20d4af4c688a71 SHA512 0da3294bec659e6742c2b941eb6cb2464df1018e801148ac37cce0a0612c4468701add13659c18b1c08b51556c7e3e2782ad2353804fdf2a094e97d531da964b
 EBUILD networkmanager-1.36.4.ebuild 12499 BLAKE2B 265082e6355c141f4519b00ec136b1aed69461e91f299c7de5f03108abfdef69f2743c1cefcee800eb4659945263324aa0aa7df2ea507d88ac0c569966d1c8d7 SHA512 a6c7ee2a653ab3d7d873156ed45c6ea51eb9fc65574a84a240457564c54681f6830984d7c3177e7de342f04ce5622e0d89f8f1a7a59c163a076592a3340bcbe2
 EBUILD networkmanager-1.38.0.ebuild 12526 BLAKE2B 3617f3cb3de8b4c00fb1c1be6505a0289f798d0ad93068a50b68e4b31ad0cbfa81b474f4a64e1de7a7c2b7980fe70f7f6aeb404f7c0b1cbfaf63269657bcd432 SHA512 2d27c3bad9613e467bef49ffab35b26b3a779419439fa1dae2a17b52d7988ee46cdecb1cb067a04534ba1e47d3a4dafdf7db8f7441642aae4e9ed076f8ff3a69
-EBUILD networkmanager-1.38.2.ebuild 12543 BLAKE2B 1235910f66ea116902f8041e95f6e8d38a8ceb9f651eef76eca82f7439c42a2d863352fdca33aa02f7ad710920a683ccad4b724332ea99fdc817db83c830cc59 SHA512 3a0dd2337e4af2af2fc5a6631c769e8b34223b29274c3f97cd3fc933be486a02f75dcf32711bf4aa6175e8b17bf022543ae8094262e9a00f96e8bc60955412dc
+EBUILD networkmanager-1.38.2.ebuild 12541 BLAKE2B 4e43c296369c47867be3accead6b6db77982afd43727d4ba74ef3f80612f42a6308294f6596ab03f4854d572742e0a19587d33092106bd17613cca002af82837 SHA512 9b349ee9727436cece8a8ad43ce24a3041c5da88734ba960f2031191c49c5acb01c6e88320ec87c1a9f679f151f056c4a0c371a7778138b796eae0fa94f76b28
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.38.2.ebuild b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
index 15e85166b3f8..7a924c1fd472 100644
--- a/net-misc/networkmanager/networkmanager-1.38.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 3f448710e8d9..d1ea48e585a0 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,9 +1,7 @@
-DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71
 DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a632349999ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4
-DIST nextcloud-client-3.5.0.tar.gz 15359946 BLAKE2B 144f50fb1ce3f1cad205fd2bf5c161c54602d75642518e4db2bad1e384b28bf3baf3ba7a22eafe7530aae9aa1bced4c2025c33dc1566ba48db64224ae00537e9 SHA512 9c20cc2878832fb9fbe690fb0a2b9f960ea58480bb14c89d8e713d9847a27fad920ce4b507fb8b7b5ac211f4a0e1c775e3b985d57acd9191e87f45e01a86f85c
 DIST nextcloud-client-3.5.1.tar.gz 15392337 BLAKE2B 6f3826e33828aacfbefb1786c9a1231ccba0be4b649cc132546914d7c61b8755b32f873a9eb5c27d10d207121636738bc51354643d056ffe6733c5cd0f395cac SHA512 989cc4c99f81f7451af8b13453155f0c89448226ade565025030a8064c7e54e5668b37744564685cc700f2b5a54f899d563a4be2bfe023e43987928982a2feba
-EBUILD nextcloud-client-3.4.3.ebuild 2182 BLAKE2B 33133006cd7cba83da279d15122a00b82658967bbc3df8c2da157f9ed87582526e84b6959dd3d39dfdb909fee75eacb780a0548a9bd40564ceb38d7e61e805e9 SHA512 3b1957a1755b3dadb4d2a92d9991d97f1a17bf4f94120ea44219a46bf49b909fb8828a9f4f56e929c375d631e46645ab2cf4c084c98a26b58ebba98cf080960e
+DIST nextcloud-client-3.5.2.tar.gz 15433543 BLAKE2B 082031ac34a644f0db09679ef34237ee8fc9def88ff4659ad4a71e3ac611b3be3f9a0750deda25cd0ef34aca7e9d3c60fe7d3fc5a4d747eef46978e2fe84b742 SHA512 2892c277466869e3872a68049541c3d5afe94ca4dde1e97ea13ac615adedba198946763b5ff5dcb4694a9cec1946e35d1d6b6fd950d26b23cd6ddd94181f4b83
 EBUILD nextcloud-client-3.4.4.ebuild 2181 BLAKE2B d246952097b7b568f21956df4b78f9189e70367edbf7798b5b915afab8468b8eb1de1a33daa7591457ad94a68c7adc7668317402e8fe3f038df498329999b0c3 SHA512 b783495c8c6ed6abe9337b9573eb7d3e8c63b4e4082643598d4273aec15b5724faee52170517e25f330541d099d4f4f993f52bdd062f4166ae19211d22bf9367
-EBUILD nextcloud-client-3.5.0.ebuild 2331 BLAKE2B 809323f95c13f2cb654c56696ff85eb4d663b533656f6f6e775dcce04e0efe8efaad503799ca6a55a8aace92506b0d2ef84432124829f64d480728644f4b14d4 SHA512 5c96c010bdb9b45ae5fdf9f0de66e86ffd6b213b05222f6eca5729430ba26169dab240eb6356318ca949957e6d30074e78a0a27cc4b81b5910a2cfa79bdf2067
-EBUILD nextcloud-client-3.5.1.ebuild 2331 BLAKE2B 809323f95c13f2cb654c56696ff85eb4d663b533656f6f6e775dcce04e0efe8efaad503799ca6a55a8aace92506b0d2ef84432124829f64d480728644f4b14d4 SHA512 5c96c010bdb9b45ae5fdf9f0de66e86ffd6b213b05222f6eca5729430ba26169dab240eb6356318ca949957e6d30074e78a0a27cc4b81b5910a2cfa79bdf2067
+EBUILD nextcloud-client-3.5.1.ebuild 2329 BLAKE2B 37ecc1794f656040a924d2ac0126d69239775223e527d78dd307de45d557aae11910aa2de380e31aa4299c47bb69374a3f19aad671f867275ce8a01439568fb3 SHA512 71416fe2cdad8e80465a53cbc1c27a69a4761cccf5de70b8374c3fccf87d236cc5f6ce653638a51e2678a71d7410bbec614ae522b0ccf1bf38f89dc279c07ecf
+EBUILD nextcloud-client-3.5.2.ebuild 2329 BLAKE2B 37ecc1794f656040a924d2ac0126d69239775223e527d78dd307de45d557aae11910aa2de380e31aa4299c47bb69374a3f19aad671f867275ce8a01439568fb3 SHA512 71416fe2cdad8e80465a53cbc1c27a69a4761cccf5de70b8374c3fccf87d236cc5f6ce653638a51e2678a71d7410bbec614ae522b0ccf1bf38f89dc279c07ecf
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
deleted file mode 100644
index a3ac54808113..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	gnome-base/librsvg
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# We do not package libcloudproviders
-	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
-
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
index df8b692a88c8..6aac8d9ce510 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
index df8b692a88c8..6aac8d9ce510 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 3d0cdc503a04..4676f72b8919 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -2,5 +2,5 @@ AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec
 DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988
 DIST omniORB-4.3.0.tar.bz2 2762061 BLAKE2B f9103080011a7e683b7e63f6553e8a60947820a331d7c4e3559c961a7f36b17e235c5808e7b282d0227343e6e794106b9f2b93bf138b1a919716d1338e1c9cc2 SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
 EBUILD omniORB-4.2.4.ebuild 2356 BLAKE2B a245ac15e187ed3a520ed6c41d3673dfacc72b9ba94e9b4764b932627fcaf1b5915aa5af80d737e69d15703b0d2ee0b589c43d508bb7897680e697538480149d SHA512 25d9491129305db575442b6d732530048ae24c411224098dcf5633efcb1747e98c2cd900f769fc1e92371d0298eb7c41322d63b7f45ebeca8df68c336dacc36c
-EBUILD omniORB-4.3.0.ebuild 2338 BLAKE2B 81b4181cf5389a16caee3df78ff2087dd23d4d9de2bc1ade1e01614dbb3fbb290c87833cb6c9e24cf135fd7884df4cac7680dc96a1b5506a1e10e04f96e9789d SHA512 dc84d1bef1aa5aec6e9991aff4eb19a331c4d5b929491a6c9a301354017b84fc5f989f121d9630faf361e40ecb6da364012f8bb011d7a257e50ff44d8261d4b8
+EBUILD omniORB-4.3.0.ebuild 2362 BLAKE2B da0e1753d40c8e04f573cd82d038a442606a8c87da526b9c2a32a12653a7e2047580257a01dab84da02880d6056bb094db1b3ca9ff2f13e9a72d823c3a9fb7c2 SHA512 c3bb23eacf655a38dec100858e59ec18046cee64b8757fae2678eea2944638f23b53dfbb3c5c761f337a25bcff1a430d44223799c201d8f040b669f4910f23d0
 MISC metadata.xml 480 BLAKE2B 18c6b730f8a61f23ca0141f021af7106bcb9d47d66b9bebccf2caecb242b01e9256458da34b2a76d6451ef5f19e926c4c0362ade9a0bfff0dc5384c2f2949de2 SHA512 ee60840029f943440643b41e21daf17edb0c74e56210ce753ffcd0628aa5fc3191101f4c1b53a9b275df78cb8afddcca9c82795ea632cc1e2946fd0e371b33d7
diff --git a/net-misc/omniORB/omniORB-4.3.0.ebuild b/net-misc/omniORB/omniORB-4.3.0.ebuild
index 2ba601fe4528..318a73b9dc09 100644
--- a/net-misc/omniORB/omniORB-4.3.0.ebuild
+++ b/net-misc/omniORB/omniORB-4.3.0.ebuild
@@ -14,13 +14,14 @@ SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="doc ipv6 ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	ssl? ( dev-libs/openssl:= )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index ce760f0fd2f1..fa2559b35a24 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -7,5 +7,7 @@ AUX ovsdb-server-r3.service 813 BLAKE2B ba16534aaf407121f56e1ffc711dcc87b4c5ee07
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832
+DIST openvswitch-2.17.2.tar.gz 7955727 BLAKE2B da7ffc29b6af5dbf8eeb410725ed4cb6b6c5f4abe22f17d0963429a3333e459e1d4cc4ef06d13518dc2486d5e9e78a090318ad66e50175606e47fcf1d61cfce7 SHA512 e01e41ef2fea21afcc891b8ab0a773fe7c9adf873853e10926b8bde2fd970e12b354010687439238e8d80a87884f497f7396a4a1f2b179104e49e87c66cfc79e
 EBUILD openvswitch-2.15.0.ebuild 4406 BLAKE2B 2bd8f0c6fa31c291c358666b12bc8a7cee17b8aec4f9860e8cd21d93d671ce318c2e55f6a938b2c406a5892787de3b3e1546eaff16cc7859031e6b6edcf043ea SHA512 8d8ac462e9102b7162c417eab2194601027ee1cbe247ad2bd1b10b828780ad2bebe8991addee49ff4f31358c560e946e7f3a73a2cc60d2dc148eb6e55d6ecf8b
+EBUILD openvswitch-2.17.2.ebuild 4568 BLAKE2B c18f4e7e641584536078dc6b59ac80a37180f0dc870759f83a8ea3f8b9e548a5104fc8a589677d14d178f1c44d9c6d97045dc27a57af4aca9667d0a9d5b1ce74 SHA512 fddbe050d946969eb66a71405d946341e8591169c4c465bf9e4f465f5d0ad8e45284e22d28fbc39d83525b7f1499614cc6b1331b12c28ccb003381387e9dc930
 MISC metadata.xml 459 BLAKE2B b404d36a797768044b82701f1d65c2931b33d2ddb553dcc56cd476686d66102988a863261a6afd05c366b3e0521959e3c4b3af2cc1751899ecc386adf458fb12 SHA512 1b11fe7e1e1d117f60eb24da05c27a2b3e431dc4c46ea8e97cff69cef8747f110be6ae7e6a83fcb604a75954c7c2133139e052823620bdf1b010f8c4f8b0f931
diff --git a/net-misc/openvswitch/openvswitch-2.17.2.ebuild b/net-misc/openvswitch/openvswitch-2.17.2.ebuild
new file mode 100644
index 000000000000..4d3678b83503
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.17.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_USE="modules"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools linux-info linux-mod python-r1 systemd tmpfiles
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Check python/ovs/version.py in tarball for dev-python/ovs dep
+RDEPEND="${PYTHON_DEPS}
+	~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}]
+	dev-python/twisted[conch,${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux[caps]"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+)
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
+		kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	set_arch_to_kernel
+	python_setup
+
+	# monitor is statically enabled for bug #596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	# flake8 is primarily a style guide tool, running it as part of the tests
+	# in Gentoo does not make much sense, only breaks them: bug #607280
+	export ovs_cv_flake8="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	tmpfiles_process openvswitch.conf
+
+	# Only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 4384ae097a7d..d0dc8cdd94a2 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,3 +1,5 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
-EBUILD pulseaudio-dlna-9999.ebuild 2067 BLAKE2B a43c11f87255006748705f6050518b3876ebc9005b4e3be7741f756f214228c535506d12e5b0edae2dc99878ec9997eb186552308f463b50625f5dbc27e0c36c SHA512 e5f090bfc9e7bf5182d83e45fb81a5322766de05b07047bce9c177c0e1b08df83c6460469969c6142338eb6490c9c27c615644e56a649c9db53ff3f226da5e92
+DIST pulseaudio-dlna-0.6.5-1.tar.gz 712483 BLAKE2B baf1fc94f41c9ac2ca7df5c239ace36b36da4d7a40e30cf19fa630f51a0e94fa44a1ba531943ad5c4425580e4bbe68af1d5de48f5f17163783aab7b471faa72e SHA512 6fd59ac6ff0dfa98baed7a5d929c6f7d9f3539016a6383770895732f7066bc260b3d56751691573d0834a0ee29a6e542ef26e66e48c7a7af97cc84ca23ff5c2d
+EBUILD pulseaudio-dlna-0.6.5_p1.ebuild 1836 BLAKE2B 1b355dbf1fcd98a627b2fce84f55342f403bd4bf756dbeee46da5e4a50b2ec73c4cbeb71fd0a6ffb2f146b9c15ee7a36ecf6ccd9160354c3410b9b7a30d6f67b SHA512 5b15828f051ad7ae26f5be2a8721890283a2f7e63ddce6400c0d63ecbb9c09e03405ec69adb11426cb345e43ac6a8e8149a39269de1689eaf0d8602ad0f1ffa4
+EBUILD pulseaudio-dlna-9999.ebuild 1836 BLAKE2B 1b355dbf1fcd98a627b2fce84f55342f403bd4bf756dbeee46da5e4a50b2ec73c4cbeb71fd0a6ffb2f146b9c15ee7a36ecf6ccd9160354c3410b9b7a30d6f67b SHA512 5b15828f051ad7ae26f5be2a8721890283a2f7e63ddce6400c0d63ecbb9c09e03405ec69adb11426cb345e43ac6a8e8149a39269de1689eaf0d8602ad0f1ffa4
 MISC metadata.xml 341 BLAKE2B 9add00de1558ff7ed828022b6e7818de975fb233b6b821f9c7bded156081dfd5edca2ae3237fa3cd2324aa615c6ed02008727a002ddb7b3331f6dd25a2ffcabc SHA512 58ad5457eb2dd3c0f926f32f40433899b1fe2a0456136d0b37b45ae3628994349bd60984e83388514e58b778b6c070ab99c53673f56bd1b7c03a927f1e4afe42
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
new file mode 100644
index 000000000000..cc609b92ede5
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop distutils-r1
+
+DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
+HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna"
+
+if [[ ${PV} == *9999 ]];then
+	EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_p/-}
+
+	SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_P}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3[${PYTHON_USEDEP}]
+	>=dev-python/pychromecast-10[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
+	gnome-base/librsvg[introspection]
+	x11-libs/gtk+:3[introspection]
+	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
+	|| (
+		|| (
+			media-video/ffmpeg[encode,mp3,opus,vorbis]
+			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
+		)
+		(
+			media-libs/flac
+			media-sound/lame
+			media-sound/opus-tools
+			media-sound/sox
+			media-sound/vorbis-tools
+		)
+	)"
+
+python_prepare_all() {
+	sed -i -e 's/.gz//' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 6fc29c68a643..cc609b92ede5 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit desktop distutils-r1
 
 DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
+HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna"
 
 if [[ ${PV} == *9999 ]];then
+	EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna"
 	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/masmu/pulseaudio-dlna"
-	EGIT_BRANCH="python3"
 else
-	SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	MY_P=${PN}-${PV/_p/-}
+
+	SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_P}
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 
 RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
@@ -33,13 +35,13 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pychromecast-10[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
 	gnome-base/librsvg[introspection]
 	x11-libs/gtk+:3[introspection]
+	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
 	|| (
 		|| (
 			media-video/ffmpeg[encode,mp3,opus,vorbis]
@@ -54,20 +56,14 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 		)
 	)"
 
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )"
-
 python_prepare_all() {
-	sed -i '/dbus-python/d' setup.py || die
-	sed -i '/notify2/d' setup.py || die
-	sed -i '/docopt/d' setup.py || die
-	sed -i '/pychromecast/d' setup.py || die
+	sed -i -e 's/.gz//' setup.py || die
+
 	distutils-r1_python_prepare_all
 }
 
 src_install() {
 	distutils-r1_src_install
 
-	domenu "${FILESDIR}/${PN}.desktop"
+	domenu "${FILESDIR}"/${PN}.desktop
 }
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index fc75ee2c9cbb..f656ed7ee658 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -2,6 +2,8 @@ AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb67161
 AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
 DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
 DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
+DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
 EBUILD r8125-9.008.00.ebuild 1399 BLAKE2B 59bb8848b09ee1ca476abbfbb156ded1e7cb3961aa287359aff792be2bd0b96b19d74a923ff545c3f6a53427c8536f190ee50d7ba837d5665e1d1e182f677b5c SHA512 45950f83abd6ac72475b58969c3c665eb7aa9fa31e7c6b4ec7aa356e06c58a5c5acc6287c23663a1b24902c8257907c6bb7c333df5370f4fbbc37d36d7a112ac
 EBUILD r8125-9.009.01.ebuild 1185 BLAKE2B b50ff489d98dd5fdf4fa8439c2414a47c71dab9782e3cc0eb052ef833bce84b34ed73dfae16abaaf24fbcaa6b4e9e6e3d4a60653092874c64169e861b80ceae4 SHA512 856ce45440f4e1d47c910588d5f88f85506dcffb01295e868c7033b85289f00fa6d9b2e7727f6c74cf33a7854640da06d4492c8b77cf141c9fb5da4c665b8b9a
+EBUILD r8125-9.009.02.ebuild 1112 BLAKE2B b7c8c255ef0fc6bb698526fcfc029ff46b506062f6d7e335c50c163539c2ef79ef3d40df4228f3f1f19139e339da1ec4ee932ebc446928171a33a5217d313231 SHA512 f50154b223ed5fba7dcb9d91d9302d21e6c3e1bed0710f4969c55432eed14d3c94671f10d343b4261eaabc9f0090d84719769bf04b99536e8a7d9da79a225478
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02.ebuild
new file mode 100644
index 000000000000..9178eeaa64df
--- /dev/null
+++ b/net-misc/r8125/r8125-9.009.02.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8125(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
+	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
+	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 3f080e26470f..d99d1e5df0f1 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -8,6 +8,6 @@ AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aab
 DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80 SHA512 96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
 EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73
-EBUILD rsync-3.2.4-r3.ebuild 4774 BLAKE2B 627f0a8a6eefb65f60991216c182752e2d3f3950fb6d54a66ae3408fd06406cdd852918d55f602a5302726512edbe5b60c3d6dd7b60f767daf9c2688e573ce00 SHA512 06171efba0f3bd6eda0d1b3fb57341e861ec5bbef2d9c7b37223ba531ccef26c64f95dc33f872f746f8862bbf80ad8996c4616edcab28135c4b1d66a0875cf34
+EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
 EBUILD rsync-9999.ebuild 4490 BLAKE2B cf88182b642dea41913431c96f3fe67d5a254767cb65721139423702f53d613c6fa59d614ae6c0475314e5153525682e8bd6c154aaddba92c486c1ae00833592 SHA512 ca478bfa7cb1c50712816631c1d4cdbc4284eac6240306f10e8498956f1209f8dac94d7bc7f540bcfe21911fbafd5412fb42ea1d271756ef48ad5d799e9e05c0
 MISC metadata.xml 655 BLAKE2B 4c3c8c26cf6d9bd27ae43a72408e8d587d7a5d3db588ccf67b2d68a8b697e4dbc531e959ebe57274413f5a1630be54415a56540953e44241d4810baa8bbb06d8 SHA512 de38cb9841631855730caa0630af6acc5413d8460dfb529ab1e972cbb33f557475a37b1fb1544114a8a48f72bcec670b72d2d142e951ac30e9356a4c540d59e4
diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild
index d4fb6dbdd9a5..41447f110e95 100644
--- a/net-misc/rsync/rsync-3.2.4-r3.ebuild
+++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild
@@ -28,7 +28,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		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"
+		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"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 560219cb5de7..64a6eaa11ff6 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,5 @@
 DIST rygel-0.40.3.tar.xz 1696424 BLAKE2B 90e3da7c4dcfe4b0789dc7cf64fb2b49f00d2892b18a2ea1bad1da4e2ac5c1684992177fcac9adb99785f0e5ec68ffa08ee3ba37a8694c47cb69a9e080e2f773 SHA512 b50613b49bfde656b587192b20b6aebd49bba176149e1adcc13b00f7a6bc525237fc74a2af5afe37704758df8d9446ddb01f1338472cc6626d30765df991f69d
 DIST rygel-0.40.4.tar.xz 1696492 BLAKE2B 9e22390b379b2e09abb2685b0c2a00bc03ae3668d4c6d5ed432dd9c5cefdf07a00370bc5a9a96bc542d14f48dfdcdf4db3647365833942d1d81dc377d0440705 SHA512 5e4003af9c0dc8a4b948cc63a12ec3f61c9e9f4f8007b196f9ce988c85e2fea7ec0a6c1e4217c59a770ca179b4ad8bba2e01aa99459a4e1179b9bc5db22ea0f8
 EBUILD rygel-0.40.3.ebuild 2194 BLAKE2B 858fc3d94a4c726820bfdbdc89f5275788938b10ec289d96dc80effeac1dd5df75b90ecbd921659325b71640e2af848dff3c8cadd1aa77242a55405cf7333b84 SHA512 cd6497f442f1b41a8a17790557c00269f2112ff64bb075bf3404cce6a60e029371936f879a87723c91a1b97a89edd25b845509ab87f6d508a680545b1ae8e6af
-EBUILD rygel-0.40.4.ebuild 2196 BLAKE2B 6665bf9c94b37248662ccc87f31327ceee86e89df6db4f51a86a1fa7b7862c502361ae2b7837f648c387f029b5cdb1afa7f6ed8b609e8163ff3866a86e2b240f SHA512 eefbd8890849027e6d936ac246e2a6424f89fdbe0a7e7531b3e2658316f289a4bb1e5a82f078095d21cdab796dc1dd97b0a7abeb96e965706f68e1bf54e184e8
+EBUILD rygel-0.40.4.ebuild 2194 BLAKE2B 858fc3d94a4c726820bfdbdc89f5275788938b10ec289d96dc80effeac1dd5df75b90ecbd921659325b71640e2af848dff3c8cadd1aa77242a55405cf7333b84 SHA512 cd6497f442f1b41a8a17790557c00269f2112ff64bb075bf3404cce6a60e029371936f879a87723c91a1b97a89edd25b845509ab87f6d508a680545b1ae8e6af
 MISC metadata.xml 432 BLAKE2B efa83d6c3c964e076185ee541b7b25c59a7f46dd53f96900cc9a9b617133b476ec21747f6b70392fb3903075032774252b1580d90e512c0123d2dfc779d7591e SHA512 b8cf12e9798b778551cdf099ab7a87aa606e6c68697db1b1eb37e673cd2368781c80c9cbc41c5b492997ad4b39eed9f68075f7c4be8ec21ad021470757b72d1b
diff --git a/net-misc/rygel/rygel-0.40.4.ebuild b/net-misc/rygel/rygel-0.40.4.ebuild
index 1b055e904ed5..782f36a2a7a4 100644
--- a/net-misc/rygel/rygel-0.40.4.ebuild
+++ b/net-misc/rygel/rygel-0.40.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index c9a55b3b32f5..eac10e44c472 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,9 +1,11 @@
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
 DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
 DIST streamlink-4.1.0.tar.gz 447665 BLAKE2B 18577544c64266bbd013ad90f80b452d0ec8800ba6650acdf30da00997498d3b642873069f64f1445ddfcfdc91d4bd4b64a7f35895ac2685fb01735e7d4f4539 SHA512 f163766bffe079c10cb9f33792ca1e8fa806f46fac64716bada5221f97b6b7b6786f1a218a9ba0ba6ae4eb1b9e5bfc8bf2de1a6b2e5bf9d4c9ba8b11a6a99b9e
+DIST streamlink-4.2.0.tar.gz 452348 BLAKE2B 9e994f2fd526adc5adbe905da5c628afca747184137a6a2d383e99df1dccedfd257c6f2bf9111839e2dff03a81214306f5e387c64f2a9bbc81410d57e15b69d5 SHA512 fccdf623d7b98f80342115d490b3033a3611b25dd79e8f2b46f6e0469e1d8a6370111d2fc6379425e4fd173babceba6f259aa8025d3007d318b618d34131589c
 DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
 EBUILD streamlink-1.3.1-r1.ebuild 1978 BLAKE2B c2c51ddcc295b0be2d9cc75ac252f991e6d087666c3ebb3562f40fe66798d84edca9f47e38612b972690b112ec229023d2d81adac2a4c375444caf0c4e8d3497 SHA512 ed905fff46702949b7de43622dc69b72a660e97b42f818b479a3bb99f95d73ffc9b3e64fb10a39f681f894369c82da6100ca938dc283223c9d8aab9e28194e9e
 EBUILD streamlink-2.0.0.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
 EBUILD streamlink-4.1.0-r2.ebuild 1513 BLAKE2B 0198953b62784af54a7ed90dd0df1f49abca56d5a014916ec6d477c14cb37fc13e9b1d6fd5d8d1a848284626e53b598c34ccc837601449ba39b61cbc636fe4b7 SHA512 0731859b980472685e657adee6f8a581f733fe78a0fb37638233e26ec95bc84be6e6bcbb1c0c274063d4464c58a4ae6d206370501c1f541bcdaf48d1bbeeae68
-EBUILD streamlink-9999.ebuild 1508 BLAKE2B c5b55bdd15e64d53dd3879e497df337cfa6df0e296df045bf5a9004e0d1a4e7221a0ee888694fc00e13eb02aef443a8ae8288b69a6299a3147c9a37b070309f9 SHA512 1a489584690862d1177e0ac0b4aa792ae10db12e39781f0f26bd8b5966cdbf766fa80126dd2d5f5ab214c9fb42812e6ae402638575d00b24a40e2657d726ce68
+EBUILD streamlink-4.2.0.ebuild 1521 BLAKE2B fe8da8338df398261f31bf12d3cadb3670a86dec255178a6d1ba3355f5a1abb495e8d2fa53e4309883552c0f75b9629b1275cbf54efcd5da97d937990821df71 SHA512 dd441eb50818a16d821858017b284eea1c59798658d449dbab03b087101c902b74c062baeaf0ee456c4bb127673b7eadd5b71f7d51a31e2b234e1d293986cba1
+EBUILD streamlink-9999.ebuild 1521 BLAKE2B fe8da8338df398261f31bf12d3cadb3670a86dec255178a6d1ba3355f5a1abb495e8d2fa53e4309883552c0f75b9629b1275cbf54efcd5da97d937990821df71 SHA512 dd441eb50818a16d821858017b284eea1c59798658d449dbab03b087101c902b74c062baeaf0ee456c4bb127673b7eadd5b71f7d51a31e2b234e1d293986cba1
 MISC metadata.xml 331 BLAKE2B 7872b2d59cd70d3f8fe1cad4d41d66a0e0fb5cac22412b7239273d0ab7fe028da8992b8d1113cb3bcb8d04a4486ff60155935bfd4dcb17b412ed4e2ea0db42a2 SHA512 4606169ce928cad0bddfde73fe826ba58c901756e8c23e46b998d1fcf317cad922f0816bb459188a2267fe242239fc330805a493a5a28ab43c58d61d97429a3c
diff --git a/net-misc/streamlink/streamlink-4.2.0.ebuild b/net-misc/streamlink/streamlink-4.2.0.ebuild
new file mode 100644
index 000000000000..feeef4b0e03c
--- /dev/null
+++ b/net-misc/streamlink/streamlink-4.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 1f654f0ef9f0..feeef4b0e03c 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://streamlink.github.io/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
@@ -34,7 +34,7 @@ DEPEND="
 		dev-python/pycountry[${PYTHON_USEDEP}]
 		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
 		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/versioningit[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
 		test? (
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/requests-mock[${PYTHON_USEDEP}]
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 6f62f4ef974c..b5babad1adb2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,11 +1,14 @@
 AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a
+AUX tigervnc-1.12.0-disable-server-and-pam.patch 1430 BLAKE2B 9b079911be8f70239df32432d8c4d9b9e88329585ef4fe5c4f847697d9cecf7fa9c7dd9fa6251bb02794e3bfcbfaf7c3f963875b519a07e824e72bbfeb7a61ec SHA512 f0546476060673bd65138c4c95f0fd2b72e64175c461c0bbe07dfc03a1c1d343b8d628fd8f9bfa1329bd7585d8aa18b8b6a9d4d519d4f3faaf284f3a914f98ca
 AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573ed572b20e9ead1e4ded7d830c739dc172a016784902d447dbe8aa78bb5a2e69c4ef6a4357f446af53f7bc569d56108dac SHA512 533ff06e9619cd63ee83dcb3e6a5a35f02f092b32b194f89e2c06f2f17aaf59a3c2adab27d3e87c4a0773f3f82cfec82492d6b031b3a9050d5f0ad4fcf0a0da0
 AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
 AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
 AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
+AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
-EBUILD tigervnc-1.12.0-r6.ebuild 4869 BLAKE2B fcc19219cd2e0ee342688d559c8617ff5389175fea7207e644a4340edc0dcf513352a8d8bcace7337a826ae1903d16a7d5cbb647ef15340c95cf778beeee0036 SHA512 6e298bf5dd7753e9a7273a6fd9521d101db8dfe052d2c1c8c6812ce0be57e31f2eeea94cc11ad19d620e9deceab14e3c429de81127163232c8404ad7af9b7baa
-EBUILD tigervnc-9999.ebuild 4772 BLAKE2B 3178336b98683506997a61e608e808176ff1cda1146935f07036a8616a2bf9117a63cafb94155cb2389a79ce7a48a9139ffb18bc683d6aabe893d72ea6aa3b46 SHA512 0e7881455d578c887b5455c78786d0af3337ffdd149aeb837102a4ee7473ca127e0e6f92a676f6bdc2808f84102155ee3fe437c7a614763ea7cf8df15ccf830c
-MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845
+EBUILD tigervnc-1.12.0-r6.ebuild 4882 BLAKE2B fd5d58d7dd02d4b423dccf057d9e36e4292a441a9251b417305fac0a7d17d54fbac9d07a3ae0bc28ca889e59ad8cd8ebd31840da9075f4382744f444c9e1daa6 SHA512 c277bc658ae9c3449a81981c7265bab9926a36a4d9620de7da808800a7cfa840c97af6b8fe2370db38f8778b17f773fd09e9f4759b46bf95a7a01b746ddda285
+EBUILD tigervnc-1.12.0-r7.ebuild 4720 BLAKE2B 9a628baca4950ae89df4d82f83698b4d0bc40ae89bc4f62c78caf9ecde0f178c5e32e2b214e8b23ec5345f80665b0af38733546702d347345f0df5421d5eb962 SHA512 b9f1800320cd9c3a8cb36361b519518733cc30d8fdf6e9d1fe2052760d154c8168e589b4eb54382135ba303b1ada2aa1e0f46e88052da6ed42896e6fc7148632
+EBUILD tigervnc-9999.ebuild 4618 BLAKE2B 972a802c205587855cfe3e70a421ab83984a3175dc75cfb71dc9d3127508fe5261eb4ce284c7593ff8056fd5ab9574e9a60a5d969b9ffcb64ce15b04d11f52f1 SHA512 6db6240797c92bcd49d82c8217120406b90de1dc7fd3aa8a7f3bc94014fb32d75f1796e400873d3d58fdd33b8b6b004158ba1769bbca6edf052daf1b5996b8ef
+MISC metadata.xml 651 BLAKE2B a2729d5a950c4bcc38bdf9b80da2563b1f140c6f3311f8a8b817199d3efae7a4fe1f2b6ac8bba87d3b858e6c5d98176ab6873ae0273ea1d416dafcb7e9c7703b SHA512 e0a9a4f66f75df32532c1bb055db8e8ae9fe2aff5503a3f1806531806c596f812403a92d6a9c717872321ddac2043e41da7376048bf89bca52d8746acd5f1b15
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
new file mode 100644
index 000000000000..5ae07007d467
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+   add_subdirectory(java)
+ endif()
+ 
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+   # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+ 
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   check_include_files(security/pam_appl.h HAVE_PAM_H)
+   set(CMAKE_REQUIRED_LIBRARIES -lpam)
+   check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+   add_subdirectory(media)
+ endif()
+ 
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
++++ b/common/rfb/CMakeLists.txt
+@@ -75,7 +75,7 @@
+ 
+ set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
+ 
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
+     UnixPasswordValidator.h pam.c pam.h)
+   set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
+--- a/unix/CMakeLists.txt
++++ b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++	add_subdirectory(vncconfig)
++	add_subdirectory(vncpasswd)
++	add_subdirectory(vncserver)
++	add_subdirectory(x0vncserver)
++endif()
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
new file mode 100644
index 000000000000..e61f099d397a
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+   add_subdirectory(java)
+ endif()
+ 
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+   # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+ 
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   check_include_files(security/pam_appl.h HAVE_PAM_H)
+   set(CMAKE_REQUIRED_LIBRARIES -lpam)
+   check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+   add_subdirectory(media)
+ endif()
+ 
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
++++ b/common/rfb/CMakeLists.txt
+@@ -88,7 +88,7 @@
+   target_sources(rfb PRIVATE WinPasswdValidator.cxx)
+ endif(WIN32)
+ 
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   target_sources(rfb PRIVATE UnixPasswordValidator.cxx pam.c)
+   target_link_libraries(rfb ${PAM_LIBS})
+ endif()
+--- a/unix/CMakeLists.txt
++++ b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++	add_subdirectory(vncconfig)
++	add_subdirectory(vncpasswd)
++	add_subdirectory(vncserver)
++	add_subdirectory(x0vncserver)
++endif()
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 9717615f517c..68efa8f862da 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="drm">Build with DRM support</flag>
 		<flag name="server">Build TigerVNC server</flag>
-		<flag name="xorgmodule">Build the Xorg module</flag>
 		<flag name="dri3">Build with DRI3 support</flag>
 	</use>
 	<upstream>
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 5bbb399656a0..f7f753594c8d 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
@@ -182,7 +182,7 @@ src_install() {
 		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
 
 		# install vncserver to /usr/bin too, see bug #836620
-		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
 	else
 		local f
 		for f in x0vncserver vncconfig; do
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
new file mode 100644
index 000000000000..93ca0f1495e4
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? (
+		ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
+		https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	opengl? ( server )
+"
+
+CDEPEND="
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/fltk:1
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
+	)
+	"
+
+RDEPEND="${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)"
+
+DEPEND="${CDEPEND}
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libxkbfile
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.0-disable-server-and-pam.patch
+)
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+		eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+		eapply "${DISTDIR}"/${P}-xserver-21.patch
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 903570b2dd06..d8ae0f70e5f1 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
@@ -16,7 +16,11 @@ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	opengl? ( server )
+"
 
 CDEPEND="
 	media-libs/libjpeg-turbo:=
@@ -48,7 +52,6 @@ CDEPEND="
 		x11-apps/xsetroot
 		x11-misc/xkeyboard-config
 		opengl? ( media-libs/libglvnd[X] )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
 	)
 	"
 
@@ -79,11 +82,12 @@ PATCHES=(
 	# Restore Java viewer
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
 	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
 
 src_unpack() {
 	git-r3_src_unpack
-	unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
 }
 
 src_prepare() {
@@ -99,8 +103,9 @@ src_prepare() {
 		eautoreconf
 		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
 		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
 	fi
-	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
 }
 
 src_configure() {
@@ -112,6 +117,7 @@ src_configure() {
 		-DENABLE_GNUTLS=$(usex gnutls)
 		-DENABLE_NLS=$(usex nls)
 		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
 	)
 
 	cmake_src_configure
@@ -168,11 +174,7 @@ src_install() {
 
 	if use server; then
 		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 
 		newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
 		newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
@@ -184,16 +186,7 @@ src_install() {
 		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
 
 		# install vncserver to /usr/bin too, see bug #836620
-		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
-	else
-		local f
-		for f in x0vncserver vncconfig; do
-			rm "${ED}"/usr/bin/${f} || die
-			rm "${ED}"/usr/share/man/man1/${f}.1 || die
-		done
-		rm -r "${ED}"/usr/{sbin,libexec} || die
-		rm -r "${ED}"/usr/share/man/man8 || die
-		rm -r "${ED}"/etc || die
+		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
 	fi
 }
 
@@ -202,6 +195,7 @@ pkg_postinst() {
 
 	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
 	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
 		optfeature_header "Install any additional display manager package:" && \
 		optfeature "proper session support" ${OPTIONAL_DM}
 }
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index f2081d4e1f6b..5c55636df506 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,4 +1,4 @@
 DIST youtube-viewer-3.9.7.tar.gz 260891 BLAKE2B 7178371f5749c8933d31720f1e42494ff16c73c50b6c6be19b0d1ce68fcd836cfc9a256f33c5fe6af48785c5c26ae3515afe5601e0d6141e0cbbc77e13f21da8 SHA512 77d94d706055f3657bb032f44fa52ef5d89554d1ad64d78d579d89849f9a5c6d24560421d5e6e01b6a51eb134c6eff76e523091d483b6dbffd4f7a500471e509
-EBUILD youtube-viewer-3.9.7.ebuild 2140 BLAKE2B cee1d7dd1e426f521202b7b1310f83b8e1dd3cc90e948e49b9d9de63e6c7815dbdbefd708c2cedbbbebbb4b0bbdbd8346b7c9c238908e3f1c1658cb9e5eced1a SHA512 8020468ed0cf2a56bbbbba82dc65d186f4f1c7b4307a13ce57aeae72cf03b7839c3c9270c05bdd018d7faec3047c2237680f2cb7c87a19fa9b5088c79f69e000
-EBUILD youtube-viewer-9999.ebuild 1900 BLAKE2B 10be7cee8b222fcc813b776dad361f83dbaacd7c4dcc692b5d81ba9827091d87cb356f61494dafaf996646e885e6dd0010474b2f81e62224c5c023a745f34c58 SHA512 db4b4552b17fde0f437aa819c16ef9fbfc84f9fa0895f34be986f2e0b2d265a9239aec314f359a18b6e77fbff8f89090a0574b66716a7f2f2aa62440bc537980
+EBUILD youtube-viewer-3.9.7.ebuild 2155 BLAKE2B 75dc00d0d8174c15cf2cb2ea16ad9a7be1f6c3d542d2cfc6f897a8a6caed037f2c4e4dfaede51da221b0992fa2a3958d55fc61a2b60e5b4c5ca87d919defffba SHA512 43aad96ba6ce9170f25c10d48989ccad746602085ae5eba7c1176231a79cdab501a680ff4f617eea8536d495f639a436ba521342b91bb9d52e76ce60f98ba3a7
+EBUILD youtube-viewer-9999.ebuild 1900 BLAKE2B 91781403d8f6cb1d78d5515df34c14eabd44321be2710a7a27309482f2483dd0be0bfba8d969b59598daa3d2e902cadf37836aae8fda9bf257001489f4aa3008 SHA512 f88fc45d40545515638960f84e11e9693ea9c37c17cb11cceaf126dddaddef3fb95e6954d8ab8b062c3c5619e3f6c41055062407c2af6789c55d7cfe335e527c
 MISC metadata.xml 856 BLAKE2B 669dd186f7ce3cbe787ad2fc06dce3104597050d4eef4c02bb26d8256dabb082dc2e5826c2184ffcb6fc18217189d9953d902245b8e2119d3419eccfcb7a7636 SHA512 a3ca8ef08797a5fe27ce5f29a35f7989b736364f8597c2c9726dd92db0f2534c61fc7745f7f674614c832b7c314ee5e3cedce54f570679d81b52781fb7124f1d
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild
index a50388a8f25e..e1801189acc6 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DIST_TEST="do"
 inherit desktop optfeature perl-module xdg-utils
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
index 64a0ecf7ea73..b5135da0e18f 100644
--- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DIST_TEST="do"
 inherit desktop optfeature perl-module git-r3 xdg-utils
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
@@ -41,8 +42,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-perl/Module-Build"
 
-SRC_TEST="do"
-
 src_configure() {
 	local myconf
 	if use gtk; then
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 98957596a43d..8ea015c85c49 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,7 +1,5 @@
-DIST yt-dlp-2022.5.18.tar.gz 2277146 BLAKE2B 95237fcb12aef9d849e5cc5603baeb5b8e6f416db2dad04d8ea7408b966dcd0d05ad3e276342fb9cc3551293a569b48d2b806c360e95c9c96ffb17dff4cbeb9a SHA512 d0c11e6dba336124898e73234c5935386163af8a9dbbe3e2c38ec834ff631557a763e5224c30747dcffcf98364b95b7f1b6121c50ef91ed56653e2ce453548b5
 DIST yt-dlp-2022.6.22.1.tar.gz 2314891 BLAKE2B 4c3e854f89281be9c8c301be0ebaf27434f04a6e26f7fe3bbb60e4d68d36605d5d2fce8ae9245c5e6421913bea90cbd4030d30babed81bdd9df56c3c73dfbcdc SHA512 0a0a4b25e0a75774bc659770af7d83a307d2ff4a3eef11c02ca422c0f4920ba47e02350cd72a4c4a4903aa7f97879b979c755318d3b48def6be738e09d72c3c6
 DIST yt-dlp-2022.6.29.tar.gz 2321677 BLAKE2B c1c6e18af961c7d433fae432ecf38feb28bff315ad9a3949c431f35f46a469460ade8a44e23f699d248dee1088bd507981479ab009c3e8152508c730ff146683 SHA512 f6832e70a73a3b787af9a9e2c4219bd593d2eb0e4c37a0d5696a5a11413a7230f4ca5e480db43713477fba6eae076c600ec98f24adb5c651fa5fbb9fdd83ad45
-EBUILD yt-dlp-2022.5.18.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 EBUILD yt-dlp-2022.6.22.1.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
-EBUILD yt-dlp-2022.6.29.ebuild 1829 BLAKE2B 653c11229a14a5f360e24041cee0610d843fd31127712a2460d9d3096a579ad32afb9b09f6eb69fc4695f839c7503bbec0637fb052b2687e86d7439499dfb268 SHA512 be1ee1cc642fa36d49dc26737e8eba82e63c49b01e864c757923ce0021e07dcda1e6823400eecaadf3cfcd3b4b784d64606bbb801acde5e064ef14b32f02cdeb
+EBUILD yt-dlp-2022.6.29.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.5.18.ebuild b/net-misc/yt-dlp/yt-dlp-2022.5.18.ebuild
deleted file mode 100644
index 705a62db9da4..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2022.5.18.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit bash-completion-r1 distutils-r1 optfeature wrapper
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# adjust requires for pycryptodome and optional dependencies (bug #828466)
-	sed -ri requirements.txt \
-		-e "s/^(pycryptodome)x/\1/" \
-		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
-}
-
-python_test() {
-	epytest -m 'not download'
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-
-	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
-}
-
-pkg_postinst() {
-	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
-	has_version media-video/atomicparsley || # allow fallback but don't advertise
-		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
-		elog 'as "youtube-dl". This is strictly for compatibility and it is'
-		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
-	fi
-}
diff --git a/net-misc/yt-dlp/yt-dlp-2022.6.29.ebuild b/net-misc/yt-dlp/yt-dlp-2022.6.29.ebuild
index 775abf17078d..705a62db9da4 100644
--- a/net-misc/yt-dlp/yt-dlp-2022.6.29.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2022.6.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index fa89427e0ea7..73587909fb3c 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,5 +1,3 @@
-DIST ytfzf-2.3.tar.gz 3249215 BLAKE2B 963442379ea324aa6f7b4077df417815ec1e1822d1598029efd397e2a29996ae92aa2f18e67ec6f7fea16a5804d3a7875cec625be1f5f49eb35c85dc84f3a894 SHA512 a282f578459ec53e725d1089a5b5efb78dcc66684ce572d0318f6bfd6e222b706418c77eeeca34d4015ed2bae1cb54de10edaab36522d6012c2ac421796ef34b
 DIST ytfzf-2.4.0.tar.gz 3253168 BLAKE2B e25bd13c01f5b035378dd6657358bc2ec67ff29f1db42fc8c07f0f820252efa4e6da6342265ea4107ec3179d317ac9742646a641a1c9e4e2a84360b39df6bf3d SHA512 9b66d8b56bb8a35baf04a5d34614882f8302e2f543d12182188438c50a76cca1182d7ac3a4a7a3d80d7c924478fd3af7968701e5d5ab8531a9d6f4ed5b731ece
-EBUILD ytfzf-2.3.ebuild 1497 BLAKE2B 168bd27352e08dcd0315da0067132a4ff73b852a4f464786a2e21fe10631d6a74769ecb267f346e96c73c7b0ff81580f4d1f010cec88ef068a86e64761e31121 SHA512 fdeac28e638efb39676f03f7087d533490e1d5104c53891be7c86ffbaab3fea779b075c6c0f649b620e05c71ac71c268d41cce5bd6379fa16ff0fe1f5ce4da47
 EBUILD ytfzf-2.4.0.ebuild 1497 BLAKE2B 168bd27352e08dcd0315da0067132a4ff73b852a4f464786a2e21fe10631d6a74769ecb267f346e96c73c7b0ff81580f4d1f010cec88ef068a86e64761e31121 SHA512 fdeac28e638efb39676f03f7087d533490e1d5104c53891be7c86ffbaab3fea779b075c6c0f649b620e05c71ac71c268d41cce5bd6379fa16ff0fe1f5ce4da47
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.3.ebuild b/net-misc/ytfzf/ytfzf-2.3.ebuild
deleted file mode 100644
index aabfab731b1b..000000000000
--- a/net-misc/ytfzf/ytfzf-2.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature
-
-DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
-HOMEPAGE="https://github.com/pystardust/ytfzf/"
-SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-# fzf/mpv/yt-dlp "can" be optfeatures depending on configuration, but depend
-# on them so it works as expected out-of-the-box while allowing to disable.
-RDEPEND="
-	app-misc/jq
-	net-misc/curl[ssl]
-	virtual/awk
-	!minimal? (
-		app-shells/fzf
-		media-video/mpv[lua]
-		net-misc/yt-dlp
-	)"
-
-src_prepare() {
-	default
-
-	sed -i "/^: ...YTFZF_SYSTEM_ADDON_DIR/s|/usr/local|${EPREFIX}/usr|" ytfzf || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	local emakeargs=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	emake "${emakeargs[@]}" addons doc install
-	einstalldocs
-
-	rm -r "${ED}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	optfeature "external menu support" x11-misc/dmenu
-	optfeature "in-terminal thumbnails on X11" media-gfx/ueberzug
-	optfeature "desktop notifications" x11-libs/libnotify
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that ${PN} supports many methods to display menus/thumbnails."
-		elog "This ebuild primarily covers defaults and major features, additional"
-		elog "dependencies may be needed for others."
-	fi
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /net-misc
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)