gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /net-misc
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
108 files changed, 1631 insertions, 2165 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 07e817a921ee..41833f4a0c47 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 08b99edb1d3f..b8b5f9e0d191 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
-AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
+AUX cadaver-0.23.2-disable-nls.patch 326 BLAKE2B a7eb4f01180e584824c1019e5d1b667c907c94041037f48a76bd3f862fe77581ecf74cad5a2806795229b6c0d334c59b971d7ccd7fff773fce4511baf82383aa SHA512 02a77a24ee2d14d2aa2da4853691aa9386140959f3af2bdaf092f2cadc7a59d426482f40b1fb35adfd7eefffda5c93378b4481c18ca2092db2339eb599912b20
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
-EBUILD cadaver-0.23.3-r1.ebuild 1122 BLAKE2B d0fd999888ab00cbe9a7312fcaa8cac3d954cf7148e44c7b62ea464f8fab6ea351431c837a4f832893167c746a930784cc263fdab91514fc2c5ba7c03078c8b9 SHA512 f4bc5e9bc726079e12153fd812ecb105deb6b144448dc6a16bd2a90fabc0774f05fd2297811f673c49397eff1960ad488a40ebb77659a1575924ae4d539f5fe1
-MISC metadata.xml 360 BLAKE2B ae27ed2b7da27e4f375903df19c5a82e8fbdf2a4db8190f3e99157c8fe8fe54e181e45efef941aa9d16a413b8c95c0a42eea54d6e6272c02609b11e68bdf7739 SHA512 bbe65b8f140a7dfe870af1c97b8bc4a3f0b034a234f344fc4620965ebe66d9eea804806b43409a106ba905b29d74e8e7cdeff065a89f5beb751e7f70c1b54700
+EBUILD cadaver-0.23.3-r1.ebuild 1124 BLAKE2B 689eacfd7413e99fc6969e0080e1f994124771c7db219662d25415199f8668d1d76992266501f47dc83d4a166602e9743718635a0f30b7913b8946c0b3ee231b SHA512 98fc802b3cf5eb7315f52ef619427bcfecbbfb65297b41ee5059f1b9d2c458b55e5a71e86405ba25163123c492428c6078b13d1e8b0419d83dcc73383dba1349
+MISC metadata.xml 491 BLAKE2B 99bb35983942018b3b7aac9076bc9a208b867b8d73fc0056d63a01792b7341deec01441027bf62be08f559a5b2b884532d6a3d0b991b1b4028702107287f7fd7 SHA512 a4ef5ad90dd33c80b23f8fa855971eb14973541676e3ae1387ecc2f887b0e43e277be4ca2995a743bcda4cfb47ecc4531d65d3606719e265da349a05643c6bab
diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
index 106581d1064d..422a87282d65 100644
--- a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2003-2021 Gentoo Authors
+# Copyright 2003-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit autotools
 
@@ -11,18 +11,21 @@ SRC_URI="http://webdav.org/cadaver/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 BDEPEND="sys-devel/gettext"
-DEPEND="<net-libs/neon-0.33.0:="
+DEPEND=">=net-libs/neon-0.27.0:="
 RDEPEND="${DEPEND}"
 
-DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
+DOCS=( BUGS ChangeLog FAQ NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23.2-disable-nls.patch
+)
 
 src_prepare() {
-	eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
-	eapply_user
+	default
 
 	rm -r lib/{expat,intl,neon} || die "rm failed"
 	sed \
@@ -31,7 +34,7 @@ src_prepare() {
 		-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \
 		-i configure.ac || die "sed configure.ac failed"
 	sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed"
-	cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed"
+	cp "${BROOT}"/usr/share/gettext/po/Makefile.in.in po || die "cp failed"
 
 	config_rpath_update .
 	AT_M4DIR="m4 m4/neon" eautoreconf
diff --git a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
index ead3d70553b8..80f029f4f40f 100644
--- a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
+++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
@@ -1,7 +1,7 @@
 Fix building with --disable-nls.
 
---- /src/cadaver.c
-+++ /src/cadaver.c
+--- a/src/cadaver.c
++++ b/src/cadaver.c
 @@ -838,11 +838,11 @@
  
      progname = argv[0];
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index 9bb005e5c177..a09139478be5 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -3,9 +3,13 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
 	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">notroj/cadaver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 84596b2a2a1c..dbce6288a8fd 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -5,5 +5,5 @@ AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B c8ccad409a64f1a0232fc800fe3787ece5
 AUX cfengine-3.6.2-sysmacros.patch 555 BLAKE2B e1111a7cd5dd1b28787c0db6af1f55fed2b95ac3f1267eb5ad516584f6bf4c070a5243185808ce772c2a70171bcf3e5eb331bc0cfc5b82a04e8dccd99fdce761 SHA512 404468a5e10b535c8f10c2cff9c8928730a4323145cd29cfc080cd3af9effef1b890fb038f3dad8d84ba67d1af72b402d35cc1f382ff34fb0cdd07b8af23732c
 DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
 DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
-EBUILD cfengine-3.6.2-r1.ebuild 4208 BLAKE2B 28ea0836f48416205c0b0a03ec4155002437a1b105d518e26608bb8829a9e665ccf45b9147d9907e647cf720894f96fe5b585abdb9eaab81f7e598348b3c1901 SHA512 79ea2164cc995656dca2a99fb24b86a06b26f40ebef81209ccffe2b63896ec9f0963042712ca932adb60878d5ad86ecfd0d2b97a5e12a39278b5047f8a245175
+EBUILD cfengine-3.6.2-r1.ebuild 4223 BLAKE2B d2d7a41ddefc5649a5dee43e95416fad9ecab14debaedf8a7f1cd8ad67dbc5fde1a104b89921c330c203e8eac234420be509c42943e93ad345236adcf1f8393a SHA512 c60eefa03c939b6f01c9f8d9c9a8b0249a9882a30ddcf8a716e16def13ca3bb7eeea9bac280e9f50735ef2298445c750d21cf7b4aee607e4c67edd66f9b23f68
 MISC metadata.xml 2059 BLAKE2B e4209b077bcc24a7023de92434a76ff2ba6c7eeeb7cb0cfcc5ffaf5b013581c5d3d7d76b9e06fb8ef60836f82d874987cf25b673bf9dbd7bd43181c06fc64220 SHA512 46eeec6d3549f1295fb5de51690ae3735057784c34c4950ba0eb9cc38fed355010602e6c36a03026b6465c4bbd6183ecb0ad946c991910ee707de0c524001417
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 7ade88aede8b..e9cd762ac986 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit autotools epatch
+inherit autotools
 
 MY_PV="${PV//_beta/b}"
 MY_PV="${MY_PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="An automated suite of programs for configuring and maintaining Unix-like computers"
+DESCRIPTION="An suite of programs for configuring and maintaining Unix-like computers"
 HOMEPAGE="http://www.cfengine.org/"
 SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
 	masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )"
@@ -22,7 +22,7 @@ IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet
 
 DEPEND="acl? ( virtual/acl )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:= )
 	selinux? ( sys-libs/libselinux )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	qdbm? ( dev-db/qdbm )
@@ -39,9 +39,11 @@ REQUIRED_USE="^^ ( qdbm tokyocabinet )"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-ifconfig.patch"
+		"${FILESDIR}/${P}-sysmacros.patch"
+	)
 	default
-	epatch "${FILESDIR}/${P}-ifconfig.patch"
-	epatch "${FILESDIR}/${P}-sysmacros.patch"
 	eautoreconf
 }
 
@@ -83,15 +85,15 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	# fix ifconfig path in provided promises
-	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
+	find "${ED}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
 
 	# Evil workaround for now..
-	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+	mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
 
 	dodoc AUTHORS
 
 	if ! use examples; then
-		rm -rf "${D}"/usr/share/doc/${PF}/example*
+		rm -rf "${ED}"/usr/share/doc/${PF}/example*
 	fi
 
 	# Create cfengine working directory
@@ -103,7 +105,7 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
+		dosym ../../../usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use masterfiles; then
@@ -130,10 +132,10 @@ pkg_postinst() {
 
 	# Fix old cf-servd, remove it after some releases.
 	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+	for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
 		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+		rm "$fname"
+		ln -s /etc/init.d/cf-serverd $(echo "$fname" | sed 's:cf-servd:cf-serverd:')
 	done
 
 	if [ "${found}" -eq 1 ]; then
@@ -143,7 +145,7 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
+	if [[ -z ${ROOT} ]]; then
 		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
 			einfo "Generating keys for localhost."
 			/usr/sbin/cf-key
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 108732543a0b..664dc2f46f13 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -10,6 +10,6 @@ DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e7325
 DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
 DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
 EBUILD chrony-4.1-r2.ebuild 6684 BLAKE2B b366d69c4a2068b512bd7cbb14b7387ccd02947a7cb94f21bfc552ecc904829abc6dee333c4bbc11b9a3cdc97aa6c95d7a1c662fea22cc7df9b1c83f566873d9 SHA512 621e244dbaa0bff3bb74d5d7f92c9db85104f4c7ec02e774cd96fb1a7012141699c711e06b8b5a92be8ac70876ee933280bcabbea7a6f35593eec5d41b203028
-EBUILD chrony-4.2.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
+EBUILD chrony-4.2.ebuild 6643 BLAKE2B 42de896b755ab3992c620c440adcfbf088e6b325085fdaa7bf1d2798c5219781b5741052d605541054536925524f78734f8c4cb0ad04d5b4d279422212ecd2a5 SHA512 7843e59659e2c1fdc381c0e2995e198e21e180abbe11faa7425c13348950c2f997d2caef1ee899d3f7e38666f21224e969493a2167e967c6d6ce8445215e8499
 EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.2.ebuild b/net-misc/chrony/chrony-4.2.ebuild
index 57c2893c3532..51af47377ea6 100644
--- a/net-misc/chrony/chrony-4.2.ebuild
+++ b/net-misc/chrony/chrony-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 	fi
 fi
 
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 1252dd69ed31..bff61cf22034 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,6 +1,8 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.40.tar.xz 758516 BLAKE2B 66834032f82e80a6f950d7ff823dc5f1f45090f3444b5a0241cabd0346cf9749b8780b624ce6a8e505305cc1a75423e5a95a7b1f77a282d231845bc33389924a SHA512 33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f
+DIST connman-1.41.tar.xz 758556 BLAKE2B 45e522d4a3a8d1a2f8eb21612d85435020f51387d4285da65da56d022df2d521f81a782af82387bdede8b71bdc591b9ffb8b79e1b1dd9d1d83ffa96eede9c1bd SHA512 b7880d908635ab9350c12e207213d20b11c1a50afcb93ae92e1fc57d4345bf792afe1a5534650e18b8cd05a3766ce9993083b2d659e49f87b867e6f2c1a83b2d
 EBUILD connman-1.40.ebuild 2769 BLAKE2B 35f60256a6caacccab4669f29d4fc85dea55eee4d368590ffaae072e1898a4b892b47efa5e244fd83c6edd7266691ce086b96e55921fc4aa9bb1a08de80b64a1 SHA512 14d15a1134310baa57b5de17619fe06faaffe465a4c9a8219be58d40c65048d03f3c2339a67ae36747db31a3a3e9ccb1247c833cf2755741f520b7a28a8b1dc4
+EBUILD connman-1.41.ebuild 2775 BLAKE2B 43ffd94a5bc41d57f008c8af34819ab0655c5dc5bbe866375818779f0ffaa304f507fa650f0e40a2c63b750f0708a425448b6808d7866a60d1f2d05b39ade5a7 SHA512 498fa57ed4e5f863c66c1a2b4428f54d964b4e8e91d98b5f7b66c1b7c7dc38da3ac499f5e6de070255d9319c33136e93cd6f0742f7b2ce8c41894dde1082ac14
 EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495
 MISC metadata.xml 1303 BLAKE2B 5fd7c4c795c7003e86fb1f47f9e4569bfce981b13199efe2021009ba659cf67e2afa554fb99ded6f45985a43b09003e483d4c2283434efe26d4e06f7c97df6b0 SHA512 5575e585a4756330c323a2f000a53d80a9bf76225e294888542b5020c72846b27a4c4432d874b1952ed1c7ed4ee26e35925a75fd89d867b82c276784f50c3620
diff --git a/net-misc/connman/connman-1.41.ebuild b/net-misc/connman/connman-1.41.ebuild
new file mode 100644
index 000000000000..75fbfd795b38
--- /dev/null
+++ b/net-misc/connman/connman-1.41.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	iwd? ( net-wireless/iwd )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--runstatedir=/run \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable debug) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable examples test) \
+		$(use_enable iwd) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable networkmanager nmcompat) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable tools) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process connman_resolvconf.conf
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index de264b1412c7..20f5b0677281 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,6 +2,8 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 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.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab
+DIST curl-7.81.0.tar.xz 2486388 BLAKE2B bf8a3a03564648a9d7a5b4e7a523d840230f03237cf9eb5b07dcb4f531b036eb8111c1944bedd0c1df188e09a09468b3487d24ea50781124bc33d194546691f4 SHA512 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df
 EBUILD curl-7.79.1.ebuild 7955 BLAKE2B fdfb668aa3523341fe5bf6dcb330b75af3279a58202c4aecb7b61a33cf9f9622c6b79eb20803cfcea2320b3d1c5509ee7e6ed6c850da6364c2dd19b3154d78cf SHA512 b9ca03e8d6e96d8e401ac0fa115788226c490e614f76cb9d6c240f5ca64adcb062ff344cdfe7666979697b9e53a436b56a5a94f1137faf723fd247029c4e873d
 EBUILD curl-7.80.0.ebuild 7504 BLAKE2B d55d48dcbbf407a8bdd87005b264a755221085d1ecd92b334d2136e54afdf2675b5fce23aa28cd457ef2881e42bd71cc6b2b1a25c7f6d56b979107b3620f765d SHA512 7c35440cefe794b801d8b47d62abcc72a3649fc09e0b11230cf2f7b12296f71421f52707f691faa5f92ae85872a9d90d2c941fb13fc578042ebed75c0bd2c196
+EBUILD curl-7.81.0.ebuild 7504 BLAKE2B de1f81f8fcce949d901f6b9bc473c4fb9da3ef6012b38eb3ed7a23c08b35a3f89d7d2a216d3e098c81b26a0e435053c30a3f229c9daaacefc01cde567f57b7fa SHA512 97b03ac7fe5ca2c2509bd477207dbd31e877b843912d2d27201a026bb1d1c9c9836fccece432d69e48e3363f27405ced25f364d183d628317a854d993d2c5636
 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
diff --git a/net-misc/curl/curl-7.81.0.ebuild b/net-misc/curl/curl-7.81.0.ebuild
new file mode 100644
index 000000000000..7bbb23d3ea2c
--- /dev/null
+++ b/net-misc/curl/curl-7.81.0.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+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"
+
+# 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
+	)"
+
+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/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 3afb72a0f909..3158463f6d6d 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,7 +1,3 @@
-DIST dleyna-server-0.7.0-r1-patchset.tar.xz 1680 BLAKE2B fd6494dc04bb0fc20e677c69b360df30c89b35b6a990a2ce78e87101291307c485a5cb133152eabbd117691eff4d738fa2e33303128c4305a0c1e5137c67781d SHA512 7f37ba456f84bd9e45b732d40467e08ba5ce775c0f1d30011157e10a6f3010b904fc52a4d699a211dd66b66c54ff6e98b109aa5ba9c04112f81de1529d55c425
-DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800
 DIST dleyna-server-0.7.2.tar.gz 105415 BLAKE2B 3a38b97f45c04be1e48f87a1653d5ca4776eaa4763d8ce8639f77f5f0512c2331ccbbfe09a5493152c35655989652de071ba9658735af8ab137d77b0b28ec054 SHA512 c6a4dc66c2ae745a3c5d7eb70d7fc97adecc73b80ad5fb4ada710c0aa6f8bd5d3a1abb14acfe0a77d3e148e2159868acf1250599c43379c3d1c1337581de1536
-EBUILD dleyna-server-0.7.0-r1.ebuild 796 BLAKE2B 72c19c93a88bce019f920be5b04d4618ce68ae90e116273402145aa9f15b9e84a0591fca3c7fe2461df5ad04ff800bdb9a14eb418f9b9243fbed718fdc82525d SHA512 39dace6c4ce4574d39d5477cb23152f4760078ae865784a74710587608250a9908f06de3e06f3607a9aafe9ed416af9a54537a354aa085443a4fa630e19af1f1
-EBUILD dleyna-server-0.7.0.ebuild 674 BLAKE2B 61ff666be0dd8d68a5ccb443f08e7597c2cf196c8de5db2c018bf88b574a982a677f51cbb4e09e18e022c562911194d27b39aa2ca7cf7fe04e582edce63c1a55 SHA512 64b58c5e4285d80b3e55a16b60a15e1ca531cc96ab84ea599839c2f206dc9d3a85441ffbc3ba0ed640a3ab17171a45722fc1ea99778c3e2fa686ffd9646c75f9
-EBUILD dleyna-server-0.7.2.ebuild 686 BLAKE2B 94bf089986e60d99d3d36c71579c2a5d80434b6933f2056dd9774fc64944dc854f673cadddd9c36ac03b97a453cabe22f9d28d288224e4a076188e23978b293f SHA512 9f2c0ab9461137a750bb28223f2458cf75afff7af21d2b131aa38c373f14c1265e97d96323aec08fefbc3bcddc763318668a6f89f9f9ffa38c99b949be5cc8b0
+EBUILD dleyna-server-0.7.2.ebuild 684 BLAKE2B f3114236d54f0f28d53ea2b6d9063f74fc00d135f56e8346e9ce1043a061e3b361ac6d3ba7a443077fd21b5d97c4067cdc91373e12a780a92cbc199b1abe28f7 SHA512 89b3e2a19ab4b5087b61e86e7701e7a4811b0fdfaf8415ab9b7086a6f4986d405602d7f7114c2b67074760ac82f957942f225890dad0bb09fb3e95364f4e270a
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
deleted file mode 100644
index e154df66320a..000000000000
--- a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)"
-HOMEPAGE="https://github.com/phako/dleyna-server"
-SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PF}-patchset.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=net-libs/gssdp-1.2:0=
-	>=net-libs/gupnp-1.2:0=
-	>=net-libs/gupnp-av-0.11.5:=
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=net-libs/libsoup-2.28.2:2.4
-	>=net-libs/dleyna-core-0.6.0:1.0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/patches
-)
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
deleted file mode 100644
index 40dfe39201cd..000000000000
--- a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)"
-HOMEPAGE="https://github.com/phako/dleyna-server"
-SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=net-libs/gssdp-1.2:0=
-	>=net-libs/gupnp-1.2:0=
-	>=net-libs/gupnp-av-0.11.5
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	>=net-libs/libsoup-2.28.2:2.4
-	>=net-libs/dleyna-core-0.6.0:1.0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild
index 2e55eaf9f961..d94c132858d8 100644
--- a/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 1da909fbbba2..8e1f2bdcbd2c 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,15 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
+DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
 DIST dropbox-lnx.x86-138.4.2392.tar.gz 100212564 BLAKE2B 901212edd0a0034cf8040bc745d0ce50c38f922305cad9c07d4c48be935758658e729087008ca039273b2213dd756dcfd212aa10a803bc14537a570e06de5d5c SHA512 b17f77267cfe08ed4d5be3a2087eb8c1fdd7112245aa7f63f7d334f404bc6617dfa45f8f38918971bed051d7f3a9e765b910c597de63e2d48a5afd3d3d9a4fa4
 DIST dropbox-lnx.x86-139.4.4896.tar.gz 99109699 BLAKE2B 42de55420b78be67f863a4e53c252afaf7123ced2df2a597c44cdd4f62482a494c078446a6de15301ee2fbcfda08e8232d8964b9c11d40109b397142ceeb0470 SHA512 57d31a961eec14887af5ac1cadd06b202b4d181e864000f10596637602cf55ad9ceebb5442aab06bf09abeadce7ded4b4794ccfc299a4c0e9dbd6945311d45f3
+DIST dropbox-lnx.x86-140.4.1951.tar.gz 99178001 BLAKE2B eb9f6686386ea7f844f9284786fc9f8ec33653c740de8c6b14cf2853fb21fd883cc317ecf57232d479a5964662bfbe65c675871fa946a68869f797b766bb0724 SHA512 857e97d7091fc4c10c693828424ca0df367c8d4456092e44eade0b6d5057a10923db02a23620b5eb5055ddb53913a7ef7b09ff385529a9da7b0ddf39ae13daa3
 DIST dropbox-lnx.x86_64-138.4.2392.tar.gz 101870495 BLAKE2B c9e38624814afd47776a04d0cf8f7ce7fe1392a72bc778d322f91e3aa097e2769acfe696366dd98f53b2af5ff87f88a9bb78bc906a3cfcd6bff0cd436fb16bd5 SHA512 6692711545af89bbde6f43bafb76b8c89d813522849ddfc66892d575ee4c315273a4a489a73f6e80f457c8b2059a62100469c4d43dd12f99a98d803fde9701bf
 DIST dropbox-lnx.x86_64-139.4.4896.tar.gz 100772994 BLAKE2B e8e79fb351441f4f619227967c7e74f25ac17d305b97ac51dd71e00dc72ca1d213cfeab2f49ed8bb545386de07c9beac249e881f9dafe485575c57766e29def1 SHA512 7f30247b0caa11dcea1c182644611a66daea43b84a97f829342927b7bb80d71dd0ea0bb602eb107e4b4f83d0f2cc5802a0b07f94c01a48d7af0b8d484dd6237a
+DIST dropbox-lnx.x86_64-140.4.1951.tar.gz 100824435 BLAKE2B 03f35dcd651535dbbfaf593119f1ffe58c5c4ee6e1beaac178affdd560e3aad406d36a4b990130915c0152ee9694133142073ad420bf72d6297279f804e358c8 SHA512 97e85eb5426ec26361b57ab07e34b5aefd17925ba2ca73b1f75b006cd6697e42e08b75781ffbef9456ce2e1c36f549c0c7ebf823b495331c98c5fd5c55724471
 EBUILD dropbox-138.4.2392.ebuild 2673 BLAKE2B ea072896d60698af6f9e20e5fe55d846c858748a04d3b7530df6bd5e33b159a76b82046b246a2c38ff56bfc0503c7a71199e5cc2c29731d45349a5f39c3553d0 SHA512 929ebc6094fac362fed2d41379ff535a632da9a9e3c5ade2b1d66a591e9c571b8bb981cfa109a8460918e5e89af49a10071cb7ba4f972d3d66bed673567320c0
+EBUILD dropbox-139.4.4896-r1.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 EBUILD dropbox-139.4.4896.ebuild 2675 BLAKE2B b90735c78f9beb3ed1b4b291bd3945fe2abdeadd9bac0580fc9bf0400149f54f8153495a6ce9d0affbeabf515ce3753d7db9e16be304e32c440eea21308aa422 SHA512 57e11c59311c192269b40d2b9025dfec194f0013d5a8714477f7f3c7ca8a0169c2b2d07c8b744fe728f01238de6c96439c0d16ee9cddfd4381f9401e56a5372d
+EBUILD dropbox-140.4.1951.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-139.4.4896-r1.ebuild b/net-misc/dropbox/dropbox-139.4.4896-r1.ebuild
new file mode 100644
index 000000000000..0c3e0f739306
--- /dev/null
+++ b/net-misc/dropbox/dropbox-139.4.4896-r1.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/dropbox/dropbox-140.4.1951.ebuild b/net-misc/dropbox/dropbox-140.4.1951.ebuild
new file mode 100644
index 000000000000..0c3e0f739306
--- /dev/null
+++ b/net-misc/dropbox/dropbox-140.4.1951.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/freerdp/Manifest b/net-misc/freerdp/Manifest
index eb37919a73df..1280a728da8e 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,6 +1,10 @@
 AUX freerdp-2.4.1-rdpei-free.patch 859 BLAKE2B 2bf990acf4b4294bedb11acd824637b168fc9e03c4e41b9437388e0e09c2dbfa90e955c254fef2d8c6cae7e796b09cc1875953688c58c13462bc7b05d2a85b11 SHA512 5877a95569d0f3e099d1de35bb8ee5fc8c6889f76aa3f410bd095932440ab6c50c0fc88322ff8982a0ee34a93da97becfa07b52a76804fc262b9a06d9e789f20
 DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a
+DIST freerdp-2.5.0.tar.gz 7303832 BLAKE2B 93f7428f04e0f5faaf93c08acd75cb4af655b52fc89653d470f28175e8d3fad9b61c9c19bfd7fb7e6edf947c9cca12a1d6a98b410409cd9f96007de1bc52b034 SHA512 d9f70bc12175d4ab1c874a2106d37c7d8c0f5e1f81ef30329518eecc5c58c0131429243a3faa6c7d68b187c8f43f93000a1de0e39e81ab71ad626e33f373f33d
+DIST freerdp-2.5.0_p39.tar.gz 37767 BLAKE2B ae520958e2b1418c46d20c4fb50ecf952d0b0cf2c455dca2d6cf08daf85dabcf2dacb5934240a7c3411ff490903bf15a21f621267a47e81e57edaf520b93c274 SHA512 e7455953f11b82290f6689f4ebaa030e73bf5ea3dac768527027bbb09e4d925208d9b324ae175d28642c161eb0e3227f6c98f4c8717e1f83c81d4399586495db
 EBUILD freerdp-2.4.1-r1.ebuild 2871 BLAKE2B de9740ea0c2a87abab293645ec75da55f51fb63edd01b7335b8783b06294000ddb56681004ea2c190cd4fceb9da70016370cb8cd1be09852f63401d86a19ef07 SHA512 237d458cdeb28bde23fe764705fad0bf5916faaf8ce775963210c24b8c377d6ede9b8c4f7e114593babd79c31716cb4d689ddb28085b70ed1d67251dfe7e4332
-EBUILD freerdp-2.9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
-EBUILD freerdp-9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
+EBUILD freerdp-2.5.0.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124
+EBUILD freerdp-2.5.0_p39.ebuild 2919 BLAKE2B f9f712ac341b9d43db123a21313fb7baa84f58fca229d2453d84b56b7e93de954c158596f54e358bb9c0c446359b039503f9704a3be1dbfd2fb4e7530e169ae7 SHA512 778f79acdc9eeb81dfeb0d1fe3c19823e77ac3b7af925d93d0533dbe0b1f39737b71554bc0ce8404c9e1cddb983b43a749d9a1ad92f1de425f41bf02dbc2bdbd
+EBUILD freerdp-2.9999.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124
+EBUILD freerdp-9999.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124
 MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72
diff --git a/net-misc/freerdp/freerdp-2.5.0.ebuild b/net-misc/freerdp/freerdp-2.5.0.ebuild
new file mode 100644
index 000000000000..670754db442c
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.5.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
+	)
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-2.5.0_p39.ebuild b/net-misc/freerdp/freerdp-2.5.0_p39.ebuild
new file mode 100644
index 000000000000..5755601b61ed
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.5.0_p39.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P%_p*}
+	MY_P=${MY_P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
+	)
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+
+PATCHES=(
+	"${WORKDIR}/${P}"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 50350a7d1f9e..670754db442c 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 50350a7d1f9e..670754db442c 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 9b9dc492c897..7c286d052385 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,8 @@
-DIST gallery-dl-1.19.3.tar.gz 399869 BLAKE2B cef40ac7759bffb42536fed866df946e6c22e333ddae98db149109779dd9439c775722b887898e322de26860aee0990a440aa0812620dadb9d223da09f25d662 SHA512 b50c0e341a0b2b08ddd8f5674c1f4df097b862827f8bca2270d3fd62be619fab8a4c097de9d3193e8161ebcb64eb6c77676c243bca4cabc7dc1d3f192b485ad3
-DIST gallery-dl-1.20.0.tar.gz 407372 BLAKE2B 8d7bd6ed4a769b4d4b3357b146babda2ac36989ce1373977b4902ae350a1e430585a5064205fb2038c62727c13c8b09a010aa9e32a96483783229db6366425b6 SHA512 d373b7a104232c99bfae8f92adc3af5ea51e8a1ccfec6db54831de899f9568be0526c8c7cd8f9cdc4680b8dc8934d483c95172b68cffca6b59b605698e2bca65
 DIST gallery-dl-1.20.1.tar.gz 408366 BLAKE2B f6a40270dd4e4a9df84c852e1c580ffb84e5b282adec0750f59e8ded130e79f336d1ba81ed0abe66f3bdae18aef05bac6c7c7f889a070a9c23a407dc9c51d890 SHA512 7d2c6daa473f1aaa1bef94f3ac2b38c9ce06d6f19d564e7c2abec9ecba4fa7c4f092f765080a4079020a1d2aa7484894a37d9f4b0cca2efad3ca1bf440ebf0cb
-EBUILD gallery-dl-1.19.3.ebuild 933 BLAKE2B f7d5f587bec0896d09db3aa50b936b78d96afe4d0e2501b33588416862eb25225999d51777a623a54c1179fd50a368bc7226ded68fa885372222f5b22fe91aa2 SHA512 85582c518e42919661dad278a4a72092316c4e32d7f7a830c9efe5e0df59c2a7f47913135ab744eda5d36a3c888baca84db8aac9dca8557d41479a882e1e9808
-EBUILD gallery-dl-1.20.0.ebuild 933 BLAKE2B 68ab8a68d180c9c3672feb882c5a416b1884eecbba5b13e3e8b8df4e289b4917b96d94eda15fb5d30943f55276a3e96350c14560d297ce811e4dad780be6edc5 SHA512 bebbb69025617fb35750cf18406ec75ebb0f3836e9762ef3350ca7594be6c18bc3140e241c1b74b2f3811c0c7fb37887be29cdfd25e52b89f5f6651c7b1df5bc
-EBUILD gallery-dl-1.20.1.ebuild 933 BLAKE2B f7d5f587bec0896d09db3aa50b936b78d96afe4d0e2501b33588416862eb25225999d51777a623a54c1179fd50a368bc7226ded68fa885372222f5b22fe91aa2 SHA512 85582c518e42919661dad278a4a72092316c4e32d7f7a830c9efe5e0df59c2a7f47913135ab744eda5d36a3c888baca84db8aac9dca8557d41479a882e1e9808
-EBUILD gallery-dl-9999.ebuild 933 BLAKE2B f7d5f587bec0896d09db3aa50b936b78d96afe4d0e2501b33588416862eb25225999d51777a623a54c1179fd50a368bc7226ded68fa885372222f5b22fe91aa2 SHA512 85582c518e42919661dad278a4a72092316c4e32d7f7a830c9efe5e0df59c2a7f47913135ab744eda5d36a3c888baca84db8aac9dca8557d41479a882e1e9808
+DIST gallery-dl-1.20.2.tar.gz 411489 BLAKE2B e63aaa59d8792edc6e73e70cd46364d893aa39b80b70baec46d5e161111a2eb3e00891ccb092cceff0a07cb5646bb848b94c2a7d929f9aa043716866171aeec8 SHA512 436b8959dd97cea3792be6d87bdedd67d8c7a327f4d332306709850687445d0fd1f2f7b6068a0584ba12b613a975f11185aef0ad34ea8035429c7865435c7839
+DIST gallery-dl-1.20.3.tar.gz 411789 BLAKE2B f2fff5f2bf0c8f5e23625cada06a29078737d6ca869012cd790da4f3f93d8b4cdcd294715a94d6fec41f5184fcd7346fe63144b4dc02bd3680ec171bac0ea523 SHA512 68a53844ed4743f20e17bb4ece168c5dc14cb63f13bce35f25a7d2198894eb18eb84dc2cbc29c1289020db08095783718d14d8fcd3dfed64ed76a235b672861e
+EBUILD gallery-dl-1.20.1.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604
+EBUILD gallery-dl-1.20.2.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604
+EBUILD gallery-dl-1.20.3.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604
+EBUILD gallery-dl-9999.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604
 MISC metadata.xml 606 BLAKE2B 231314cca96ba14b3da1d9876ae9096f321ffd7803dee9c9242b87c7fad20977d9e3a8c5d0fb9060583eea95ec8726c58b9d4a4074972eabd4e6dd34bd263c94 SHA512 8401ded38af47ac11b6a11a1847e6ec5ff4609aef50ec96bca539a2d0601c53d46913decc0a03ffc757f79dc6284072ffd29e2cdab4504e7e1a91a03e006f160
diff --git a/net-misc/gallery-dl/gallery-dl-1.20.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.20.1.ebuild
index e0f925d5ec54..c33edc550b3f 100644
--- a/net-misc/gallery-dl/gallery-dl-1.20.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9,10})
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,ssl,xml"
 
 inherit distutils-r1 optfeature
diff --git a/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.20.2.ebuild
index e0f925d5ec54..c33edc550b3f 100644
--- a/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.20.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9,10})
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,ssl,xml"
 
 inherit distutils-r1 optfeature
diff --git a/net-misc/gallery-dl/gallery-dl-1.20.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.20.3.ebuild
index 885d94ca287f..c33edc550b3f 100644
--- a/net-misc/gallery-dl/gallery-dl-1.20.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.20.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9,10})
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,ssl,xml"
 
 inherit distutils-r1 optfeature
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index e0f925d5ec54..c33edc550b3f 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9,10})
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,ssl,xml"
 
 inherit distutils-r1 optfeature
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 27b14aba3157..c25004ea1820 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-remote-desktop-40.1.tar.xz 63980 BLAKE2B 6f5ebe7f00e2038f88740a994ee90f55b7f3ce6e4ea8898b7326d2f36dea2d89c721cffd253f92cde388b1273ad8d086242bfadaa86e4b87361844b3a3bca5b7 SHA512 39116afa16256820a69e020b71de5458fc5da8154bc8255d2157ff56fc679c39f4608f790d74eb4a0cb10cc61bd27d4172cfc547582100cab5b897644a700ee3
 DIST gnome-remote-desktop-40.2.tar.xz 65400 BLAKE2B 47be88529c365e5ab72b225aae1ad0fdca4748c39476ea1251db8f317e7fc25e90acf0b908f64f0a2111e0c59d8a213ede6945fe75151cdca6ab2cf8a77351cc SHA512 f39feb5b4b89d1c504a07c5dcf5962a4340cfc45c70d806a2b6739512ca80671dd8b7928a6dad83165dbba50b17c7961e329ecae0dd59f3f57f4fcf0f7969466
-EBUILD gnome-remote-desktop-40.1-r1.ebuild 1222 BLAKE2B 75029e6a760aa7bad27a215ed028451113f11602e9197c602f1d063157f99f25d86edc381af68d0719be490c5d3ea47adfa1874a74bc014cfa3584cc43e46061 SHA512 677e47930dc4280b1b77db3e60a9511f6121ba68282d68511d579f57cc94f1d631c64504f986fd7d3a334d7c6216df57da3d5d7f33efa62ef7b61cb4368d3c63
+DIST gnome-remote-desktop-41.2.tar.xz 111000 BLAKE2B 1d6dfcc9860a5253cfb2a8111c5c039e7d236f45fa79a74ddc479f449b01ddb231368c4b604d28a8f796ab33f1648a332e110fd2adb9b739032dba67c029b9f8 SHA512 7636c0446c86748ce51c869734a2d33d8285c30616a28a0358f45d8399fd9f5dba7a1bdb830d3ca4753982ac3b9715604eb5934906645a1c11c58b4342c524eb
 EBUILD gnome-remote-desktop-40.2-r1.ebuild 1223 BLAKE2B fd00425e6695a63a9c2e3f926eaf31c0ea79f5be4254698f35fbc2efdefd7301915df404a6cac8f8d6105a7d880e23478c0f9bec73e9b22d9763276dc474d08e SHA512 129b288f27d27fa7cd50fc6b1e85a3d605b649343a84eb4abc3e0dd552227295127d7e950c85ea5cf2854e93b6200b84e30c10f8932c681a50822829446f8f7f
+EBUILD gnome-remote-desktop-41.2.ebuild 1195 BLAKE2B eb6178bfec196d8139080fa5414f5d90670ccde2fa80bad95fa6c9f1b13b5ec59195e4e28935b32ecdd06dcb2955878280a1462917938911dae6028c903d2f1c SHA512 887d7d4ca98c987088f287c0baaf99e559b07fb92d15899a0dc2bc07dd1a2b351d8c8fa2c6fd11661ecef368692726a2945782750720f02b174daf3d4e6edfdc
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1-r1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild
index 2fead429fc5a..f620ffba9531 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1-r1.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-41.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
 DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+rdp +vnc"
+IUSE="+rdp systemd +vnc"
 REQUIRED_USE="|| ( rdp vnc )"
 RESTRICT="test" # Tests run xvfb-run directly
 
@@ -40,15 +40,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-	sed -i -e '/systemd_dep/d' meson.build || die
-}
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use rdp)
 		$(meson_use vnc)
+		-Dnvenc=false
+		$(meson_use systemd)
 		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
 	)
 	meson_src_configure
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index f5641d73ab3e..8996025a453f 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST gupnp-tools-0.10.1.tar.xz 178164 BLAKE2B 86554b223aec9064e1bb9277e8ff609258868247b82aada52d98259c8a0e6f748f61a41ab8bbea41f8f73b386252ff2922406572782e627c8a70a8cd7ce22842 SHA512 bb95ac0b18e23e89074adec0a5e4e87aa43f98d7b3d9e173f4045bc64e542d5a311dde54a069b3485ebd0f4cdf36c813b5c84f5b9734c5361c4221617bd59a25
 DIST gupnp-tools-0.10.2.tar.xz 181020 BLAKE2B ae6666d0876cfa57df56720b178d4b9bb492d9dbc82582ecaa09d178e20f55b3d045085b20965af2a9efd30fb9de0155f29b824ef004dd67309ed2be0a1fe487 SHA512 acb48b6081851345a01bd4604f4c83beca0fcff627e9d282efd807f5c98739ca4967a428456487e27196d1be6d65dd9482a12267da146e4efe0f61fa5a43c7a2
-EBUILD gupnp-tools-0.10.1.ebuild 695 BLAKE2B a8265d2cd0601f95e250919be5c4d7844ed45a0c3a9a866828a2f31cf10a7542f6f6cc31d7c8314e0d3a72f68c54ef60200186d7dd508ffb2ad3d0c343abee94 SHA512 bafc80fbfe751fc7cc8d452822f68bc031444bff2ff57375fc13b7d970d3a482d8685cd61ca69ce285740cd2f6b3d6c2101784d3612f906ce9ba1bd8361226af
-EBUILD gupnp-tools-0.10.2.ebuild 697 BLAKE2B 6ec0b991a5ea7faf88ea754b711c9ec1a386e72001650c867128ae67917e4f0396688a8b8423e34ba78d5f2c7934886f9a0a3cf6c0274448b5a4c01b405a5fc7 SHA512 214be96c825561240c8f3f8cec3826ab76b0ffcecf3b2be7838834cbd38bfc3d012b20f5a46c34889039c505ebad955a1f61e0ff665934fdf64fdcaa9a74ec53
+EBUILD gupnp-tools-0.10.2.ebuild 695 BLAKE2B e0ff0a4b21136529369cfe4b3dc2266494eca7a2e532a2e0394b12f2e59ea617fbc8bc06619a52476bc906ff6220f67ee0369b11bc23170282605b3eca4e20d3 SHA512 4a77c5525d8b3dfb4d4bcd217dc5f70e5c7690081a5d71730fd3e8a77c73fbfc3d43b1cdb96bd43d03a2be422d9b6ecef688c20ba97c443f29c6668b3710051a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.1.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.1.ebuild
deleted file mode 100644
index 9a5f47d59ef6..000000000000
--- a/net-misc/gupnp-tools/gupnp-tools-0.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Collection of developer-oriented UPnP tools"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=net-libs/gssdp-1.2.0:=
-	>=net-libs/gupnp-1.2.0:=
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/gupnp-av-0.5.5:0=
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/glib-2.24:2
-	>=dev-libs/libxml2-2.4:2
-	x11-libs/gtksourceview:4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dav-tools=true
-	)
-	meson_src_configure
-}
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild
index 5558662142ff..7aa84c55de64 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/htpdate/Manifest b/net-misc/htpdate/Manifest
index b7f75a44a3c0..8d8002cee4ad 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,9 +1,8 @@
-AUX htpdate-1.2.6-ldlibs.patch 916 BLAKE2B 613e7ce001ee6507251d3cca46aaae295b4293e10b8553a49f259bd7722adff8888c10dd9de13cdce042c22b177e10a4cb04b3add97ffe4a8d8a68b8584b4a24 SHA512 c2515949555d70260c21f9cda7b6615a48e44b37c48c84bc356f42595ead0b3c21478e7265a9192e5dcebf00067bb9aa03ae9e9e3ce3145cafc80c6a3a57e435
 AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6b8d787e3cc91ac8870ffd9b95df390bda3c90dd9e186bb6fc2629f56073a97e88fd5dc1141bd6 SHA512 28940548bb15484430cbc63d16eeb03934e6de82cb9729e85450f595712be9caf96e1cb84c55d17dd05f33661c2b657d76bfa8b40a3e0f649a0070aeb8be678b
 AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f
 DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0
-DIST htpdate-1.2.6.tar.gz 15083 BLAKE2B 913337f51fd26e811e33f195e463adc57e2512ba502f668f2429676d962623ea943bdb1d42ceddf6d35e7e8ba727b3f1300b34a8370ed661b3fa5b4b53ef1af7 SHA512 fe7442be5581eea0579060c02fb4ffe52151c6408d1b47afc9be049d2a8b1c8d0acd3b3481680a4b6a50f52622d47266afc0fe8dc67c5bb2a3aca2422e34f23f
+DIST htpdate-1.3.3.tar.gz 16302 BLAKE2B eb19462e1e5d02fe3cda7f4d2c954e2fe4b8dfcc299dc9094466a8652250ce27d37b2cf85716435639580e48295a92ad65521e0420cecac875c9b6e8074d425a SHA512 5d4892ea3626b80e5d529de873f675616dfef156e91d1e574225f91f9496503f55da43aa4f3522cb2b55da7c41dba7d97b3cc557a2704945577ec0243d8bd7f8
 EBUILD htpdate-1.2.2.ebuild 1004 BLAKE2B 5a0491ca50a095a94ff339ab6343c7dae1d359609d3d1d0ec23fa58a2bf85875359e9e50f7e7df849cf84fcc10931c6ccaf18cb8341646ee99bedee7e218ac5e SHA512 0d627e3d4aef1a2f3924382af51207802784cc5cb7c36f3e8a97a9336d5ae398652a580d97567d2ee89e4f0bb885bd3d574fa7b0f6fc0c857bc5c45cc8d900b8
-EBUILD htpdate-1.2.6.ebuild 1531 BLAKE2B 251f6e312942461d3af28f55850940baad3349c8037a7a106829eef3b902225533b2ee62c20b5e985b5c4b725d12cf41b89beed3549d08d00ce8d9a9d30def93 SHA512 a45e9f6f841bcde4ef7cd63b803ec2073b938a0c9568156859d62c2f0fd4a60ee4db6b1b5d3a9c9757df00cf9598a984427c17c290b4bb094796335849a9fa14
-EBUILD htpdate-9999.ebuild 1531 BLAKE2B 251f6e312942461d3af28f55850940baad3349c8037a7a106829eef3b902225533b2ee62c20b5e985b5c4b725d12cf41b89beed3549d08d00ce8d9a9d30def93 SHA512 a45e9f6f841bcde4ef7cd63b803ec2073b938a0c9568156859d62c2f0fd4a60ee4db6b1b5d3a9c9757df00cf9598a984427c17c290b4bb094796335849a9fa14
+EBUILD htpdate-1.3.3.ebuild 1419 BLAKE2B a7e6c5f37ad0f88439655367bbcf85c950cf39bea3bd01190773eefb3f89b27ae0d1a468fa584afa2b83633252972974b83eba241b3230ace191df593af1ad3f SHA512 997518b4bdebe852fe539813ba0024da6a2196f0cc0683dad8a901cc5d5c370f950d6b37ee3f6d12706b246e74167e243d0a1d07d7c55106cc805758054d18e1
+EBUILD htpdate-9999.ebuild 1419 BLAKE2B a7e6c5f37ad0f88439655367bbcf85c950cf39bea3bd01190773eefb3f89b27ae0d1a468fa584afa2b83633252972974b83eba241b3230ace191df593af1ad3f SHA512 997518b4bdebe852fe539813ba0024da6a2196f0cc0683dad8a901cc5d5c370f950d6b37ee3f6d12706b246e74167e243d0a1d07d7c55106cc805758054d18e1
 MISC metadata.xml 332 BLAKE2B 6c0897fc2de1055040f534683bd62cf5341a128d3959f75dc1cae9a356a3ec2524f325eb0dd948492bdbc8718edeec627e8280841c8c61ae1b3cf5c54b246c8f SHA512 8c0feeb2a16e0c085b414735707f98fa0a2727a1b9cb1727511fdae315dcd012c59441d78185ecd6f87feb38db4e787ae267e9fd296fa88d64b76bed0d1c8c52
diff --git a/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch b/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch
deleted file mode 100644
index fea1d85b10bc..000000000000
--- a/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ea14fbcd91e5575bf16bc64b7660a6d02a855d7a Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 31 Mar 2021 15:46:38 +0200
-Subject: [PATCH] Makefile: Libraries belong into LDLIBS variable
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 21668a6..a531f90 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,7 @@ PKG_CONFIG ?= pkg-config
- 
- ifdef ENABLE_HTTPS
- CFLAGS += -DENABLE_HTTPS
--LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl)
-+LDLIBS = $(shell $(PKG_CONFIG) --libs openssl)
- endif
- 
- INSTALL = install -c
-@@ -16,7 +16,7 @@ INSTALL = install -c
- all: htpdate
- 
- htpdate: htpdate.c
--	$(CC) $(CFLAGS) $(CPPFLAGS) -o htpdate htpdate.c $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o htpdate htpdate.c $(LDLIBS)
- 
- install: all
- 	mkdir -p $(bindir)
--- 
-2.31.1
-
diff --git a/net-misc/htpdate/htpdate-1.2.6.ebuild b/net-misc/htpdate/htpdate-1.3.3.ebuild
index 033790209271..eedff8c28a70 100644
--- a/net-misc/htpdate/htpdate-1.2.6.ebuild
+++ b/net-misc/htpdate/htpdate-1.3.3.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="https://github.com/angeloc/htpdate"
+HOMEPAGE="https://www.vervest.org/htp/"
 if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/angeloc/htpdate.git"
+	EGIT_REPO_URI="https://github.com/twekkel/htpdate"
 else
-	SRC_URI="https://github.com/angeloc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="+ssl"
@@ -20,12 +20,14 @@ SLOT="0"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
-BDEPEND="ssl? ( virtual/pkgconfig )"
+
+# Test suite tries to connect to the Internet
+RESTRICT="test"
 
 DOC_CONTENTS="If you would like to run htpdate as a daemon, set
 appropriate http servers in /etc/conf.d/htpdate!"
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.6-ldlibs.patch" )
+PATCHES=(  )
 
 src_prepare() {
 	default
@@ -37,17 +39,12 @@ src_prepare() {
 }
 
 src_compile() {
-	if use ssl ; then
-		append-cflags -DENABLE_HTTPS
-		export PKG_CONFIG="$(tc-getPKG_CONFIG)"
-	fi
-
-	emake CFLAGS="-Wall ${CFLAGS}" CC="$(tc-getCC)" \
-		$(usex ssl 'ENABLE_HTTPS=1' '')
+	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
+		$(usex ssl "https" '')
 }
 
 src_install() {
-	emake DESTDIR="${D}" bindir='$(prefix)/sbin' install
+	emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install
 	dodoc README.md Changelog
 
 	newconfd "${FILESDIR}"/htpdate.conf htpdate
diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild
index 033790209271..eedff8c28a70 100644
--- a/net-misc/htpdate/htpdate-9999.ebuild
+++ b/net-misc/htpdate/htpdate-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="https://github.com/angeloc/htpdate"
+HOMEPAGE="https://www.vervest.org/htp/"
 if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/angeloc/htpdate.git"
+	EGIT_REPO_URI="https://github.com/twekkel/htpdate"
 else
-	SRC_URI="https://github.com/angeloc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="+ssl"
@@ -20,12 +20,14 @@ SLOT="0"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
-BDEPEND="ssl? ( virtual/pkgconfig )"
+
+# Test suite tries to connect to the Internet
+RESTRICT="test"
 
 DOC_CONTENTS="If you would like to run htpdate as a daemon, set
 appropriate http servers in /etc/conf.d/htpdate!"
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.6-ldlibs.patch" )
+PATCHES=(  )
 
 src_prepare() {
 	default
@@ -37,17 +39,12 @@ src_prepare() {
 }
 
 src_compile() {
-	if use ssl ; then
-		append-cflags -DENABLE_HTTPS
-		export PKG_CONFIG="$(tc-getPKG_CONFIG)"
-	fi
-
-	emake CFLAGS="-Wall ${CFLAGS}" CC="$(tc-getCC)" \
-		$(usex ssl 'ENABLE_HTTPS=1' '')
+	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
+		$(usex ssl "https" '')
 }
 
 src_install() {
-	emake DESTDIR="${D}" bindir='$(prefix)/sbin' install
+	emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install
 	dodoc README.md Changelog
 
 	newconfd "${FILESDIR}"/htpdate.conf htpdate
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index bf22533a61cd..579a3a695507 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -3,5 +3,5 @@ DIST httpie-2.5.0.tar.gz 1105177 BLAKE2B 6e16868c81522d4e6d2fc0a4e093c190f18ced7
 DIST httpie-2.6.0.tar.gz 1133495 BLAKE2B 3ac61fc68ab59ac7523b030a8c7af85c4af05357aa19282b514b813351efabe783f47ab82d292117e0a9170ff793b71356941dc4eb159c585629cae3adec9b5a SHA512 acd7dc847b67e27909c49ccddec84321c4d73fa5b49f06ce3d94d790093a8f168a1c6627bc4921ca8c0e48b9904f38e17935b645495e2313d16ac2eecf659038
 EBUILD httpie-2.4.0.ebuild 1577 BLAKE2B 09c82238242dd6bc2bfede83fd47e219ca29f34ca848b660f097156f4576d65ba6a575bd08c98ccf70a8113638d73195207e7f1f2f91a9ffe6e7a18ecf47075f SHA512 68a57ce1e74b68e0245a8370531ce9382b899f0ae732412eace4988cb068aedff5eb98a2bab04c3a8c0dd16bdcd15077c435958b7035dff5081add48ad7efa93
 EBUILD httpie-2.5.0.ebuild 1076 BLAKE2B bc703c118eaa94b490676b198e4807c749dc54ff93d2a8a4a1582b46c7813051af3a153e7d90febc4ed2f6a7254f3abedc7b13e48a4a30d2bf5df804d81b2759 SHA512 c3a3b70c43e563b30414527e36b2519cfe899a0a7d16ccebfae7a5e59e65353c16041a4e091a7d4d5003b1e3cee6840e824e710978784826759a0ae00d4e6c4d
-EBUILD httpie-2.6.0.ebuild 1125 BLAKE2B 85f3ac8ece9cbea6d0a66e76aa5cdcf7f40d350bee9ece10632fe14389266120ca08ee6ee648091fbb5182fa7360aedf71384cea35de073d98353f4444188d32 SHA512 18ce841ff29a0c8f11281cb261788d53e1f8a48c23a29a74b66e2e2ec49d9c05d794d5d7faf1da2e0304accaa0685f8d10f2315abaddde668b4410a7bce9a368
+EBUILD httpie-2.6.0.ebuild 1123 BLAKE2B e5995185053a97a5e073e5b863c5d606781497dba144cfde05e46188199e845d8832308a073ea628b10bf64557313ddcd31904a7b24b9da19834eb71c689858a SHA512 76927622e78ce90b368c5aa93186ba064e7b25a45de65c6855e48e9a0c383c197f1d9bbdbe4aa957a255a51b163433727031cbd97f3241ca0cbc2e19f01d8d68
 MISC metadata.xml 1018 BLAKE2B 590895c58cac7c3c12b1c605c7d9f6adaa35a88a5148bfae2f4ecbff8151996dfb58e4e8852d74e9a292e0b563cdf9b491fb5360a623e5b09db86ece421c43d2 SHA512 89503eeb43253c9237b1e1be0671f6dcfd50a1a7445aaea13bca4a832d4d2e6cb2c0c420d0803156a44b3a2a6ea4bc98531950067a7d73bd5555703a71c0a1fa
diff --git a/net-misc/httpie/httpie-2.6.0.ebuild b/net-misc/httpie/httpie-2.6.0.ebuild
index a663fcd882b5..570ee9e56a99 100644
--- a/net-misc/httpie/httpie-2.6.0.ebuild
+++ b/net-misc/httpie/httpie-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/charset_normalizer[${PYTHON_USEDEP}]
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 1bc0cfdd3c78..301dd9ea23ec 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -3,5 +3,5 @@ AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb
 AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
-EBUILD hylafaxplus-7.0.3.ebuild 4185 BLAKE2B 6da6298d9f7f87a8836aabd06eb9e4514678b665f1eb40c0bbecc6d2e9bc037d46c090a17be3cbec0ae93db0d8b796a718f90d4106971d60ef4cb42a3db3f2f9 SHA512 9514f5377ee54fe930b96b5c5129753596a699652f19dbb8b2e51e801f0ddbb256cfe3ed0226efdfb1f17439eb8a0a1237c3f4bae29fb28995d0a835751b02a7
+EBUILD hylafaxplus-7.0.3.ebuild 4186 BLAKE2B b4f32936ba0e8ba7a5526830436193da5e1261e6c0d669ea4c1c02e3504065992fe726d69da4511708e63ea5183f77415256108e1ca6bf56c28250e3b6ce6899 SHA512 e2aa40f381e029c46b2a0289b528a55a4d1bcc381217716797010e194892fdbe067c71e8b120f67e518393d6b0ed5de1e5aaf112a4d6ab032e35c1b9b0f37def
 MISC metadata.xml 497 BLAKE2B b3f400cee9f701675dfc8b5bd0a23d497b5f4d2e7211ba421b442782e90a1b60017d33ba482f614d0017f5abf2fa72e886ab445353eec72a9217c45aa23565ae SHA512 4b0b543bf8816e2ffff95334bf0cb64e022cc507f5ccc6b766dd183d272303d31cb43b4b6c4352991b1ceba8aaefc76276e64c5adda3caae9bff5872189deef3
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild
index a4859f2b0da8..a277aaf7927f 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PN="${PN/plus/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="http://hylafax.sourceforge.net"
+HOMEPAGE="https://hylafax.sourceforge.io/"
 SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 977a9ca9a7ff..dd3813911b9f 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -5,6 +5,9 @@ DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B d561916ced9b5c58371382fe0bec68cd0771d
 DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B 461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482 SHA512 8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef
 DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775 SHA512 56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9
 DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B 3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468 SHA512 9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21
+DIST miniupnpd-2.3.0.tar.gz 256069 BLAKE2B dd21b4ee692cf9958bd996c6fe70e7e1f6cdfe467506676d2335ccf37cd0ed7e55ff435983747cad5d2342019b36597e538fcb9b511872889305330212e88cb0 SHA512 437a4b101bcadd9feb3845d37402c253a0a2114463fd8c5930859c7eae0ffaf7714ef7c9d387be2339c584e2f106fafa008a4364ff347b6640153c9a09919b0a
+DIST miniupnpd-2.3.0.tar.gz.sig 543 BLAKE2B 312d46521d37c1a2fda146f2c7c964af45ffa4a75bc327dc743b40f96586e0916a674db4a0bb847b5e386f0b781319868d1d6cc74fbffaf3a8e989db18f4f6e6 SHA512 87be539c27d0147fcc62b69a82858518e862f2b593a0e03a9986e3641a0d61f4fa831d79a7ce645b33569234463a9517b9dbbc79ee988c9f561474a4757c4c04
 EBUILD miniupnpd-2.2.2.ebuild 2138 BLAKE2B 44b683c5351bcadb577444cfdc527406840ba7d88e051cbf4f3bdbaafa830fe94982939eb92503c8e5917d7859314c8ec35451b963ba9840fee1c4a897052146 SHA512 1ff9bfd42924d4303cd9d658bfad50e106cd89d0ef7fb4e117bd3bf18434308153b7290c6a237675f4036d3f13f681cd929cfa92c42a71d2ebe37c746cd5b043
 EBUILD miniupnpd-2.2.3.ebuild 2365 BLAKE2B e9330f2e1fe1997f1727a9ec5b7621abbdcad02892973dd8ae5737b91b152a29250b6b5d83c1d0aeb2e379d9480bddd927f5c9a93c4aa786f453cabe2a0ed477 SHA512 194ba80f9f4d1e8f666b0f2bd2e07bc09677939c8fb1f5e2362b67d2a8f50244b8b7c5d9079e53bbd69a4670b6bd6da55f16681b83e61108d583e3f76dc3ad00
+EBUILD miniupnpd-2.3.0.ebuild 2303 BLAKE2B 63acd9ba73444181cf175d0fbbe813a0ef2cab95d2510102b195e8ee3e122bb172a42e90eb676181abdb1d93047b688f4d259ed57442a105530717d839896c88 SHA512 3e0ced2044ffadcd019e3922bd703f29192c40abb2b04c3e135ac931c0e61b6c90917681d84674d93ecd7137f417ee31cdbcdefc089143e974d630c1b85ffe13
 MISC metadata.xml 903 BLAKE2B 08e36f0ed04a8314bcd5edab87303883dc2dfe454b4ab427bf8f1716922f20465c61971dae2eb95381783589b202b4480f98c0d1f01fb2e7cc8e2a72ee9a294c SHA512 3b253a010b5f5e683c6cd4b60d9e8ef3a1bf6c85856ea18bbb2d97a610af7ca1bfbf0d62096044d3c851067b5203359d1768a58eafe6d06ad48a36013839d811
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild
new file mode 100644
index 000000000000..328c65b49bbc
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs verify-sig
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	default
+
+	# fails without a default route
+	sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die
+}
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" check
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 1c3d5687bb64..7f837a5042ab 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,3 @@
-DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
 DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356
-EBUILD mobile-broadband-provider-info-20201225.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
 EBUILD mobile-broadband-provider-info-20210805.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
deleted file mode 100644
index 0da3e23ad4bb..000000000000
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org
-
-DESCRIPTION="Database of mobile broadband service providers"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
-
-LICENSE="CC-PD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( dev-libs/libxml2 )
-"
-
-DOCS=( README )
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 9a2b72930c1b..9a6c05762383 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,11 +1,5 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
-DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5
-DIST ModemManager-1.16.8.tar.xz 2344748 BLAKE2B 70ed052a7cd5561518577948419b0363816805d8a1af7de2874fa3dae795e38611d34733f5ed5dcfb12270421430249ee0a49bf54e4dcb87abe4ab595bd0b4c2 SHA512 be32ef03210035a93bad5ac0e339863c247cd000276e1bfa1acf584df652a78eda74990226a00a20e957481ce92801ed365b153de8f927a983cec41d3bbe3082
-DIST ModemManager-1.18.0.tar.xz 2493576 BLAKE2B 36034a589fb38447c83a232b6d24ca2fceed15ebc89a41af969bdcebeb482d4baf2657d063b1011c0df252b4ba7f703284cbf111b90d565d66157006331d6e69 SHA512 6e99e5529a74e6fdf814b4fcb9c9f5cd6a0398cd75303feee62c3564f9d62f54bb5a435a9847ed085fe2031af5a8d821d43f9cabed7d3be019ae0f5c8b0e11d2
 DIST ModemManager-1.18.4.tar.xz 2510768 BLAKE2B 726c1a7970fdd13b7a1952abceff1905ed167a5da290d7d48427f221434ad02032cc0590d5701b10d48b93d10c35daadae4b20a026da335a9cf3020f55c4c6c6 SHA512 156193f0e9709e401f3acd66f8bc3028e04de70fca760b42fd9626e616292851cdeadd18685e05f0f83066a21d5c43741e96838e4940767a93b03db9bee7c9db
-EBUILD modemmanager-1.16.6.ebuild 3567 BLAKE2B 65802d8c7595ae478afea4d0232ca4da9b3a34f6a98bd4dc7443b76899c576b0c31c6c14d0c70378241fda1a5bbc7e5816c5cff12eabce6e4b8ef7a2b5d99bba SHA512 75c7aa58d2cb1097cab704b5a301b3a2a752f9ad043d853e7292d0f8963fc4f1cc0b8775b9df7a880136f5beb980679ed58349b041551787afd627f14b8bee34
-EBUILD modemmanager-1.16.8.ebuild 3574 BLAKE2B a5b0d70185d35e3008abbf4616ff7f8f344527b792a826388e5ed0ea3c85bc6adc23be3fbf3f3fd86dce64f8a1e60d38092da5d619ebb1600eb326ce8935d5e4 SHA512 06d2668d1b3a5215b80cc8a5839c4078662526f1c1fa8fb4a73a932c6e3ffe4c517c9b4ab426927201f6215b17c114d49e931f989d69b4ec3f863efda69f2b1c
-EBUILD modemmanager-1.18.0.ebuild 3619 BLAKE2B d4209522fe447e7fe37d3fe191a8fc4d67d8455941b085bb988d5ad52da904663b8b80310a43cd032e68b2b6233b94dfad8a75c14ba13bd94d72e9d4410c1517 SHA512 df28ce31928da7728faa522f50500455d26d9309c7e1c9770d241107920318e135256554ed46d388f0116af142531d59116669c5704c3e9299508a6b1f87de6a
-EBUILD modemmanager-1.18.4.ebuild 4003 BLAKE2B d800093327f92efb25a1fcdd4950af83bc1381d9635f6ca6fdd62b215dd1051d35f76de0d6bab201c3354f2f9e3d29154e06b61e8e1b83772229843612f3d9ea SHA512 539908220d8ea7ebf96772e08d2dbc6bdfabe9f6284d84b8de49dc2786c6d81ad8e87c25910bae2122e8cc06a97385a6856f1470bbb5d7389b645600e56608c0
+EBUILD modemmanager-1.18.4.ebuild 3997 BLAKE2B 899f0debecec6c84737ac6abcf6a1bbf09b2caa9c112d138836817acf583d398369791c081362dfdfcd5cdad4f2899334506ba39e0390972f101c6bda6a8ae88 SHA512 3c6d50fb4c231fbaa57394d8a04edb627815be67aa6acead2caa5e8f57e5f5a02d81546a9d6ed86bf28484a826181f6a0c7eee6116ea3eb3dac9aca5b53975c6
 MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee
diff --git a/net-misc/modemmanager/modemmanager-1.16.6.ebuild b/net-misc/modemmanager/modemmanager-1.16.6.ebuild
deleted file mode 100644
index d71786684b84..000000000000
--- a/net-misc/modemmanager/modemmanager-1.16.6.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
-	?? ( elogind systemd )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=dev-libs/glib-2.48.0:2
-	udev? ( >=dev-libs/libgudev-230:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.24.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
-	qmi? ( >=net-libs/libqmi-1.28.6:= )
-	elogind? ( sys-auth/elogind )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
-	policykit? ( acct-group/plugdev )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then you should install sys-apps/usb_modeswitch, which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--with-dist-version=${PVR}
-		--with-udev-base-dir="$(get_udevdir)"
-		$(use_with udev)
-		$(use_enable introspection)
-		$(use_with mbim)
-		$(use_with policykit polkit)
-		$(use_with systemd systemd-journal)
-		$(use_with qmi)
-		$(use_enable vala)
-	)
-	if use systemd || use elogind; then
-		myconf+=(--with-systemd-suspend-resume)
-	else
-		myconf+=(--without-systemd-suspend-resume)
-	fi
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.16.8.ebuild b/net-misc/modemmanager/modemmanager-1.16.8.ebuild
deleted file mode 100644
index dce966984ad2..000000000000
--- a/net-misc/modemmanager/modemmanager-1.16.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
-	?? ( elogind systemd )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=dev-libs/glib-2.48.0:2
-	udev? ( >=dev-libs/libgudev-230:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.24.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
-	qmi? ( >=net-libs/libqmi-1.28.6:= )
-	elogind? ( sys-auth/elogind )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
-	policykit? ( acct-group/plugdev )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then you should install sys-apps/usb_modeswitch, which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--with-dist-version=${PVR}
-		--with-udev-base-dir="$(get_udevdir)"
-		$(use_with udev)
-		$(use_enable introspection)
-		$(use_with mbim)
-		$(use_with policykit polkit)
-		$(use_with systemd systemd-journal)
-		$(use_with qmi)
-		$(use_enable vala)
-	)
-	if use systemd || use elogind; then
-		myconf+=(--with-systemd-suspend-resume)
-	else
-		myconf+=(--without-systemd-suspend-resume)
-	fi
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.18.0.ebuild b/net-misc/modemmanager/modemmanager-1.18.0.ebuild
deleted file mode 100644
index 5797f597414a..000000000000
--- a/net-misc/modemmanager/modemmanager-1.18.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
-	?? ( elogind systemd )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	udev? ( >=dev-libs/libgudev-232:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.26.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
-	qmi? ( >=net-libs/libqmi-1.30.2:= )
-	elogind? ( sys-auth/elogind )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
-	policykit? ( acct-group/plugdev )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then you should install sys-apps/usb_modeswitch, which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--with-dist-version=${PVR}
-		--with-udev-base-dir="$(get_udevdir)"
-		$(use_with udev)
-		$(use_enable introspection)
-		$(use_with mbim)
-		$(use_with policykit polkit)
-		$(use_with systemd systemd-journal)
-		$(use_with qmi)
-		--without-qrtr # libqrtr-glib not packaged
-		$(use_enable vala)
-	)
-	if use systemd || use elogind; then
-		myconf+=(--with-systemd-suspend-resume)
-	else
-		myconf+=(--without-systemd-suspend-resume)
-	fi
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.18.4.ebuild b/net-misc/modemmanager/modemmanager-1.18.4.ebuild
index a86bab79aa95..0b3fef8057f3 100644
--- a/net-misc/modemmanager/modemmanager-1.18.4.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index b3909d6b8444..e6def6cfd48e 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,6 +1,6 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
 AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.3.2-r2.ebuild 1483 BLAKE2B 810b03aaf006c531dddd4cca178251a81730b08729b8b27113b64818b59d773bb2e3094a789d5e2754511cee337481f4575a552a329354e29be61ed736613e47 SHA512 070d5841d827c3efbf2312ded70e0343eb316acbf05dd41544e8d6da6e628eb51bace622721ec8dc9c779528a559719a2a26b3662bdd7b838d4d571aa693707c
+EBUILD mosh-1.3.2-r2.ebuild 1489 BLAKE2B 29d6f01b6293dee4248b22109bfc62ae3d869ac4d032d9d707ba83504394afcdbaae5dad77b8f177ef939a7bc05dc18d4ffe3fcbc6596a076b4d4b6c5e6045bf SHA512 1c61bcd4844518aa42bade23ee10d10c28ba1a95f527230ce0bfc51893a1e00f10bcbcb826742eb5b397cd604fdf441a77aedcdabb9bb1871c6f6b57850df23a
 EBUILD mosh-1.3.2.ebuild 1432 BLAKE2B 762f107430bdfdff1b200fce097fb298f7fe5ecd1799cb5e4f890552ffaa1a91e84c2fbdc0de18b3472c2aaa8ed8c4b9d6d732279d9e341f6ef4f1f63faaf664 SHA512 93ab6bfd1a7dac29ee7da5a3a8021b18f34acda6d1c8f3df624ee6da05ecdc0757406dfa68644d1cdd588b490b2df7ad73a8691e5c48303fe429878bb6edecdc
 MISC metadata.xml 1047 BLAKE2B 86b2beea09ccbdca70646b00a5af74f253ecd18fed70f364287b122520f4e15f507416c3ef9b40fe28b267e3dad9e8e16f0139dd0966c55d1597a5cae1c411b5 SHA512 3940264e614abb7b646d24e6786503793b3a651af7f802f5ef5bf1d395e89f38542eae2df5b2d737bf2474963215529771c1ba2eabc785a5649ecaa1da4713db
diff --git a/net-misc/mosh/mosh-1.3.2-r2.ebuild b/net-misc/mosh/mosh-1.3.2-r2.ebuild
index 710a8c1fe272..1d38d71898ba 100644
--- a/net-misc/mosh/mosh-1.3.2-r2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/mptcpd/Manifest b/net-misc/mptcpd/Manifest
new file mode 100644
index 000000000000..95dba01578c8
--- /dev/null
+++ b/net-misc/mptcpd/Manifest
@@ -0,0 +1,4 @@
+DIST mptcpd-0.9.tar.gz 654063 BLAKE2B fd9e8bf5cec517c934b9d38a736a128d087b54b5e4db90816a8cf8c242195fec8e3c4cd28d2f6e5a93326cac311a6b29048313c722004cea39e19448dc467976 SHA512 4fd292304d6270351b865e86cc401c1f5cc9043606b171e852bd37b2472c5f80061d760be68e5cd965caccb2f25c03d9ceea6232a5a587016c81f85e68ca8882
+EBUILD mptcpd-0.9.ebuild 1103 BLAKE2B 629897a77071480b8516bc646df0852838a88fe8122581ba13ff178691e3311dc9927d78502d7bb415fd506eb435887ff4b348f8a53d24b04966e9812eb381f8 SHA512 f9c005fbad040d994458e7c8cd9b64f929368de5f7d2ee7abc5f2d84deb944228d04966820c71bb01c42940001e8dc5e5110b268b9be8f9eefa9d33ed80403b0
+EBUILD mptcpd-9999.ebuild 1103 BLAKE2B 629897a77071480b8516bc646df0852838a88fe8122581ba13ff178691e3311dc9927d78502d7bb415fd506eb435887ff4b348f8a53d24b04966e9812eb381f8 SHA512 f9c005fbad040d994458e7c8cd9b64f929368de5f7d2ee7abc5f2d84deb944228d04966820c71bb01c42940001e8dc5e5110b268b9be8f9eefa9d33ed80403b0
+MISC metadata.xml 326 BLAKE2B 77d6f17ab473dfbdd5d156b8c6020ba80cf49d95fc9693c88b6f6a5f2a9449cc0caa53ba000183a4fba747d7e298b77528346c680049ea28fa86b9c308da0a34 SHA512 1150bc86b2b12c042e0de7eab7701808a703bd0a42e5a38eac94e07131f3138ee6c010644fd1837ef6240e1c83cf51553f8f99fd03970a2f84252aeee7e76f06
diff --git a/net-misc/mptcpd/metadata.xml b/net-misc/mptcpd/metadata.xml
new file mode 100644
index 000000000000..ed0b180f23fb
--- /dev/null
+++ b/net-misc/mptcpd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">intel/mptcpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/mptcpd/mptcpd-0.9.ebuild b/net-misc/mptcpd/mptcpd-0.9.ebuild
new file mode 100644
index 000000000000..8f307676ab46
--- /dev/null
+++ b/net-misc/mptcpd/mptcpd-0.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Daemon that performs multipath TCP path management related operations."
+HOMEPAGE="https://github.com/intel/mptcpd/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="debug doc"
+
+RDEPEND="
+	>=dev-libs/ell-0.30.0
+	elibc_musl? ( sys-libs/argp-standalone )
+	"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-5.6
+	"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		app-text/pandoc
+	)
+	virtual/pkgconfig
+	"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/mptcpd.git"
+else
+	SRC_URI="https://github.com/intel/mptcpd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+CONFIG_CHECK="MPTCP"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-kernel=upstream
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable debug)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_test() {
+	emake check
+}
diff --git a/net-misc/mptcpd/mptcpd-9999.ebuild b/net-misc/mptcpd/mptcpd-9999.ebuild
new file mode 100644
index 000000000000..8f307676ab46
--- /dev/null
+++ b/net-misc/mptcpd/mptcpd-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Daemon that performs multipath TCP path management related operations."
+HOMEPAGE="https://github.com/intel/mptcpd/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="debug doc"
+
+RDEPEND="
+	>=dev-libs/ell-0.30.0
+	elibc_musl? ( sys-libs/argp-standalone )
+	"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-5.6
+	"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		app-text/pandoc
+	)
+	virtual/pkgconfig
+	"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/mptcpd.git"
+else
+	SRC_URI="https://github.com/intel/mptcpd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+CONFIG_CHECK="MPTCP"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-kernel=upstream
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable debug)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_test() {
+	emake check
+}
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index bc228ad7ae73..74b378ae5c8b 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,3 +1,3 @@
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.1.0-r2.ebuild 635 BLAKE2B 96c501b3ed2f5c92b4992fd81e00d57930bf40ea545a899ae185b94959268c614ffb2b0f5c399023e381d97127d7ce15f2e9db4e9cdff088dd5270b9f0f57810 SHA512 262f8a6361135d6c839e05cedac8ddd1c96ae66c9a63221ae162550f1da30e20c72b81d20eb4255623ff8970a16c96a294151cce49bafdd34503aa2a2d06ec99
+EBUILD nyx-2.1.0-r2.ebuild 638 BLAKE2B 0730483a90bef6c724d32045e57c12a77ce0d407a75ab5923c9af8d747d555a16c7b1c2d3ecd762d41bc723e6ae1e191f28914de258600d921203e0a17e4e508 SHA512 70f425d6b8187afe6dd95d9a50ba2082edc66b0952198d9484240ecfb69c7e9e269edc95475bbe2bf3bbf91572291a0eb530fcacd471cb7a79876682f9400428
 MISC metadata.xml 329 BLAKE2B 089c30db84b27384d6b7814fa6f8a5ab3ce4c40cc0c95538fd45262b79df25520c0780013548ed6dc7511fc815c25401d38d37f60ce4ee0e2a53bfbe99f6b183 SHA512 d969896fb35aa789b119ad623b7d4e63518cfb2ff0f46cff3f299db828a0918646b6634c94c901ffd847b1c1e0e4b722f2b0015034354886eb94fc8bc29071e6
diff --git a/net-misc/nyx/nyx-2.1.0-r2.ebuild b/net-misc/nyx/nyx-2.1.0-r2.ebuild
index 7c6aeee19674..0a2d0a5d251e 100644
--- a/net-misc/nyx/nyx-2.1.0-r2.ebuild
+++ b/net-misc/nyx/nyx-2.1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9} pypy3)
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 PYTHON_REQ_USE='ncurses,sqlite(-)'
 
 inherit distutils-r1
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 5625eede221a..d23c7c9a043e 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -3,11 +3,9 @@ AUX openssh-7.5_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1
 AUX openssh-7.9_p1-include-stdlib.patch 914 BLAKE2B 9c7eb79f87ecd657a80821dfa979d8b0cc12a08d385ec085724f20aa6f5332593ffc7481bb9f816e91df3eb4d75d8f7b66383ff473d271270de128c3b2bf92e5 SHA512 7dade73bdafb0da484cbd396b4a644442f8ea12fef54c07e6308ae2e73a587fa4ddf401e8a0c467469b46fe7f00585e047462545182924c157b4d3894c707a70
 AUX openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 977 BLAKE2B b2e28683176c4678f51a9a0be3e29496620ac795c7de4649fb3cc0bd076682e42bc1c606b17a76e140f51319e4c4a1cc890c3a37c4bc3cf9222a88e31b8a773f SHA512 8c2567ae16dccc73e302ba90c1bb03e19d4afc3892dd8e1636d7c8853932662eccbda3957e4db55a21bd37d2e65abe74b0b2c1efb74e31751335eb523759d945
 AUX openssh-8.0_p1-fix-putty-tests.patch 1760 BLAKE2B a1127e8f2275c1e23c956b5041dbc84dbdb2cd6b788fc69bfc1f6b030afe86a827483602ce76577b4101ee2e790b1cfa8c1d2db09da59b89fe7df8083bf4695f SHA512 f544d818bdde628131f1819bf2ffb4007802ee5bf12c5cd5bd398efe0f0f430ed6b3efa7969cb2c4fa49a2bbd773d8fa09f4c927cf998a564b7611443437c310
-AUX openssh-8.3_p1-sha2-include.patch 370 BLAKE2B 3d9ee891d9d647f4ff3b42d47cae4c7a32533bce917b35101fd3c5549717a6b285423894b3372ecb6983d4425c712f4b0590fc95799fd521523d9d74860863c6 SHA512 a1edda5dc43af79e9e4e7d3bcd78cc1c2dbf40e94f22189022dcaf1107c8f2cb2a37c949af5955144f6ada210417a695fe0c4d05d52ba2dbafb1dddf6a1bac3f
 AUX openssh-8.5_p1-hpn-15.2-sctp-glue.patch 727 BLAKE2B fafb6bc3ec680327abf01a7a2f673d4be601094d518d74f5afd0c596c1d60ddfc6f31add6b5533f85bc09cf2122b9e3f7243d5d26a2d6923c88c2f6a811ea2b8 SHA512 eda1c1613e94a7b10df9cc08c87ed8a39edb3f8a160600a74780877772bbd76cc9842d5d5d68ed6a9554e1e310675a1e461d894144d514b8e482d4a1affbc9bd
 AUX openssh-8.6_p1-hpn-version.patch 556 BLAKE2B 26ef960db46c82ee62e6a6f1be15c2897855caa6cbd05db87d3e606ce42d03fb6e88916f0c6644f67dc008ca802617d0f63e5e8e35d1a6c6076188ba19009186 SHA512 c13d14dc496863bd6bbbf08940322a60e74fa1cc2171f81132dfd874b9371ee0edd77f75ffd606f874fa2de498b174be91da5c641029abff2d2a8503c2f0fc02
 AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb61226c5091a3e3106285c79db4a297dbd781eddf7a6d4cb3b1a5a5dcbbcd158d32dbca5986b6fbf15f62cd3928cf125b083 SHA512 794b06c6ee6acd1bcd861753970cfc4d04f42499d48ff4119746dbcab8643f75761fddb9f52f49fe01e356740eb3882671ac3ae209e0e45745d195a219ffe5dd
-AUX openssh-8.7_p1-X509-glue-13.2.1.patch 1679 BLAKE2B 2f79c3bc5b3fd93cce0aea23cd16b98fd8031b2ebed21a5360ec84e43ec02565e464fa47db99421f8b94994073823e4dfe590bd5374bf803c8065f1a8c065d6b SHA512 05796a8c6e01456d4e6ad0cc66490b7a9479f8f36854532b392b49c20d3a62e77e13f067b77460b2b3098a6ada3944f821220aa663d6a766cb9d9e1f9bcc6b9d
 AUX openssh-8.7_p1-hpn-15.2-X509-glue.patch 16283 BLAKE2B 7181c63f43398bda89f663c6de4a688e302d382519b0030ece980777d110ec56077dc6e5ca357f67c8a7a932f2df850ddc4ff7db1ea91c59d136767857c8b24e SHA512 525b68bcd9c891ab6be104d30cf4b9cc9214c257bc41a7e9c306dcfe3fb12109f7422118d9fad58698fe9a6d501b27309e675c857d00c04c46acff27eec60154
 AUX openssh-8.7_p1-hpn-15.2-glue.patch 7354 BLAKE2B 1b5afc662d39db3ab137b2a389b3a5cebf55e0c6741c12ade4977d8d5d8cb4f4cf2d8e8978150808c6570cba7b8080ace971d20913df9a740c1e03adc7134726 SHA512 ea57ea2c6138a275bce8cb7d62ea8771bf51db4d8dca4ea33f46539b33ab5a17c7c1749fa7b10c90e167846fd087f4084dcf5604017ad5c2821c2c74793ca9c2
 AUX openssh-8.8_p1-X509-glue-13.2.3.patch 2238 BLAKE2B a97643157ecf7b808ae9ee76e00cc58c4515bf5a1e2ff863124dd8b8941f390a90e2b52aa7444898782fc062ccef47983e127efaea7acf225d260479da88f12f SHA512 205c499d03f3bc2c767d406021f5f413eeae06ef5593aa11b24ccce75ebe9e90aacce4f53b120f6330326151c8f11ca43e10fe969f7ed832ef3a604f451f129f
@@ -18,15 +16,11 @@ AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391a
 AUX sshd.service 259 BLAKE2B e65ea7227658295584c3fdee3bf46f098c1c5a53a0b433e88ae8d43f0823fade25846a5f3abbacf939a13af8195a888d0ffb937e8da943478e76eea7c0e13c82 SHA512 9656ae4c045ba47ad28f983e50d1119d51c1d0a7471fe8e792d6f734a71c8d4d900431b591f2f40bb8af3a382e6215933ae32eff56de6da0f2f166d6fb855987
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
 AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03f720205f5b611365c9a48fba445962c06c7e18bdb310cdb9ffe4fc49e95f69608922d224b00c890b SHA512 423120ea2e1ac0b92575ce4eb05347483f902238dc104848e74088f49483c37d30c27364e7fe8599b3e85562159c69284ecf25a4c5394b4cfa18c5c77c6beacd
-DIST openssh-8.7p1+x509-13.2.1.diff.gz 1073420 BLAKE2B f9de9f797f1ec83cd56a983f5b9694b0297a60e586898a8c94b4aaa60e5f561bb3b7730590fc8f898c3de2340780d6a77d31bfcc50df0a55a0480051f37806fd SHA512 dd7afd351ddf33e8e74bceba56e5593a0546360efb34f3b954e1816751b5678da5d1bc3a9f2eaa4a745d86d96ae9b643bd549d39b59b22c8cf1a219b076c1db5
-DIST openssh-8.7p1-sctp-1.2.patch.xz 6740 BLAKE2B 468a455018ffddf4fa64d63acb732ad3e1fb722ae8b24d06cf3a683167a4580626b477bbc286f296c83d39dd36c101ac58597a21daa63de83ad55af00aa3a6be SHA512 aa9067c9025b6e4edfad5e45ec92da43db14edb11aae02cbbc296e66b48377cbbf62cdafcdd5edfd1fd4bf69420ee017223ab52e50a42b1976002d767984777c
-DIST openssh-8.7p1.tar.gz 1814595 BLAKE2B 9fdb8898485053d08c9eca419c15d0d03b7a60152cf6a9d7f1beed3a21c9e6ac3bd9f854580e6e474fb0c871f3d4be9ef4b49bee8c355d9e5769a5505f4e6ea9 SHA512 08c81024d9e1248abfda6cc874886ff5ae916669b93cd6aff640e0614ee8cbcbc3fe87a9ce47136b6443ddbb1168b114367c74e117551905994e1a7e3fa2c0c2
 DIST openssh-8.8p1+x509-13.2.3.diff.gz 1071138 BLAKE2B dfbe53ccfdfe0a3da9bac927c5bb0ccfeb20f1ba69cef2ffb52999e6f6b0a3282e28a888aab40096fe9eed819f4c9b27592a8771d786580b8fa4f507f6b02557 SHA512 e55e9cdcde1b02b2799600083db8c3b85d207b251b99b4efabe8614bedf1daae28e5ed10cbe1f6a2e5ba766fe1eaf41be9e90fefdaae1352808c504fc0f4e7e6
 DIST openssh-8.8p1-sctp-1.2.patch.xz 6744 BLAKE2B 9f99e0abfbfbda2cc1c7c2a465d044c900da862e5a38f01260f388ac089b2e66c5ea7664d71d18b924552ae177e5893cdcbfbccc20eeb3aaeae00b3d552379e3 SHA512 5290c5ef08a418dcc9260812d8e75ce266e22e2258514f11da6fb178e0ae2ef16046523f72a50f74ae7b98e7eb52d16143befc8ce2919041382d314aa05adda0
 DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4481e8c74b91ffd2046dc8b6f03d6bf584ecda066c0496acf43cea9ab4085f26a29e34e20736e752f204b8c76c3 SHA512 d44cd04445f9c8963513b0d5a7e8348985114ff2471e119a6e344498719ef40f09c61c354888a3be9dabcb5870e5cbe5d3aafbb861dfa1d82a4952f3d233a8df
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-EBUILD openssh-8.7_p1-r4.ebuild 17175 BLAKE2B 4e065ac25c95771f65dbfcf75377591e3872b58b93864d0532341fa2a7967c3405475f17aa78cb8df2fadc3af9ff22bf318b3a7c566a43c02623d78e0caefed2 SHA512 8f5cc5ecece9576510b0b3d37702bd688d434faf5d6d7f287e2e128e088258c664142b52f83df9359020986953c15054a788f73a614aca76d73769173b19e263
 EBUILD openssh-8.8_p1-r4.ebuild 16684 BLAKE2B e09fc74283db0c00f74d995e449dd4a1c58ca1f185dafcc6df629e9fdd1771bfce781a96a87f8cc017ab4e4d695eb2c849453bd16874ce3b2e9988c57ee2f617 SHA512 36106576d162170ede18cfc95fc414b1b793a873ed2203ca138ca34a914e75d3feb75814315e66982b7081eae6756e65cba308aa531621a84cb746cfe0889547
 MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd
diff --git a/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch
deleted file mode 100644
index 6bd716619701..000000000000
--- a/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index c9e4294d..2dbfac24 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -44,7 +44,7 @@ CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
- CFLAGS_NOPIE=@CFLAGS_NOPIE@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) -I$(srcdir)/openbsd-compat @CPPFLAGS@ $(PATHS) @DEFS@
- PICFLAG=@PICFLAG@
- LIBS=@LIBS@
- K5LIBS=@K5LIBS@
diff --git a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch b/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch
deleted file mode 100644
index be88d11ba803..000000000000
--- a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/openssh-8.7p1+x509-13.2.1.diff	2021-09-08 14:20:40.750542472 -0700
-+++ b/openssh-8.7p1+x509-13.2.1.diff	2021-09-08 14:21:23.354736098 -0700
-@@ -51194,12 +51194,11 @@
-  
-  install-files:
-  	$(MKDIR_P) $(DESTDIR)$(bindir)
--@@ -391,6 +368,8 @@
-+@@ -391,6 +368,7 @@
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
--+	$(MKDIR_P) $(DESTDIR)$(piddir)
-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
-@@ -70464,9 +70463,9 @@
-  
- +# cross-project configuration
- +if test "$sshd_type" = "pkix" ; then
--+  unset_arg=''
-++  unset_arg=
- +else
--+  unset_arg=none
-++  unset_arg=
- +fi
- +
-  cat > $OBJ/sshd_config.i << _EOF
-@@ -132131,16 +132130,6 @@
- +int	 asnmprintf(char **, size_t, int *, const char *, ...)
-  	    __attribute__((format(printf, 4, 5)));
-  void	 msetlocale(void);
--diff -ruN openssh-8.7p1/version.h openssh-8.7p1+x509-13.2.1/version.h
----- openssh-8.7p1/version.h	2021-08-20 07:03:49.000000000 +0300
--+++ openssh-8.7p1+x509-13.2.1/version.h	2021-09-08 21:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION	"OpenSSH_8.7"
-- 
---#define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.7p1/version.m4 openssh-8.7p1+x509-13.2.1/version.m4
- --- openssh-8.7p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.7p1+x509-13.2.1/version.m4	2021-09-08 21:07:00.000000000 +0300
diff --git a/net-misc/openssh/openssh-8.7_p1-r4.ebuild b/net-misc/openssh/openssh-8.7_p1-r4.ebuild
deleted file mode 100644
index d38be351907d..000000000000
--- a/net-misc/openssh/openssh-8.7_p1-r4.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-# PV to USE for HPN patches
-#HPN_PV="${PV^^}"
-HPN_PV="8.5_P1"
-
-HPN_VER="15.2"
-HPN_PATCHES=(
-	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-
-SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="13.2.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
-	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
-	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-"
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-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"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	hpn? ( ssl )
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !sctp ssl !xmss )
-	xmss? ( ssl  )
-	test? ( ssl )
-"
-
-# tests currently fail with XMSS
-REQUIRED_USE+="test? ( !xmss )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		net-libs/ldns[ecdsa(+),ssl(+)]
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	!prefix? ( sys-apps/shadow )
-	X? ( x11-apps/xauth )
-"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf
-"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use hpn && maybe_fail hpn HPN_VER)
-		$(use sctp && maybe_fail sctp SCTP_PATCH)
-		$(use X509 && maybe_fail X509 X509_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "Missing requested third party patch."
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
-	eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
-
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		pushd "${WORKDIR}" &>/dev/null || die
-		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
-		popd &>/dev/null || die
-
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
-		mkdir "${hpn_patchdir}" || die
-		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
-		pushd "${hpn_patchdir}" &>/dev/null || die
-		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
-		use X509 && eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-X509-glue.patch
-		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
-		popd &>/dev/null || die
-
-		eapply "${hpn_patchdir}"
-
-		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use sctp || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	sed -i \
-		-e "/#UseLogin no/d" \
-		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
-	eapply_user #473004
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the sctp patch conditionally, so can't pass --without-sctp
-		# unconditionally else we get unknown flag warnings.
-		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX}"/usr)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(usex X509 '' "$(use_with security-key security-key-builtin)")
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-		$(use_with !elibc_Cygwin hardening) #659210
-	)
-
-	if use elibc_musl; then
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE
-		# https://bugs.gentoo.org/753230
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \
-			SUDO="" SSH_SK_PROVIDER="" \
-			TEST_SSH_UNSAFE_PERMISSIONS=1 \
-			emake -k -j1 ${t} </dev/null \
-				&& passed+=( "${t}" ) \
-				|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	# First the server config.
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables. #367017
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM. #658540
-	AcceptEnv COLORTERM
-	EOF
-
-	# Then the client config.
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables. #367017
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM. #658540
-	SendEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	# https://bugs.gentoo.org/733802
-	if ! use scp; then
-		rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
-			|| die "failed to remove scp"
-	fi
-
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 20706db5d403..74393c454e04 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST ownCloud-2.9.0.5150.tar.xz 5775740 BLAKE2B c43044dd383d66dd212bcd3efd818fad289ac51b082eaa7b47db03778cdfc87725efbdffc567e416bf5444d7e58f795606f093a782ca783cefc2d4994df3fb2a SHA512 c183b2d4340dc8880d2bf31aedaffb96da518fdb60f1e8c857ee2f8d02c36cb69552475fdbf536f7ecebd9af2a7732f52a9e02f20450452c78d346910be3cf57
-DIST ownCloud-2.9.1.5500.tar.xz 5787048 BLAKE2B 6f7df0c1ca13e6074bbd75caaee838ddb822f9284a4f5cc95e1b2c1432adf2969e2413607bebc1542d4bc7790bd6e61edfba758d2205a23fbede6873b7e22316 SHA512 5c78cd0318b7cd35f32721cf364d6e807d32eb1f3651e7f22ff3f3c7737967193ad089062965b3dcee24c23c14cc0d7acdfc95094f4f90f8aaf718f45f22e18a
+DIST ownCloud-2.10.0.6519.tar.xz 5791912 BLAKE2B 3cf02ef89a6af249ab8f9d1b0a4cc899fbb11f49bf47ffb0ce042442da984d8dbf49619cf3344cf1837f1f3437e70f6e6d302f4e4c67a7df5f547368be4252ba SHA512 ab1e8aebefa049a73c436325b3b6e1d03e9a74f93ab6e090adbc71ccdd1cf56297898f004b12312ebba82158f5c2e299d9d0b13c14e291b855dcf267bac490f2
 DIST ownCloud-2.9.2.6206.tar.xz 5759996 BLAKE2B c328ea261a4fddecf93837dbcac01aab0971542d8dfb3f5b0a32a8432ca0e0904c3f4fc81c5c7811da8b3af64b58e929c055e7cec0649f00049e037372948eec SHA512 d075a11ee92aa9771c631a766feddfa1a70907d7d341b58043e1ba96ac52786a6a750b15c2f9b7a0992fe02a45586cc3445755dc9df4cd267e72f070d2222f0f
-EBUILD owncloud-client-2.9.0.5150.ebuild 1541 BLAKE2B 5703093f44e5c8cbdfb96c94b798578f438d2d6fad50997feea985a86860dfbe2dd70b84d59fb2cc125e78bcc544ecd5fa147a0378f7cee7dabf47fc7ce067fb SHA512 ed7fd1391484791c428d97a7a21a6544198836c9f036ae1fe5acf45819a0184b9c075a418ed74bf1dcef61492017207aa5a4a56098fdfac4f0a57b2fe493290c
-EBUILD owncloud-client-2.9.1.5500.ebuild 1541 BLAKE2B 5703093f44e5c8cbdfb96c94b798578f438d2d6fad50997feea985a86860dfbe2dd70b84d59fb2cc125e78bcc544ecd5fa147a0378f7cee7dabf47fc7ce067fb SHA512 ed7fd1391484791c428d97a7a21a6544198836c9f036ae1fe5acf45819a0184b9c075a418ed74bf1dcef61492017207aa5a4a56098fdfac4f0a57b2fe493290c
+EBUILD owncloud-client-2.10.0.6519.ebuild 1500 BLAKE2B b2c5646495e909e5598066e1fcdaf87a86b7e7ebf6bc35c0591f0c1ffbc995234ddee3fbe032f3dc8c583898071be8bcfa476c2ef258bb421a9db72c27d2076e SHA512 bd55ab513cfb309094dfdcba9308341ebd010b80ffe8ddcea45d7895cb34c10e26675ac00e3ced04075f9ef6f740d7bb439db0d5eaaae42863e1da65876cb1af
 EBUILD owncloud-client-2.9.2.6206.ebuild 1500 BLAKE2B a696ee5d555770f7b0fa2e2d84a41765ee3d30c845a0fbc4ac21a94e22168b48de93873b1cf96db01e4f1ddd84b30e1230cc4df9fff66479c4fe12fb76ac5cdf SHA512 1801423f8e5bba0c5985dfb439e2a7e774704bc83dbfd41f3314ee625ab444be0f7e9ca0665c4beae6824012696e7410b9ebee51d11004a60bd8a2657b0eea1d
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild b/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
index ef8aeb7b1ca8..e75c66fabf69 100644
--- a/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
@@ -59,7 +59,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
 		-DBUILD_TESTING=$(usex test)
diff --git a/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild b/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild
deleted file mode 100644
index ef8aeb7b1ca8..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index cab542702279..1f8cf26c9548 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -1,5 +1,5 @@
 AUX pps-tools-1.0.1-install.patch 693 BLAKE2B 6f85d636697c30abee4a5c3c83d8c0a636c1e70343a373ab483bb98a7d5d4db60373ad0337f2feadf0f64585bf180211df8cfc17f1e465023884477bdac3a8f4 SHA512 84b5f43103b38ac611d8ab18d08bfa8ee938e4667cf6cd3d3a0dd1ff405a694c118780c576e19ee368a4389797f349eb0c341e95cec0d2e0c3d1a30510407cbc
 AUX pps-tools-1.0.2-build.patch 1217 BLAKE2B 68e2b0992cd782b66571b38ef5cd449892a573d4e69bec67283aac1c19ab86939478b2ce6a205671d9282cfd17f7f0731653374d1fb7971bbead75c6ac6a23e4 SHA512 3494d05eca69fb3b3011ce79a4b8cbaab5eb2ec89abb2b1ffabbd1d677585b4054bae398c4703048be0e32c4cdbd9c188fb624571b688630d95b03396e5e759c
 DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
-EBUILD pps-tools-1.0.2.ebuild 551 BLAKE2B 980526ad6e94d068eaced318cd45159b396ef28df55c54b339f006e31456d3b37d42be9a65eceadc2ae34fcc7685812dba28c7f1401dec1dc3333444b86db9e5 SHA512 b00425b2d6f6fd3ec28a8f7d28966020f07ccdfd77471f425f7c3715b1f690f62ed6e336a7b9782a13de1466ab0a970705383e880b5280b6b61cb7a5330ad3da
+EBUILD pps-tools-1.0.2.ebuild 557 BLAKE2B 396389a5757fa7c33e60caf7f1cf7abb49f879a88f5dad2dbb99aaa318da3ffd80f700bea95ebc4ff4dfa74e61f2b91a721801a6c7b86b8ac17cecb0f76a4f4f SHA512 dc8ce865e4e763d63d2f448d60f74d9ffb6952638f2e257ff8a9af01e5e318f6fc309d42a5b5c074efc2c98b3423bee1f53768e001b0a179df46beed2f2e037a
 MISC metadata.xml 351 BLAKE2B b9e85befc52ef4031e516d0d62d477f25bf88e448ac854f9248704ec0dc6715ca3a952ef4c7cbbd020ed4bbe360e7805372aed3843fe79d58f8514ba1867cbf9 SHA512 6bfd529463b4bb0903676ad9b4eab3b1806c7909e2eef45a5be1534efbb3ea35b24b355179e64b2dfb8e64baf4f486b2010a339c362aa5eea04ea6a218041921
diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
index be0e8d3fa125..86887a1015f4 100644
--- a/net-misc/pps-tools/pps-tools-1.0.2.ebuild
+++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 1d634065b41a..50e5597c1cd5 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,3 @@
-DIST Remmina-v1.4.21.tar.gz 2982350 BLAKE2B d076db92290ead724e6b5c13beba2ef94d16e8209c5095e5db754a8b25ee236ed7a87b5ce29ac0b9424d3c55e5443467b1cc628fb80a0f63c59d915d9fc7839e SHA512 3fb7a29bf9e001203bdc5c176a0cf11a5c98638d605a02e2edbb16669b9e85526706c11e15bd2c308919ee6ef14217356bbafa0328ce337053bba20da6f2905a
-DIST Remmina-v1.4.22.tar.gz 3277782 BLAKE2B d9502406e9a534de18358d9d6a7790a5bb25a5be79ee9bfa390cc2c7de01e0852337834fbe1213b5f683bb948f124d44e4006a6650dd3794ee8a1f707307ed53 SHA512 8b5b8c92d5d732aec1530fdd5c1c7f74b9bfe9a9e8e990f21e92780d57b3642508c6a8c36c741bad8caa765a9709afbd577b26fe196cf71d883f924237212551
 DIST Remmina-v1.4.23.tar.gz 3280050 BLAKE2B b62789dba4a4f0a0a12f4cc1da68431b0c386b618f3bf7babe8946cba3753bdfd8799731a254c18cf58e8a43efe6980d638adc9512303dfb229c5b340d957402 SHA512 151baead9c8e8051f6da2139691aa5644ccdd5752e1dd1be572b72fab01773caf261bfe44ebebc8524a36b447ee335275e6522bd2b6b65d4f0a790c92bd291d4
-EBUILD remmina-1.4.21.ebuild 2348 BLAKE2B d691f779d7e7caf10ff19daf2a5523bc60dc4aa3d1db5dd07beace9a4b02d94046694702c71b82fe2683143f949c4d3e29f137ef1abe6e27df4a01f691b0de99 SHA512 f7fa151fcbd9973be071a8aa5566bb9234768ac8dc493614cf242c5a75d628cd140e88cc89428f4c9ab2b1d75defa9cc915e6e57c2af5baf11032540145c88e9
-EBUILD remmina-1.4.22.ebuild 2350 BLAKE2B 8b8bc5827409208c0be511b0afec5264d940b9f2808ec8ca3c5b0aadf13eb26377a809a8b1a6b0dac156a8d511123cf114f9369befc0a06ea6d7888fdb96ef4c SHA512 83acf682b8291b7c0e3e16df06f117bfe68974a4db3c919e0c6d70d41b5edf8d126a8d1a54a7dd72eedae34756290756da6690ab2c52fdb309877687f1d0354f
-EBUILD remmina-1.4.23-r1.ebuild 2521 BLAKE2B f489fb9b4bb5c92a3914e59e00d9ebb0d83e01fb03ebb144de5103061fdba1c0fa052dda3d3c3ed6fa40a064b5c6b56481e79a9a1d0f6702be2e597e3f374c03 SHA512 ee23045068fbcfd21f65d29e14f80de7cd04d95b055f727533bc880f29d2bbbbacfaa779b2a0a22f56e0bf16afdaf84e3862d5f7b7f7d75af30753d439f50154
+EBUILD remmina-1.4.23-r1.ebuild 2519 BLAKE2B bd58ce95fb25c3d3a4a01333d5cd8cda69ef42fd5c547dfc48fdb77bbac12322ab219dd6ec24838d43ad6f4a8170177dc1d3a04c995f7ef0995fe320f0173ee5 SHA512 fea16348e93f27044260d5d733c45729541ec49241ed5884d5a70e0c65632626d6228d172b0161b6d698d79c9c31c3eb570b42712101e3dfcfb6c40154349825
 MISC metadata.xml 1174 BLAKE2B 03a647f7a881a228a2123e269567394dcf5d8e908d223dcc30b87f11e7447ffbadcda0e4a29d9126b6d15c35ddb07a7a4b9b49631156d8efc2de3f460d202bf8 SHA512 fd1632f13bffe28ca6b2349dcd32641393c0fa9fe1dd6b629b2e6d8b88a3f7f1adce8f4dfe0adce7243e5fe485da9eeaf6042ea4f532e086c97cf5d21f34a91b
diff --git a/net-misc/remmina/remmina-1.4.21.ebuild b/net-misc/remmina/remmina-1.4.21.ebuild
deleted file mode 100644
index aface4e51caf..000000000000
--- a/net-misc/remmina/remmina-1.4.21.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libappindicator:3
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	net-libs/libsoup:2.4
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	x2go? ( net-misc/pyhoca-cli )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=$(usex x2go)
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.22.ebuild b/net-misc/remmina/remmina-1.4.22.ebuild
deleted file mode 100644
index 5c9f28ce599d..000000000000
--- a/net-misc/remmina/remmina-1.4.22.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libappindicator:3
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	net-libs/libsoup:2.4
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	x2go? ( net-misc/pyhoca-cli )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=$(usex x2go)
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.23-r1.ebuild b/net-misc/remmina/remmina-1.4.23-r1.ebuild
index 626d6f634f16..9b772915c4d2 100644
--- a/net-misc/remmina/remmina-1.4.23-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
 
 COMMON_DEPEND="
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index c81b7c79d2db..675352780a3d 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,7 +1,3 @@
-DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb
-DIST rygel-0.40.2.tar.xz 1696072 BLAKE2B 9071be84a36c603f4c113c5741e427a9b960e97b7262b41c4e4b96bd125ee938508fbae9eceda1dbb9ac9d8cccb096d5fbb3545adee36895845908e79b0dab59 SHA512 23bd31ef4d6d605797dffea4c71eee3770889f5ec54ece39df3743b82973eb0b42a54f3cfc1123e870976f9927987d59d9c0c2b9f69cdec731168dba118b1771
 DIST rygel-0.40.3.tar.xz 1696424 BLAKE2B 90e3da7c4dcfe4b0789dc7cf64fb2b49f00d2892b18a2ea1bad1da4e2ac5c1684992177fcac9adb99785f0e5ec68ffa08ee3ba37a8694c47cb69a9e080e2f773 SHA512 b50613b49bfde656b587192b20b6aebd49bba176149e1adcc13b00f7a6bc525237fc74a2af5afe37704758df8d9446ddb01f1338472cc6626d30765df991f69d
-EBUILD rygel-0.40.1.ebuild 2198 BLAKE2B ef3f3b236482562b9394f8fccdbcaba8f42f5f1b4c3b45db32d99a47e1b3e1fe47c49cd82584760fe51cb907436035a23e730c8605f269a76720fd7e6ec4e36a SHA512 5516705acef67f4da77d2f94a158b8299dd5255268f1ad623527906b6ba92ee5cbd91066e7a455c581462632299b29e1f7f333b171d50c4e14cc8e45726359f5
-EBUILD rygel-0.40.2.ebuild 2196 BLAKE2B 8e795389da6068c88887ab07b0b5990cb62b8cd903b31289bb6d008dc0748a35fcb9ed16162ea3de07cda4dc0594a59e00fcdaa8b9918eef2c4ade87d655b47e SHA512 2f2e23b44b0e2b470c861ceeec76652da6a0f60ec1b89e0325ea2397f2d22154f91d5a0ed5751bf3aa88c6a45e351a9ce5fd0e1eb694cf4917022c2350be6a5b
-EBUILD rygel-0.40.3.ebuild 2196 BLAKE2B 6665bf9c94b37248662ccc87f31327ceee86e89df6db4f51a86a1fa7b7862c502361ae2b7837f648c387f029b5cdb1afa7f6ed8b609e8163ff3866a86e2b240f SHA512 eefbd8890849027e6d936ac246e2a6424f89fdbe0a7e7531b3e2658316f289a4bb1e5a82f078095d21cdab796dc1dd97b0a7abeb96e965706f68e1bf54e184e8
+EBUILD rygel-0.40.3.ebuild 2194 BLAKE2B 858fc3d94a4c726820bfdbdc89f5275788938b10ec289d96dc80effeac1dd5df75b90ecbd921659325b71640e2af848dff3c8cadd1aa77242a55405cf7333b84 SHA512 cd6497f442f1b41a8a17790557c00269f2112ff64bb075bf3404cce6a60e029371936f879a87723c91a1b97a89edd25b845509ab87f6d508a680545b1ae8e6af
 MISC metadata.xml 432 BLAKE2B efa83d6c3c964e076185ee541b7b25c59a7f46dd53f96900cc9a9b617133b476ec21747f6b70392fb3903075032774252b1580d90e512c0123d2dfc779d7591e SHA512 b8cf12e9798b778551cdf099ab7a87aa606e6c68697db1b1eb37e673cd2368781c80c9cbc41c5b492997ad4b39eed9f68075f7c4be8ec21ad021470757b72d1b
diff --git a/net-misc/rygel/rygel-0.40.1.ebuild b/net-misc/rygel/rygel-0.40.1.ebuild
deleted file mode 100644
index 882ffb84994e..000000000000
--- a/net-misc/rygel/rygel-0.40.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.42"
-inherit gnome2 meson systemd vala
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gstreamer-1.12:1.0
-	>=media-libs/gst-plugins-base-1.12:1.0
-	media-libs/gstreamer-editing-services:1.0
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=media-libs/libmediaart-0.7:2.0[vala]
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-1.1.0:0=[vala]
-	>=net-libs/gupnp-1.1.0:0=[vala]
-	>=net-libs/gupnp-av-0.12.8:=
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( app-misc/tracker:3= )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	gtk? ( >=x11-libs/gtk+-3.22:3 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(vala_depend)
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.36
-#   dev-libs/libxslt
-
-src_prepare() {
-	vala_src_prepare
-	default
-	# Disable test triggering call to gst-plugins-scanner which causes
-	# sandbox issues when plugins such as clutter are installed
-	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
-	#	-i tests/rygel-playbin-renderer-test.c || die
-
-	#gnome2_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc api-docs)
-		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
-		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
-		-Dengines=gstreamer
-		-Dexamples=false
-		$(meson_use test tests)
-		-Dgstreamer=enabled
-		$(meson_feature gtk)
-		$(meson_feature introspection)
-	)
-	meson_src_configure
-}
diff --git a/net-misc/rygel/rygel-0.40.2.ebuild b/net-misc/rygel/rygel-0.40.2.ebuild
deleted file mode 100644
index 36099977232b..000000000000
--- a/net-misc/rygel/rygel-0.40.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.42"
-inherit gnome.org meson systemd vala xdg
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gstreamer-1.12:1.0
-	>=media-libs/gst-plugins-base-1.12:1.0
-	media-libs/gstreamer-editing-services:1.0
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=media-libs/libmediaart-0.7:2.0[vala]
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-1.1.0:0=[vala]
-	>=net-libs/gupnp-1.1.0:0=[vala]
-	>=net-libs/gupnp-av-0.12.8:=
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( app-misc/tracker:3= )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	gtk? ( >=x11-libs/gtk+-3.22:3 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(vala_depend)
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.36
-#   dev-libs/libxslt
-
-src_prepare() {
-	vala_src_prepare
-	default
-	# Disable test triggering call to gst-plugins-scanner which causes
-	# sandbox issues when plugins such as clutter are installed
-	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
-	#	-i tests/rygel-playbin-renderer-test.c || die
-
-	#default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc api-docs)
-		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
-		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
-		-Dengines=gstreamer
-		-Dexamples=false
-		$(meson_use test tests)
-		-Dgstreamer=enabled
-		$(meson_feature gtk)
-		$(meson_feature introspection)
-	)
-	meson_src_configure
-}
diff --git a/net-misc/rygel/rygel-0.40.3.ebuild b/net-misc/rygel/rygel-0.40.3.ebuild
index 1b055e904ed5..782f36a2a7a4 100644
--- a/net-misc/rygel/rygel-0.40.3.ebuild
+++ b/net-misc/rygel/rygel-0.40.3.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/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index ef8d3205c40e..1bbb53c3e36f 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,11 +1,5 @@
-DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256
-DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762
-DIST s6-networking-2.3.0.4.tar.gz 87120 BLAKE2B 76d3c8507c489ffd0dd21fd2dfac5ea272e63ef5a7c489619a938bd164bc554bcd501705de78a9737250cb4bccb3f87485cb82cd2abaa601867c1ac451a417a2 SHA512 e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3
-DIST s6-networking-2.3.1.1.tar.gz 87461 BLAKE2B 43cbb0762c48c31f0ee2f73605436397c2f7ae34bc788844c9fac0f15bd5a5693a8499c808f913b3cd5db53b30c7ffa425ce764c1d701b950c8b18421ff3e8d3 SHA512 3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b
 DIST s6-networking-2.3.2.0.tar.gz 87949 BLAKE2B 675974fd5a2e2e764944eb314725834bbc1e4a17b87af9559cda4bca4a6cb3f0e766741519a4d5024f7a8608dfe80310801a59a2b04f8ccd42acede27efeffe2 SHA512 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d
-EBUILD s6-networking-2.3.0.2.ebuild 1745 BLAKE2B 360c99ab7eb421d065e8c491cc65b7092d4b3febf3fd04169b07513ee8ea562f4ad9e1d125bcbf2267601d27d212eb7d7217e516480bff6e80245077d3b480a9 SHA512 4d456947969d4d615bdd0ffc01ee22150d3b455eb65e24347dbbd7ddf9dd882331804cbe91f04dc537e7bd7e5df7edd33c6aa09fc625aec6b5e85f2afbffef48
-EBUILD s6-networking-2.3.0.3.ebuild 1517 BLAKE2B d2f75109ab0ed59d7473096b2df3edf7dbdaf900ae533a744cd1e7be56b40cba8043c6b7afc042123b7254168a7bddb11b563ed0790ad72a65119cbdaa7ede32 SHA512 353eea4f953dd62d4f6bc5dc054e79bd73d4f6183054a9a82c1bd8b8e532c0fce45dfb9fcfe200de6ad670b3918cb2bd74f9f81a485d7f83e86f4ab1ce4bf21e
-EBUILD s6-networking-2.3.0.4.ebuild 1362 BLAKE2B 759df0f62ade011bcd98f24d0d8e032307d0e3a4f82089b5165539b04fd82682e9849f9a4674b077323833e9962d9b2a8088b44d6b9f9f85a6534b3f930b8689 SHA512 4660c4d013a5c0891a56a44b8e16c972b0a80ca9dea86faefe6c4e51d36a119fdc78122286733213a8a42f01db775705470b126e53e8c5454ac9830ad66cf997
-EBUILD s6-networking-2.3.1.1.ebuild 1362 BLAKE2B 2f31a5477ede89dacbb44d2611b0d2ca75c4f7a93b5347ac8715be8f2fc1bf5d1a43c2a867b27d9a9923c97a28d1256385f2fb3242957a43cf0c062b00f45f90 SHA512 cff2b6e074b3ad8dbcc2cbbd358603d235d2d40396fbdaf4d061c3f2423ec30bd1a5cc14e1d3b355a19cb9a042329cdb143d218b90458a5b3a6297fa016202da
-EBUILD s6-networking-2.3.2.0.ebuild 1371 BLAKE2B ee3f5dc5c53fbdac7374abedc17e5ddd0e6f9190ebe31b150c0a21bca5a304dbfe7ffa951ff64e289b87922770ab9fe907980bb97768744b0db60f1231ee577f SHA512 e9cab5fa96b03aebf095c9dacdbaa220628653642dfad5618592e9cfbd9a739a2c3791424f39e91476c7d7656e37c8b3c0e2c84e2e498049d6369cc597bbc689
-MISC metadata.xml 556 BLAKE2B 53ea6bd22c3e4070fc6385b89a0f354d0653b261cd45b21c651ec27941c9336116b41756ca4909be9007690daf19c561018d959293b80a48407bfe6983837d6c SHA512 430f1d18c06bd8e943baabad1eebe043da8d0769daa93df3d2566795710930deaaf87914d08c922ea24c6069c4dfbc6b1127599ac4c8ff4ecedf8370372fcb9f
+DIST s6-networking-2.5.1.0.tar.gz 110443 BLAKE2B 489676bcb050d57482b0901742b53ce6cff00e25c1d8effc5c3d96d8e8ad0d32d42a62c15c73155d3b21fcfe6f310fc0f0c020bf945ac1a4b1c7fb9e9785adf4 SHA512 5d64420811d8d8a0034431dccda82b7ddd546f3b7c40ed02e05565c29c3ec14b75477306fea1a1e4aacc898e66e03718d7ac229b85be82d62bfe26c3ffc5fdf8
+EBUILD s6-networking-2.3.2.0.ebuild 1477 BLAKE2B 96d16dfe48d15634efc4a263166d313fda023ecadf16bb1ee699bb3c82da7f392b4e78e50433870a61532c39a30092e4bd0899e8791fea298382c0c0771c9a66 SHA512 f4801e7bd836a1813cf4c30c6cff479ecb1804a76a6f4149be5282643e53bd4ac9ae701c8981d1d30053ee22f9e983d8def1de2c5db8d8133a59fea7bd2c6a82
+EBUILD s6-networking-2.5.1.0.ebuild 1499 BLAKE2B 37e5180ff6def720c91084889bfa9611269ff101f1c35dc56e3be6a7b9c3021238918cd7f3c010787582a16d70a8c31717be662928a0ce6bce90b2a2f2d64800 SHA512 73cb9a9746d3e2e93a0a4d3cd8bb87c36aea727331878c64abb269df38a2b5562e1ece1ffe6a7a97e0a7bc6ef618ee842f2862f8fdf49264c0d783c24f183483
+MISC metadata.xml 807 BLAKE2B 3b0c32efb3bde7b1694f42e3210878e74b3b79d553cfde13815e4a3dee276540c8444191fdab060f3639ef8414ecc06c1efb3621a67b24a41c1fb3be01343a07 SHA512 a38d2ba464e4e6fa7da69fc2006e6110fcd5ab6e65d41676c4d8fc5ee06c5c9b4dc333ef83d1b607cd13927eb2a88d868aee92cd184bbc64d572a30900250833
diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml
index ee2befa691d5..eee54e30c122 100644
--- a/net-misc/s6-networking/metadata.xml
+++ b/net-misc/s6-networking/metadata.xml
@@ -5,6 +5,14 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		s6-networking is a suite of small networking utilities for Unix systems.
 		It includes command-line client and server management, TCP access
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
deleted file mode 100644
index 6aa894cbc45a..000000000000
--- a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="suite of small networking utilities for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-lang/execline-2.3.0.2[static-libs]
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-		>=net-dns/s6-dns-2.2.0.1[static-libs]
-		>=sys-apps/s6-2.6.1.0[static-libs]
-	)
-	!static? (
-		>=dev-lang/execline-2.3.0.2[static=]
-		>=dev-libs/skalibs-2.6.0.0
-		>=net-dns/s6-dns-2.2.0.1[static=]
-		>=sys-apps/s6-2.6.1.0[static=]
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2:=[!static?]
-	>=sys-apps/s6-2.6.1.0:=[!static?]
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-		>=net-dns/s6-dns-2.2.0.1:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/s6-dns \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--disable-ssl \
-		$(use_enable !static shared) \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
deleted file mode 100644
index f800a625df77..000000000000
--- a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="suite of small networking utilities for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
-	>=sys-apps/s6-2.7.2.0[static-libs?]
-	>=net-dns/s6-dns-2.3.0.1[static-libs?]
-	>=dev-libs/skalibs-2.7.0.0[static-libs?]
-"
-RDEPEND=">=dev-lang/execline-2.5.0.1:=
-	>=sys-apps/s6-2.7.2.0:=
-	!static? (
-		>=net-dns/s6-dns-2.3.0.1:=
-		>=dev-libs/skalibs-2.7.0.0:=
-	)
-"
-
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/s6-dns \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		--disable-ssl \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
deleted file mode 100644
index 7b2f39aa2ae6..000000000000
--- a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Suite of small networking utilities for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.8.0.0:=[static-libs?]
-	>=sys-apps/s6-2.8.0.0:=[static-libs?]
-	!static? (
-		>=net-dns/s6-dns-2.3.0.2:=
-	)
-"
-DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.0.2[static-libs?]
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/usr/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/s6-dns \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		--disable-ssl \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
deleted file mode 100644
index bd50b35c8b36..000000000000
--- a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Suite of small networking utilities for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
-	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
-	>=sys-apps/s6-2.9.0.1:=[static-libs?]
-	!static? (
-		>=net-dns/s6-dns-2.3.1.1:=
-	)
-"
-DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.1.1[static-libs?]
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		--dynlibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--with-dynlib=/usr/$(get_libdir) \
-		--with-lib=/usr/$(get_libdir)/s6 \
-		--with-lib=/usr/$(get_libdir)/s6-dns \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		--disable-ssl \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
index 356302cf9f86..a0221c4ec4bf 100644
--- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="Suite of small networking utilities for Unix systems"
 HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
@@ -14,15 +16,15 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?]
-	>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
-	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?]
+	<dev-libs/skalibs-2.10.0.0:=[static-libs?]
+	<sys-apps/s6-2.10.0.0:=[execline,static-libs?]
 	!static? (
-		>=net-dns/s6-dns-2.3.3.0:=
+		<net-dns/s6-dns-2.3.4.0:=
 	)
 "
 DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.3.0[static-libs?]
+	<net-dns/s6-dns-2.3.4.0[static-libs?]
 "
 
 HTML_DOCS=( doc/. )
@@ -33,9 +35,13 @@ src_prepare() {
 	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
 	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
 		configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
 }
 
 src_configure() {
+	tc-export AR CC RANLIB
+
 	econf \
 		--bindir=/bin \
 		--dynlibdir=/usr/$(get_libdir) \
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
new file mode 100644
index 000000000000..47a1748d6605
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+REQUIRED_USE="static? ( static-libs )
+	ssl? ( !static !static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
+	>=dev-libs/skalibs-2.11.0.0:=[static-libs?]
+	>=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
+	ssl? ( dev-libs/libretls )
+	!static? (
+		>=net-dns/s6-dns-2.3.5.2:=
+	)
+"
+DEPEND="${RDEPEND}
+	>=net-dns/s6-dns-2.3.5.2[static-libs?]
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/s6-dns
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		$(use_enable ssl ssl libtls)
+		$(use_enable static allstatic)
+		$(use_enable static static-libc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/net-misc/spread/Manifest b/net-misc/spread/Manifest
index 7622b43304ec..378732c52e1c 100644
--- a/net-misc/spread/Manifest
+++ b/net-misc/spread/Manifest
@@ -1,6 +1,6 @@
 AUX spread.init.d 519 BLAKE2B cc0795f77e5b94ebecdd178beb487555a039b8679a8cdd0edbcc54c1b0faa6bd52f481fc11e58ee98f0a6b8c6432d8fe79c1a2791093a6a8430ec49a3706fe58 SHA512 20852b8fe9b14a1b3cde97683042060382f7a66c28e2072ede63bca9752cd0c4307e5aad689b3274018cf83b0918d0418a99b162af67a332ecc0d90d0deb475a
 DIST spread-src-4.4.1.tar.gz 760038 BLAKE2B 250e6347695f5f6e8047bf527c92baa3cfb6c44ce88ea08ff6ab066b937fab29531743133e73e155a5cc07109b1942efe46fd1d3b74202264a2e8ef0f518a0ad SHA512 19f3fe897e4a4bd68dffc7d28d7b99826bbcbb5c2f44eb18127ed486063594bfd788c03c8c338b9b329302659325fa84a9cbfee3f202a9970afb1a560bb6f496
 DIST spread-src-5.0.1.tar.gz 803058 BLAKE2B b115675cb8ad89bfda7921d7ede0d168bfa833297a13cf5bba866505813fc255d3585b4a02e51409acda73597803ac691b0b6d329b189405004fce5505af7f1c SHA512 f57dbabb6e4d343434fe1c48bb8868cf601e22c599a520521a23c6dfa215b1d835fb2a7dc3b7cf124352060d12566c5f64114544428cc5a95e7899208379b115
-EBUILD spread-4.4.1-r1.ebuild 644 BLAKE2B 2c97f4c1319fbbc8830ab46db001d50ad9b2ef1e0ec7dfc870288f953013a10086f34a769e841ea857d482f03032766c2113793fa74cf3540c5d5fc4e8d90134 SHA512 f41fa156f4a190578e62052466d3938425dd50bb6b0cb59eb466ff3cae2e359aca046ffb67bc1c8f51a9dfe4e358160dec396061192378c35c5c0adc16201a2f
-EBUILD spread-5.0.1-r1.ebuild 646 BLAKE2B ad58e577c8eca88537e74422ef22dfcf8c522f047a9d637a0a6cadafbcfc127d2c15661669b12433a148ab53805edf2f86e7b841db1e34e8b5659557748062e8 SHA512 b23eb9333ef93c8da58fa039cbcc676a8b709ea734e8278db5b346d0d5d5f08b0b3e8e0ccbe51130e746f5fb0d31f4e61dd153fcc2acb40da39f357698733e1c
+EBUILD spread-4.4.1-r1.ebuild 646 BLAKE2B 62322f67e2b95d6f16473bb149e6e8cc786f986794ebc0d777534fa2bf5a5513b8cb6cf184a4406f0ef04f8b582ad19bfc8ecd1e771f802433b823a3b53e0101 SHA512 131b989e76c03280ac675f725bb883b5f111753f793d026e1feb69c0bec7b65ace5b97ff6319714dd416e6c1d640e03a89a4d6a5500a9eaed120f5233b853b47
+EBUILD spread-5.0.1-r1.ebuild 648 BLAKE2B 0f35a5ed365954fa9769df93313bb2a34d7f02d0042dbb224a164dd9d42f59563a474669d60fecdcee7af98f683df435134674f465d98a578148282f686e168b SHA512 37acac409be949f74ac54a037a74eb635cb945001c47116aa65963ad4bb6d0bc9878206b89e69f1571b1b6040a3a95137f4e40886d75f7dac7969a12563096b5
 MISC metadata.xml 246 BLAKE2B 8c6c4ab0f28d2c1596e95ac77be8fc6cf749d8729b00dd5020e45d3ffd91fc171e6785bb8d4669d3ba6384acac52ab891092fe4b02b70d04241a346e5af23c78 SHA512 ab9a981b4aff83ec5b1f003eddd7768a0d74a7701ce47ea0f813be72552450e02493c8705561b02975776537d0896539537bd95b89921b15cd2faa501339998d
diff --git a/net-misc/spread/spread-4.4.1-r1.ebuild b/net-misc/spread/spread-4.4.1-r1.ebuild
index 70da45c67ba2..260f3192f7a5 100644
--- a/net-misc/spread/spread-4.4.1-r1.ebuild
+++ b/net-misc/spread/spread-4.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 MY_PN="spread-src"
 
diff --git a/net-misc/spread/spread-5.0.1-r1.ebuild b/net-misc/spread/spread-5.0.1-r1.ebuild
index 85b0f141896f..8eb9fd8c90b6 100644
--- a/net-misc/spread/spread-5.0.1-r1.ebuild
+++ b/net-misc/spread/spread-5.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 MY_PN="spread-src"
 
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index a52c6e9d3883..2191fc78e2f6 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,3 +1,3 @@
 DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
-EBUILD sshpass-1.06.ebuild 413 BLAKE2B d078f03a1f5709a8902847ab7de93ef4ed46d8beb7a88cba1c18696130845ff81128397be048eae88ba26525fe99273a020cbf6d308e2afadb8dbb7f47d3eeaa SHA512 2fa9fd5a920282e3565b74c78b100b7e9774a4c79f008d674f9871246e72defac78649c9873c90af516cce293f6dca9738ff2245ea78880933e2684b8b325bf5
+EBUILD sshpass-1.06.ebuild 424 BLAKE2B ce3ebfd26ed91f6f178e7b243b0a7606703d3786888f71b124e95550a2a3fb5c62f7c2a81d16fe3866d8e1ca6f8a95535d7152ea79c315c10973528ae6b9e59a SHA512 cf54fa3510ef8fef7445f32f2d62350131362b046a8b45eb129610978d6c8863edb97a2e177108413f345f7ba780c9a532a1a930934dda6fb4958126efc1c364
 MISC metadata.xml 245 BLAKE2B 742dd0549c543a09d1713679990f7aed20165c67c2ecca674c272200e3d4f64d7f1b663d4669792dd476eeb7fc8960e87429f702ee1db96563fb816d3ef8ccee SHA512 f88712849405e0e495d0b476eeeb43814f569db2ec6a24b36ef8065f166c2cc977fbc4c64cf3a7fadf145bedbaa25af2ae3a280e6abaa29a7ad4a010c08f19c5
diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild
index 3388348d5671..959558c9047c 100644
--- a/net-misc/sshpass/sshpass-1.06.ebuild
+++ b/net-misc/sshpass/sshpass-1.06.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Tool for noninteractively performing password authentication with ssh"
-HOMEPAGE="http://sshpass.sourceforge.net"
+HOMEPAGE="https://sourceforge.net/projects/sshpass/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 740bc37a0efa..b0f8e28221f5 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -4,7 +4,11 @@ AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.60.tar.gz 984278 BLAKE2B b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228 SHA512 4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
+DIST stunnel-5.61.tar.gz 873660 BLAKE2B 450c18af02710e39dbbd89a6fefe5c73977ca6e402196ffa71de2392f16f4e49282b76e77222053103d0123cac64b353fc2e7db391b1496262b05557ac2d78c3 SHA512 e228d21fb39bba0175684a70d7323ed839c689810fccb84e9140619b22a7ce91c0ac2a38107c3c52ac9652a02d10918d087459673382ea4d00df8b3ad3abe6cc
+DIST stunnel-5.62.tar.gz 862456 BLAKE2B ba551fa8455314bdf5088fccbbb4b7740f00be6d15362a0d219242c3b1a8197327549ccf85dddfa76b4a8f06f9ece6313f122e1c1be992797cda97381f5b40d1 SHA512 4ce03faa27e417b49fbdf0fbac91befb2c05ce64694b4b6fd2fc482031ee4a229299627133a47ff3efdfdffce751e1300d95d0a8ac1f1858c7c96f0b067170de
 EBUILD stunnel-5.58.ebuild 2951 BLAKE2B afa7a612d238ba4e1195da562a63d632472cac4c11affbace964201206e7dfe472fd757ab548c0a2834e0b8cbaf4a1f44bd34d888a37a8dcabe04f57ef76cd88 SHA512 947e8b54f6d21b980bcc4afcd43a644da26ff8565fa6ad312c8086d2c782cd345a20fda94781296df4e8c913b5e0b88ddf582588a430bce4b9d4bbde05c3c651
 EBUILD stunnel-5.59.ebuild 2998 BLAKE2B c3421d1466ef1c50be9a0080b0fcabc4a0dc1d898fd3b9981adc7a80d5d6fe74c8cd883447f6fe2c46d89cf8e4fe1cb3b9ee6c920da652f705a3d55f5f1567ff SHA512 34491f45e231755ca5fed2a84c08b3e74d67ec125b12ee3ef3d111fe7e4df9966812052f402502b23935b514296c168d6bd4966bcde32edc5d25f6a02c63328e
 EBUILD stunnel-5.60.ebuild 3004 BLAKE2B 18ae3e208e065f910159202d3ee2635d100deb1e9be0ef903f5cee3b44ab4f0c604aaaf0ae91d62f28bfbd57bb50caecc5f1e5c004122219cf3ff33aff80cd19 SHA512 380dd888e2c5e313796c091fc0b50da00da6f98227cffd4b5fd5f90663592a327f9cb175b2aaa997a76656066c3f080ecd993ae0dfd467cc8d1159cb4d8eda49
+EBUILD stunnel-5.61.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
+EBUILD stunnel-5.62.ebuild 3004 BLAKE2B 4cc8c789a7f886531ef368e9f607b91b2d1761cccf267a8b2dd32385ff43097e8baea9971831593f67b656caa6393a1402e7108574c3f5c318067a003787ee61 SHA512 4455e2522b6335096ee82c331a35c92fea8fff86e1744677c91d85f141567dc60600c0b3fbe3b8f5631aa1754527d15028c9c7e79c71398c3acab0577d311c19
 MISC metadata.xml 797 BLAKE2B 223460276faf20ee415c5c0137aefe26cfd54df0049cdfce1c62bef53aeef6c9f35967d05995b8a3a2e8958e427ae34dc3acb26aa7939d7b52f8996d324480f3 SHA512 a391483377cbdf230f6d41f9dfd88b76a2fb3219b868b4c090e6ba977482378599f1d087d884f88b31f2a76e2fccd37f72ee6a7cb39aaea5f4b6179c64e75fd6
diff --git a/net-misc/stunnel/stunnel-5.61.ebuild b/net-misc/stunnel/stunnel-5.61.ebuild
new file mode 100644
index 000000000000..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.61.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable ipv6)
+		$(use_enable tcpd libwrap)
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	tmpfiles_process stunnel.conf
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-misc/stunnel/stunnel-5.62.ebuild b/net-misc/stunnel/stunnel-5.62.ebuild
new file mode 100644
index 000000000000..e95ddd9a93dd
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.62.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable ipv6)
+		$(use_enable tcpd libwrap)
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	tmpfiles_process stunnel.conf
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 16cf7ef9e973..396c49a6c096 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,3 +1,3 @@
 DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d
-EBUILD wget-1.21.2.ebuild 3043 BLAKE2B c415c2a851b86e244b00c30db3eb28bc1f3ddc7d25cf739a9f69b68e24fa9e50faf9490e7978934273460ed6d8e438d455badb3217a45cfaad0f4311264d222d SHA512 7d9b9c0a11cddd11f055fc49ce774fe23d7cd9053cfc7f782e35b75684a1e8dfe0660013b78a1074d029f5fbdfaeaa9d63c8ae4983fc0cc4d00c6137bcbdd51a
+EBUILD wget-1.21.2.ebuild 2873 BLAKE2B b0ca4fa3105c73c9623e788863cd6c46b6da3d4d2f7f158538a7b5468560648d89bfef1900818ddf64343cc8e5d3675b1324835c30964767b51fab2c94e44e90 SHA512 4c2c0e9751fd37ce85be5c9abfa028f0813d17b7d0c902792406e4a94c30590781d00d243e936fd4a107090921d5ec4023c358e712c84aed44bb99d6982936b9
 MISC metadata.xml 740 BLAKE2B 1b36b1f6e8add5fcbbc757974dd8d9f89b4fb62ad1cdde882ec464e2348773e28f923c89259fa56b8d080be1b1975d91c113e4f10553fdd87c3d270bf29c393d SHA512 25e2e34967bd2a04f5aae19849353c798084031888a3aa300a4f9d4ef9029c41a4cc013a842c906dcc2720af155085e047ed99e45a102589f59625bc60042238
diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index d29f599f5169..ee17ffe2ccf4 100644
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -58,14 +58,6 @@ pkg_setup() {
 
 src_prepare() {
 	default
-
-	# revert some hack that breaks linking, bug #585924
-	case ${CHOST} in
-		*-darwin*|*-solaris*|*-cygwin*)
-			sed -i -e 's/^  LIBICONV=$/:/' configure || die
-			;;
-	esac
-
 	sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die
 }
 
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 999538899be6..07c2f3148460 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,14 +1,8 @@
 AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
-DIST xmrig-6.15.2.tar.gz 1743179 BLAKE2B eabbdb6d901c5b64162e502e5cef131ee8edcec9a93b090067b2cc498227c158aeadff34b505800908b3a5f60b5db70812d1c5aa8330ec73de80b9376d679f74 SHA512 17e8f5bbbd1ce1bd834db0a9d1cae2635390a62ae370c9ab2fada1cde2d49dffde12da7b4c7ab0d61e9b9776067c760b9bb936ac8440c6b825de3e5850559a9c
-DIST xmrig-6.15.3.tar.gz 1744681 BLAKE2B 18ef0f9e0e496bded7fe860218871fc3b321d8cd9182c6694d62115d36383c2854e7b0daac09800ee5b69a1ceac5f7d6cb43695acb40b2f7fc9bfcd8e7fa9a76 SHA512 8c20e2a89405cb7fb3763b6184f6db9dbbdb6628e6d5d3cb62c35d87aa4c54daab5efe8682ed0f0ec3bb6577af0d0e5f41f2f864d52eee41081449e372649a2a
-DIST xmrig-6.16.0.tar.gz 2413469 BLAKE2B c7aded1f438613025286ae9047f7c3a0297f12730995acf3d412f567b850434c6663fa9c849d8c0a1169a4057e925644fbfeff11b502324c8512fdeaf0f365d6 SHA512 6b998410e36eb2e1f2b1c8cefc1faa232c96f0165b1766a97c83c0550fd1b8f3c1cf892245f951f9fda068e9a6d32c30552512668675e12b5d6b011d65d95745
-DIST xmrig-6.16.1.tar.gz 2417592 BLAKE2B a74e7b4393f2d3af7bbea114261f4878c3edf09653bdacdaed02a261dc49ab34a9e0169897dde9e3f2e89bbebd3b302d158874e9db7ce2ae07984d6463a3465d SHA512 f4475018ad05a5cb55d814527db273d9b0260e3fde29d572a4762acdd3db58aa0baabfea9c549fb9239c2b076c32b6956227d789ca6aaa62524b3c381617f205
 DIST xmrig-6.16.2.tar.gz 2421650 BLAKE2B a850e7dce19dfec87644b1d8c3f445141fbf9bce2f2fe8176a7c5e528da67417728e9c327a05dbc32ca0b7b5d0536a9d5c19dbe5cdb0106763693574e58c62c0 SHA512 b845ed501e8d9829ceaf9ab31b493997cc489dcedb1eef91624d1cffa9a7e8e5baa4f85653eb40a3f27debe1710f5770df0e582ab6e857386b6d5ac3bb101e67
-EBUILD xmrig-6.15.2.ebuild 1331 BLAKE2B 8ee8edaf12c04ec64e64520e57e08c64f7f262a11589372023e7ae0b57ff3dd7a7d4d039c524781ace336c12eb44eafaca4ca3356797aeb2c56cb18eb738b17b SHA512 7c5439f973e51776a1c15e6764a5a32d3e7db9f21c1086120a8dfdd328dfb18c02327c38e99a6e822e702586272124f23e27cf95e829f4311d80e3198d8055a6
-EBUILD xmrig-6.15.3.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
-EBUILD xmrig-6.16.0.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
-EBUILD xmrig-6.16.1.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
+DIST xmrig-6.16.3.tar.gz 2422531 BLAKE2B fd98c16c05d2eb14092f6472670b04be5dde645dde85afbbd8aa6075b5b5e4182aa8e7ba40cb85836b871a7abcac0472df3f76984b150b501f92d3d2a4e88e54 SHA512 84b0b2c9a134030e1d5be03d66f4d6fde058ebc2864a1cc70957b600ddf08a4498a9d18fcc6529b9a742e60aac17633e1580202488af69f2acc8114ecc8eb78b
 EBUILD xmrig-6.16.2.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
+EBUILD xmrig-6.16.3.ebuild 1341 BLAKE2B 4fd507e2a632944e37457aaba67f22031fbd7f39409f54b4818aa54606e66f2e72bc879093e1558247db5694add5b3b1963700b9ab7d05933962799d653d60b4 SHA512 4618b630f836af9d623c0b72460546c1f16c7f7d5b2c6db5275fe81a3c7e630670c8b975485dcdba976009b3df16a21cbeabd3a755e3b43cd7d43099a9da4f34
 EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
 MISC metadata.xml 1033 BLAKE2B 9f8e1d1a6e6cc807536149bec4b2b2531a49f1915a3628e5ae9b55f5fd4c85a924403807bc34a8c1a065282c8e5c27cf2f87bae4a90d3b182f5a3a058407a601 SHA512 4e47c4fea9083f5bcfdd53d2a53f04fca9a5cb088b71d28d960d3fbf21a91e153fb99a738a986d7bff6ced690a86333801d3f27d2e6ca69b4445a2fba5a17b62
diff --git a/net-misc/xmrig/xmrig-6.15.2.ebuild b/net-misc/xmrig/xmrig-6.15.2.ebuild
deleted file mode 100644
index 0e1b2b59f3ec..000000000000
--- a/net-misc/xmrig/xmrig-6.15.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.15.3.ebuild b/net-misc/xmrig/xmrig-6.15.3.ebuild
deleted file mode 100644
index 2639977e5a05..000000000000
--- a/net-misc/xmrig/xmrig-6.15.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.16.1.ebuild b/net-misc/xmrig/xmrig-6.16.1.ebuild
deleted file mode 100644
index 516d44208bba..000000000000
--- a/net-misc/xmrig/xmrig-6.16.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.16.0.ebuild b/net-misc/xmrig/xmrig-6.16.3.ebuild
index 516d44208bba..0b726e03276b 100644
--- a/net-misc/xmrig/xmrig-6.16.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index f11e6ca2794c..f2081d4e1f6b 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,4 +1,4 @@
-DIST youtube-viewer-3.9.6.tar.gz 259715 BLAKE2B df6ec66ac63e8d2c815fdb507f3e2aa168c61dda2005908131e9074e54b0a4bb23dcd23ba47b6daba0d022c3b387d03ce8f67e6f3d42b3b182a3ead82965c328 SHA512 205cb691325c7cc09b981a1e04c3267e59016dc5f300cf929cf41693d5b10e61b06a021c8bf5d14415551440f9d9d433edb2ac53f4698b7f3ad811ae0045b70e
-EBUILD youtube-viewer-3.9.6.ebuild 2140 BLAKE2B f7cf0a2a840adc259be361603f2d5c248a0d1c7d2e9e6ec8d3ed55ea7a946bccfbdd00bbad0ed02d47ffa7d8c141c755997a9f8ae565b853161f4cb06d78e39e SHA512 c6159145b068330b71b45360d1fa4f0cff1bda7749285b33eae9772d684320df89c558db37b554598a15ba774d31ec3b66994ee89f8d27ec09ccd6b423c0143d
-EBUILD youtube-viewer-9999.ebuild 1932 BLAKE2B 73a41a742d47da2eae82a467d0ed1cac93e3637873b67af9e4d868eabeebcf19bc0a0c4625a3951411f320577d4eb65f88b497f5b4e3fb8b54b113b27bc8296d SHA512 adeed06bd32b30e18c32a0add6f6e941ef067bdb3f276f7bdd7b2286293f7b82d967870e15c461dae9279371f2e4ecd4e291c9a196313f741b295709e6289d6a
-MISC metadata.xml 928 BLAKE2B 2cad26ef30170e608d4d9ee54b22f1e843a3e4d5fa6856bf99b0953eca10e8f0a9690d2edc7ea7d89a04f9803291b3764b5a05c0d20eca8e297aa6c8546f6d49 SHA512 89e5abf5239cbfd09b610760ffcf2db5a6963c02081d974ea9efb25b779828ac2b5b1a22dd112bff4dea8b7afe679cbb50b7762f6fd48635c3db3c0024224e25
+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
+MISC metadata.xml 856 BLAKE2B 669dd186f7ce3cbe787ad2fc06dce3104597050d4eef4c02bb26d8256dabb082dc2e5826c2184ffcb6fc18217189d9953d902245b8e2119d3419eccfcb7a7636 SHA512 a3ca8ef08797a5fe27ce5f29a35f7989b736364f8597c2c9726dd92db0f2534c61fc7745f7f674614c832b7c314ee5e3cedce54f570679d81b52781fb7124f1d
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 24f114d5e4d3..8fbfda7cbeeb 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -15,7 +15,6 @@
 	</upstream>
 	<use>
 		<flag name="gtk">Install the gtk3 GUI</flag>
-		<flag name="gtk2">Use the old gtk2 GUI instead of the gtk3 one</flag>
 	</use>
 	<longdescription lang="en">
 		Youtube Viewer is a CLI application dedicated for searching and
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.9.6.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild
index b4cd505eca6a..a50388a8f25e 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.9.6.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop optfeature perl-module xdg-utils
 
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
index 408761565f06..64a0ecf7ea73 100644
--- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop optfeature perl-module git-r3 xdg-utils
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+HOMEPAGE="https://github.com/trizen/youtube-viewer"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/trizen/${PN}.git"
 
-LICENSE="|| ( Artistic GPL-1+ )"
+LICENSE="|| ( Artistic-2 GPL-1+ )"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk gtk2"
-
-REQUIRED_USE="gtk2? ( gtk )"
+IUSE="gtk"
 
 RDEPEND="
 	dev-perl/Data-Dump
@@ -40,7 +38,8 @@ RDEPEND="
 	)
 	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
 	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
-DEPEND="dev-perl/Module-Build"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-perl/Module-Build"
 
 SRC_TEST="do"
 
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index de56375bb7df..2312295f6520 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,3 +1,5 @@
 DIST yt-dlp-2021.12.27.tar.gz 2102852 BLAKE2B 69a3a9c916771ab2e1b8f86bbc43e03d0543801f587708b638348088d4454aff8ac93420fd8bd2ebb4f493c74acdf23f08a9495dbcdad77d840a95cfece4aa6b SHA512 2c687493736fabe131481d6bf8df13afc1959ac1458675bfe3c4273df7bb64218f84e07ea324b664b0a52c3e39b3e10999e81bc907bfc98a71a28c92dca90737
+DIST yt-dlp-2022.1.21.tar.gz 2160713 BLAKE2B 30ed1c7a317318ca6a6ee183ba8e4396420eb090ddacc64ddde2bb4077c7c45b01c00caca90d1b8be501f90c71407e27d6ef847fdbfea8bed488771f9b59bbe1 SHA512 5844d49dbf50842d4d51dbb00c16efea816322888d16a8dbce16f976f0dd1625ec8243fcdc07e721180a2f02cf14ebaa0d83a1437e331b4aa68c404db3f1e9f4
 EBUILD yt-dlp-2021.12.27.ebuild 2008 BLAKE2B 289ee6fd98fd60002e19aa82c706dc67f72a61c26b82fab1ec6cd9bf9d9461f8373473bfaf1c1be6931d0fcf98283c9868522c1b6fa805be3cb159e58985642c SHA512 cdd1d4390e74f2463a37db297b40ea0ba50c7676a364db00292242ea16a2488900d3f87a7db77724fd0d39cadc22c2b165766353d66f85af80d210ef61f817c9
+EBUILD yt-dlp-2022.1.21.ebuild 2008 BLAKE2B 44e2cbc30a11378f587290b6f259ad5dde2bd59e62f7f85e8fa569edeb152bd31f1af78d5d47a33bd87866904f0d71626f1d8c2aeb75ebea97badc21c69ddda9 SHA512 7a44de9098a8e3ac0296b71b28fa90ba81de9318e4750b5acb7aa318d32afbdfb84332ee6fee05554c57068fd8fd18035ebb0a4a64cf675793e5209832b2e57c
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2022.1.21.ebuild b/net-misc/yt-dlp/yt-dlp-2022.1.21.ebuild
new file mode 100644
index 000000000000..a9f9a75ef095
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2022.1.21.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1 optfeature
+
+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"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri setup.py \
+		-e "s/'(pycryptodome)x'/'\1'/" \
+		-e "s/'(mutagen|websockets)',?//g" || die
+}
+
+python_test() {
+	epytest -m 'not download' -p no:markdown
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	local sitedir=$(python_get_sitedir)
+	dosym yt_dlp "${sitedir#${EPREFIX}}"/youtube_dl
+}
+
+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
+
+	newbin - youtube-dl <<-EOF
+		#!/usr/bin/env sh
+		exec yt-dlp --compat-options youtube-dl "\${@}"
+	EOF
+}
+
+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} ]] ||
+		ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; 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/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 0d36bfd92f48..131f34959820 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,3 +1,3 @@
-DIST ytfzf-2.0.tar.gz 3227372 BLAKE2B fa67fdc44174e1a0bbbf581f51fc0010230a6de37a38f54bd6c3b5dc1a8ae19790486db90ab0ab1f15fa1a70b544dd7888ec88c6f53ec5c2543235f64dc1ab94 SHA512 43c43b6a446335a7eef9d206864069df1e075d49151b359ead47de6e7234efc1042ce0557233e53c303d3c38572fd33a955e229c457561211250ddd0df5ccb0e
-EBUILD ytfzf-2.0.ebuild 1362 BLAKE2B 1f728488f93a7a4f0dbb7ecb7125665698931e0251c790f961626b3a0486281992b74a3322b73e0098907ec1b30cae6dfd846870349ec214e70552c99341078d SHA512 cb7352b026b094e77b97e239c5d4491f935655287b1f3db7ccbe1830082e8c3f9bf059fd465012751fc3ba5e08e3c934f8685d2a89f70d6f20b406573de7207b
+DIST ytfzf-2.1.tar.gz 3230643 BLAKE2B b296048c976c260b3192f770bdf2dec99f5ad45066deeac23429808254552ea125ea8a8d129c47a5110916c4194f7b7742dd01f095809f4913077600a8205d4b SHA512 a86203bc1dffd05ff3543c44d5612bc8b0ffc675ce0484499cb89aa88c2618c88e832dd95ff2cd6f1803698c1c3264709a1e280ddbb9fb0985c0178f3adc16ea
+EBUILD ytfzf-2.1.ebuild 1446 BLAKE2B 6dea43c53ca9eece6a40cd01eac6b332df2c9035f8f2dc1ec901786e119767f6c382a3b228f75086a7c301f7dd42f65cdd467f139fe2f856567573c83a215194 SHA512 39cc4b5c03c8e417dd093d5052375dde09203a2b7a635049fe7cbc4c1047b43061ff13db0962207495dcc15b0d8c2a94e8cf4cc8655289ca8c32ccf94c542256
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.0.ebuild b/net-misc/ytfzf/ytfzf-2.1.ebuild
index 66efd3b37f84..c11320bd52ab 100644
--- a/net-misc/ytfzf/ytfzf-2.0.ebuild
+++ b/net-misc/ytfzf/ytfzf-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,7 @@ IUSE="minimal"
 RDEPEND="
 	app-misc/jq
 	net-misc/curl[ssl]
+	virtual/awk
 	!minimal? (
 		app-shells/fzf
 		media-video/mpv[lua]
@@ -28,15 +29,21 @@ RDEPEND="
 src_compile() { :; }
 
 src_install() {
-	dobin ytfzf
-	doman docs/man/${PN}.{1,5}
-	dodoc README.md docs/conf.sh
+	local emakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	emake "${emakeargs[@]}" 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 "in-terminal thumbnails on wayland" media-gfx/chafa
 	optfeature "desktop notifications" x11-libs/libnotify
 
 	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0; then
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /net-misc
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)