gentoo resync : 20.03.2021

200 files changed, 4327 insertions, 1586 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 17dca0abcb00..3501868e7690 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 5a991ae178bd..0127300e3e10 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,9 +5,7 @@ AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.6.2.orig.tar.xz 334412 BLAKE2B 4a104337efc8a901d137bafefb6e4bdd90972c8584cef6cce470386c0f26638c5d80a99c12789e47eeae572d95483620435c4adbedefc64af98f906681e255a7 SHA512 8ad40e22ef5b2d952f1968431e8e2a64bf83223424866426ce04d67647b6a7e44e63dfcbe8269606b9ef135097e6d88a16e2b825c1be5c074dba706d47df5f61
-DIST apt-cacher-ng_3.6.orig.tar.xz 331300 BLAKE2B 6c3e118e2b2d79492d6b33f1a40fd9e4aa963e90141706b84603e69551e37f99a813d59c564d442b38eea2ba3b115913d767c9a97da0b08b5efe8bfe2b657acf SHA512 6f58afe10d9e5adb036ca2de67cf017415623dc0552ed60a64967ac248a1cc44be87fd9ddf8905a16d347bd1367425a46316ae6cd4fdc2f1e94f668b59dae63e
-EBUILD apt-cacher-ng-3.6.2_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
-EBUILD apt-cacher-ng-3.6_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
+DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792
+EBUILD apt-cacher-ng-3.6.3_p1.ebuild 2545 BLAKE2B f954883b51527cc8b7838824e54afe851008acd51cdc2aab0b85f01f07c5add2e57cb3592dcc22d33866dcf05b37f5e1db6d8b67e3a894822bb736554c55873d SHA512 68c9b4d7c17b193cc5f1bc11f2b3ffe9b4015c69712dd774b99b3b2e508a65f7b7227e5c92d2958c53ef7304692fe2de54578091d0c4016b1624e76464e80c85
 EBUILD apt-cacher-ng-9999.ebuild 2400 BLAKE2B 79834b1870b720d0bf4d45ebd8914e8a7bd85b0fecb5c3c6a471e1bbcca6bcbcca40000a19850eb7d7aff58b9d294fba196dd64760e06978452b5c8d37a0028b SHA512 135c66bd0e00f46a2f6ba12acde0551a26168219b1843d0e256bc9673bb7fefdcffb824ebcf6fcef348139aa31b13e1f498d572aa166ee848f4102c5d193dca4
 MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1.ebuild
index ce6af89f9fa7..ce6af89f9fa7 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1.ebuild
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
deleted file mode 100644
index ce6af89f9fa7..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.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
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz"
-
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-DEPEND="acct-user/apt-cacher-ng
-	acct-group/apt-cacher-ng
-	app-arch/bzip2
-	dev-libs/libevent:=
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse:0 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.1-flags.patch"
-	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
-	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
-)
-
-S="${WORKDIR}/${P/_*}"
-
-src_prepare() {
-	# Fixup systemd/CMakeLists.txt cmake version requirement
-	sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die
-
-	# Make sure we install everything the same way it used to be after
-	# switching from mostly custom src_install to relying on build system
-	# installation
-	sed -e "/install/s/LIBDIR/CFGDIR/" \
-		-e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \
-		-e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die
-	sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DHAVE_FUSE_25=$(usex fuse)"
-		"-DHAVE_LIBWRAP=$(usex tcpd)"
-		"-DSDINSTALL=$(usex systemd)"
-	)
-
-	cmake_src_configure
-
-	sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
-}
-
-src_install() {
-	# README is a symlink to doc/README and README automatically gets
-	# installed, leading to a broken symlink installed. Fix this by removing
-	# the symlink then installing the actual README. https://bugs.gentoo.org/770046
-	rm README || die
-	dodoc doc/README
-
-	newinitd "${FILESDIR}/initd-r3" "${PN}"
-	newconfd "${FILESDIR}/confd-r2" "${PN}"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" "${PN}"
-
-	insinto /etc/cron.daily
-	newins "${FILESDIR}/cron.daily" "${PN}"
-
-	# USE=fuse installs acngfs, don't install manpage without the bin
-	if use !fuse; then
-		rm doc/man/acngfs.8 || die
-	fi
-
-	if use !doc; then
-		rm -r doc/html || die
-	fi
-
-	dosbin scripts/expire-caller.pl
-
-	keepdir "/var/log/${PN}"
-	fowners -R ${PN}:${PN} "/var/log/${PN}"
-
-	cmake_src_install
-}
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index 5111f32a7b99..705dd682cda4 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -80,4 +80,4 @@ DIST asterisk-core-sounds-sv-sln16-1.6.1.tar.gz 30557672 BLAKE2B a656655ac958edb
 DIST asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz 7254975 BLAKE2B fbc603d336d7ab43ade6019830aa71c71855e773c5998c951fa7c8df7946392a66b02c50e6d4bcf79bf25b7104788b5f1b289cf95785cdcb9f241e12df280e1b SHA512 0b172986f4d07572ee098370c2354ecc60d3473d62f0b6667e48df005b234991a906fb84ba7c67aec8fe6bbeb459ff58a1b3d3d9dcc6bfc08087fe62e799f0aa
 DIST asterisk-core-sounds-sv-wav-1.6.1.tar.gz 15042378 BLAKE2B 5f62bfc3fdd0715a15406f281af5c17b46e918b797ac8fa7430ff4e17249513509213c3a15c2ec9d12d2258545ef0be3fb35348617ffe65806ce4bdf74146d44 SHA512 7fe05dff8082b93e5b79a4fb93c873f9c618e1baee03d000a82a98b2d305fd837e32f3bd502896df50aac6e30421d0f48ae8122c1fabbee3bffc45d8717b3b60
 EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1750 BLAKE2B 506f63453a482619e5366078b4f971ccf7b85a5914a711f69ef1bae95e0c1bb67a75ff982ffbae0f70f24f4d4111fb3fbce8a48a367a316bc90327286a540266 SHA512 ffc5ec8861ff0b308ee91169c5fdfd51c9e1c212be61478d2256d5abaad3c936cc537da1236d466b0f09b19b00b9686fd7688a8029cdad9bb9377f6befb402d1
-MISC metadata.xml 982 BLAKE2B 7533ddfd8e1b53e146396e17afd9820007c39d11c502332690bfd722fab809c4294dc1b027308eecd315e850f58285aee0bdaee75430179b072a70644efc6a22 SHA512 8930691058fca9da7e8ea2dab459344904767b7369703b6e382601a9995567d850febcb20c1e527e5a5d4c624f00ff128f55d034d878e621c6e488fec20762ab
+MISC metadata.xml 1012 BLAKE2B 632a84f05bd99531c0dbdc0b14de350c506fa8a12e1bbd7d33508c0eac22d73f987aacb3f278fb5687da9f6f57f7f9acd4a689dd8d219887cde0122719a0d43c SHA512 16f5e898cfd797f0cb7c59ff4988d04ace632660cd76bb5049fc0881a230bf42732b35d66a2ff0d046bf24affc76ef43b0b108746fd3a7bf6f51e5824bee7d6e
diff --git a/net-misc/asterisk-core-sounds/metadata.xml b/net-misc/asterisk-core-sounds/metadata.xml
index f280e1412562..ba923061405d 100644
--- a/net-misc/asterisk-core-sounds/metadata.xml
+++ b/net-misc/asterisk-core-sounds/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index 261e647f6214..0f4f40c31b27 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -26,4 +26,4 @@ DIST asterisk-extra-sounds-fr-sln16-1.5.2.tar.gz 46455599 BLAKE2B 9393a1cf69796e
 DIST asterisk-extra-sounds-fr-ulaw-1.5.2.tar.gz 11539559 BLAKE2B 919cacb90afe5a0b31c886184a666cc7e9d6af82cfb319937c597f5a54beead748ed64a774d0e291c680ebf998d773b9b23a4edbcf534fb74daee58a67190833 SHA512 ae3f2084be7ca5be9106afdff9c6c5f059ac4628e7a866e166a6ce70a74fbc388ddb27daa03394fb9c7009236d615d7e8c7c00fce45b64995e0901a05aed15ec
 DIST asterisk-extra-sounds-fr-wav-1.5.2.tar.gz 22856532 BLAKE2B 921135610f7329893f0a90e88845507a26240948dde9fb4b83db4e9133d79fbd395336ceee2504e2438f868216901eb7bae79e2c63168255bc538e2892469102 SHA512 edbf1b36b2c2083f696f52021e7719d4ac6ced29c312de77465fb3ca7d9444e09cc91fe3c6fdb45140124c44418c571f2ce1145fcff5cf88765bd0d62770e3b8
 EBUILD asterisk-extra-sounds-1.5.2.ebuild 1798 BLAKE2B 8a3a744bf8e08f1d2db9e709f21c7842f40683bbeddbd5464bfbd823eb28a9edaf88ee4c6c867e296554d5f1e167c90d02eb846c1a3a231c18f643fea4294a41 SHA512 7335626ccb5408a2e547028771b0c6f8d42974ab4ca80e4f8578c7c94827249b6b20383b5316338fe4016852a23ac565e1e9c6ac967675e6ed2aa4b1f06dc2b0
-MISC metadata.xml 1052 BLAKE2B 687ef6900492c38b560c1b5d0b933c68f4ca5c19e6550e4eb4f4e2f5f244a33bbddf09458d6c39cb73801abce99bc8ab8dd0e6e41ab101843543c870e3b481e8 SHA512 907a2f028e59349bbcd6c2f41ae67d5bee8b72d73ab0ad0ee2b47eabd6830cb62c43bdf80548612c9b34bcf220d9a7998edd847c0ffa1edcdac2b36430eadc1f
+MISC metadata.xml 1082 BLAKE2B f623bcf0110a1c0564d74d95cefb690ba733ae61b67701b2c0ae4d44eea3ca923a4642fe839cf8d80c6f5f2cb4d12b46b699f237048dab1022191932ff7020a5 SHA512 ffba91f8f20a3c366123fc55f83fed8a53fac35231b3e2beca5311646548c4390b2932ff5f37f4465b6af435059ca82909f17cc0018d3fd018db35745cd1723d
diff --git a/net-misc/asterisk-extra-sounds/metadata.xml b/net-misc/asterisk-extra-sounds/metadata.xml
index f15e5130f0ad..52fe6e9ecf26 100644
--- a/net-misc/asterisk-extra-sounds/metadata.xml
+++ b/net-misc/asterisk-extra-sounds/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index 0c8b4386a01b..3a0b4279b26a 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -8,4 +8,4 @@ DIST codec_g729a-16.0_3.1.9-x86_32.tar.gz 476772 BLAKE2B e1a7b8baefc551f16618fde
 DIST codec_g729a-16.0_3.1.9-x86_64.tar.gz 475819 BLAKE2B d738dccb1e94ae5458b72de7f52d3bb9964f3be993efe44f615bc06b0c17638ac743dd0465a68c172f339d888ceac35b54babadd217c13b028575c3b1e5aa94b SHA512 f6c60c66fce03ea5ce02301dc9c8b5a93fefbc60089980401cd1fee58357b2c03ab2b12eb50df82d2f3a25613e37c1bb370a319cf0a36c92983ef98aa137429d
 EBUILD asterisk-g729-13.0.3.1.9.ebuild 1895 BLAKE2B 775ed24bbf5d00c880f29a545d835f8d796d0a2b5869648875545cfc8004aa388e5c71192eacfb88ddc79349ef774325871c8eb4f51308cb8878e4162d427f91 SHA512 facfeea9503997a4700f79a2eccd323a1b891d1eb4db642946170ed7811e2275758c3b91c756ff7a59fb67eec4a7efada14d1e299ed8c54efbdc5d3993e20291
 EBUILD asterisk-g729-16.0.3.1.9.ebuild 1822 BLAKE2B 2b4b37e2bb698709c0584b4473e3b47426c6e84e92e5f76c33aadde4fd1545a7f37c167e9e393f9e9732d30608c7e6a6f711c31d3ec77b1f94057e943833a8c6 SHA512 47de616999a25657435abb2ac96fb438344903fba37f98c99ecbcb191c78675060574c56c5c0318e92ae1b8e0ca4ddec829c0cf65cb2b553a46354029cab7b69
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/net-misc/asterisk-g729/metadata.xml b/net-misc/asterisk-g729/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/net-misc/asterisk-g729/metadata.xml
+++ b/net-misc/asterisk-g729/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index 215ef3ef6e8b..4be3480ad686 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -8,4 +8,4 @@ DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1f
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
 EBUILD asterisk-moh-opsound-2.03-r1.ebuild 867 BLAKE2B 5b6254344cd7f637e53e49659501a94e263194f62e5e0e79107c3436a2c87c936991f324e02ccd75b885a182198db613ef269cc9147a8be56b6316ce472efb5e SHA512 6290a0a123b060b053e72a31c4337535c355999d05ead92b260f4c6fac96e36156c55a9ec0023071019530f34f655ae1f8104874e9026df68adeaffaa7d5cdf4
-MISC metadata.xml 1052 BLAKE2B 687ef6900492c38b560c1b5d0b933c68f4ca5c19e6550e4eb4f4e2f5f244a33bbddf09458d6c39cb73801abce99bc8ab8dd0e6e41ab101843543c870e3b481e8 SHA512 907a2f028e59349bbcd6c2f41ae67d5bee8b72d73ab0ad0ee2b47eabd6830cb62c43bdf80548612c9b34bcf220d9a7998edd847c0ffa1edcdac2b36430eadc1f
+MISC metadata.xml 1082 BLAKE2B f623bcf0110a1c0564d74d95cefb690ba733ae61b67701b2c0ae4d44eea3ca923a4642fe839cf8d80c6f5f2cb4d12b46b699f237048dab1022191932ff7020a5 SHA512 ffba91f8f20a3c366123fc55f83fed8a53fac35231b3e2beca5311646548c4390b2932ff5f37f4465b6af435059ca82909f17cc0018d3fd018db35745cd1723d
diff --git a/net-misc/asterisk-moh-opsound/metadata.xml b/net-misc/asterisk-moh-opsound/metadata.xml
index f15e5130f0ad..52fe6e9ecf26 100644
--- a/net-misc/asterisk-moh-opsound/metadata.xml
+++ b/net-misc/asterisk-moh-opsound/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk-opus/Manifest b/net-misc/asterisk-opus/Manifest
index a4531467bbaf..4347cca53eac 100644
--- a/net-misc/asterisk-opus/Manifest
+++ b/net-misc/asterisk-opus/Manifest
@@ -4,4 +4,4 @@ DIST codec_opus-16.0_1.3.0-x86_32.tar.gz 394187 BLAKE2B 0b187360ae65fe4cfd56f90c
 DIST codec_opus-16.0_1.3.0-x86_64.tar.gz 388551 BLAKE2B d36f4ce8e9414e0887232afe6fd15098e48eb5ccaf690f340d4a62eaac432342a61e43801260f0198bd68af58217ef2a9aacd6d46af99b192444fa59994ff590 SHA512 601d04de2bd4e67cd3d111c8a6c383ea3885180f8ab82c8943e0d09f8203cff3e6d45b6048843946d53b4002d01d31d92592107053e512b5347568050aba5ac7
 EBUILD asterisk-opus-13.0.1.3.0.ebuild 1131 BLAKE2B 82feadbc475d8fccdaa388e69665dcaa9f006747c94e9a09ecce1c0fd7a09e8740774d93468969fd994ed83b71888a782c9f3a2a9d8957e976e92d86353410dd SHA512 2d039f6b907f7f27998bb3020fbecaa323c04ab34fd09cd1e7c093955949049f38098f8998475f92a8b47f367290710762c150fb52a4022288df71fc10f9bda0
 EBUILD asterisk-opus-16.0.1.3.0.ebuild 1131 BLAKE2B 82feadbc475d8fccdaa388e69665dcaa9f006747c94e9a09ecce1c0fd7a09e8740774d93468969fd994ed83b71888a782c9f3a2a9d8957e976e92d86353410dd SHA512 2d039f6b907f7f27998bb3020fbecaa323c04ab34fd09cd1e7c093955949049f38098f8998475f92a8b47f367290710762c150fb52a4022288df71fc10f9bda0
-MISC metadata.xml 556 BLAKE2B b0fba8ff28021dde0d0181dec8700607f635af7c1a6efb8c23ff7a91d34b90f4be1b7491967d860c86a7fb956ce499f0570cd0a3268860bf0f4a172ede104ce0 SHA512 c68893a7bbf6e9e717b2fb0cbb57a73e3d254e6071dddf9a632a5befb2103245502351e7a3f725335b191caf34c35882b0fa87697de4c5557ad880628ddf8386
+MISC metadata.xml 586 BLAKE2B 1a57ae9569c9e563efd47abb9b82f64636640dd5e0afd216a72d2be568112badd74ed0b578cf5b9a934979252fe156e0115eece065357b369aceabb5ab476c5c SHA512 e42c760a72a8b3ac002cf43d0ec32bd86bac7583ff1f74ce20d73fdaf2c5748a8e22646a2fe93a17ea275e8939ce727cc598b6ac3fc3a6b0af0b42d2c636ca80
diff --git a/net-misc/asterisk-opus/metadata.xml b/net-misc/asterisk-opus/metadata.xml
index e6da82c6ab92..f6dfb2d611ed 100644
--- a/net-misc/asterisk-opus/metadata.xml
+++ b/net-misc/asterisk-opus/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index a4d0c5c43255..a791fbadfa28 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -2,18 +2,26 @@ AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b746575
 AUX asterisk-13.18.1-r2-autoconf-2.70.patch 535 BLAKE2B 06f880515f27166a75738bde6e81be1cac961a2ec2eec049cddbbb39b58d350f37a4feb49e86157d6dd5e80abaf251cf6b122ec094e0109c1f20f3e9b0f65c29 SHA512 77d1bb1be97fe5b8df78a8b21173c0d12a91f9a543404d73e4f4af2080a0b4edb87b3ccd36b1935f4fbd2a0bb44e971d303eba774e648c48c2a453c8e42838a7
 AUX asterisk-13.38.1-r1-autoconf-lua-version.patch 2320 BLAKE2B 5f9a4b4063286f964da0756698134ce9127a3ae854e19ccec098fb554f4835cbb1698da6ac76293dcb1af3dfd8ea741e9450d58b61c7da440ff3077c848dae68 SHA512 dae3daad5a6755a8a932b40c5d209c348a72266c139a2e05420ea4b8f292062832cf791bc8d41de4bf8c1e0516e8699efdb80724a5afb2d017ab707073d7fca8
 AUX asterisk-13.38.1-r1-func_lock-fix-races.patch 9580 BLAKE2B 174aa69b0738c87f02692c2eec978171216b2117218a54b9785a836d0b72b779ed1aa48a3c3b624deb9e16e3485d60a8390b60019c90524f6248665d1ae0ff44 SHA512 bff6f20a677eef837a6727859c1c90309e6f012621743b7e8b6b92ad17cf44c9b94aa75a0b64550ae39a6260210a944725d9e9603fbe0ca7bcbd4fd61d991748
+AUX asterisk-13.38.2-r1-menuselect-exitcodes.patch 1736 BLAKE2B 32f18fe623c6a9ba4db24001bc6669a2bc0838f2b757a2bcacde6eeb6b63f31881af877ce25cf7f38f6b7c010d92b5a1065d22b3f7526bcdc22799a09b22a975 SHA512 c4888e24051f0913c7dd13dbadbc38e7638bdedfee36b6f6cee047f6113d39cd09d79d9ecbfbb38f72ae6c9092e1423a0eff885118cfa44d4995f11d95c4a1d3
 AUX asterisk-16.15.1-r2-autoconf-2.70.patch 499 BLAKE2B d52c6514d3cd120402298322dac081d88821035a13a5210bddf8574dfe69ec1e6eca1f3335dbd2976e870a8dfc634d1883b3e0db707557581da38b074f7359e6 SHA512 a55725377a874ee15a722076fc63323d73a976592aad524e56bdff5f4164eaa7e533723f5add93b738f39532392541bd2615fc39b3a4fd55a49f57f584d82846
-AUX asterisk-16.16.2-no-var-run-install.patch 745 BLAKE2B fccfadf92aed04072d84e982cf2016ac648dbc6afa35bdc7446c2a032731bb93b227414dc75035a6c93329db3f1c2b81dc815690174f5c7d7c3a7078e5acffb4 SHA512 99b96357aa39a288a3381c8662cdb4a528fb998365d5456ba28863302cb528f568f3f7aecdb6ca830f2cda310f2a940d001e9096124a2df1ad064a62025e0e06
+AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d1161e68e0b61b14b5505eadd00fdf46e1c3977e7fb536afd42dc6c9a07f400a686c19afd04fd8f00fc1cb916978783a9e54ecfe81dd4 SHA512 ab1e7ac700711125162396c4ebe590eb000f4ad6c4cbe8845794f5d06353a4a52167fcc83ee97860f38540089cad6d45f2e8589c1f30098e85479a2b4c722f75
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles2.conf 43 BLAKE2B b459348ce0bf46a915b0a64a4961d753bb9610486dc8499e7ff4eb2fab8d1afda59d880057bd4862f12a497d4cba5b025d73f5f510987d349dd46d269a4d1869 SHA512 65e35490966095a7be6f4acb9e338fe94021976860319fd1c13b8d1b19376854f45348e182ce3a6c02d459c6dfeae62236148b7c992ddfaeb0ed55d0d8682e1b
+AUX asterisk.tmpfiles3.conf 88 BLAKE2B 826beba7712e4d096c5506fed353a1a21c89b4acbc6b6ae99f60fbc7e338a331056ec145bd885dd23b7058f4bdf3109d68fddff715ae32e9ec0fc88ce68bef56 SHA512 992902fd01dfd03a2d77bf8a6c7b3adbdcd769478cf0bfa019632515107222aa59b12be10f5dfd26b4e18651e51b81939f1321ae29531dda0f3a623306e6a983
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
+AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa353dcff2d8c239cb203da289a7af91c083f4b89350d64bc2e87b1d7422266207605997badfab00ea24fc SHA512 4b4402ce62527084d0f82c5ad975d6b85276bb9c1e97d6f405737c6eee3c15f45e1b48f149d508c4f5cd70dd23a5e9be3ebd673047f80f4dfcda4913c9b6b287
 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
+AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
 DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae SHA512 9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928
-EBUILD asterisk-13.38.1-r2.ebuild 9702 BLAKE2B e35e6757ff6429b49580eb0af9b203d9071334964ae0f588994028f14bb26b9aa1901991a6b7d00ce04c1c898276290f1b19862b15102ed5a7b1c925193ec7d7 SHA512 381907b16af92653d10df9679c770185f7fb639c63971cbf98732e856c19b08d56b6f7626753f20e4a9bd152e3290dac0742bc81e33a3abe5fefcb61dee5203e
-EBUILD asterisk-13.38.2.ebuild 9704 BLAKE2B fd0412c01c13bb1ae61afc25f7361722ffa06f0070e5dacf8ffa4752a6da27903f256cda72d1e423129f71510ef14ab59b7e48c1549ac25c883c247094e481bd SHA512 59a4471cb839682a312597ee17336a4f61c8d9fa7f3fd52b50060f4135171493cf46bf75f77e5dc2d45d8c797cbfbc0c462634be2dfdb247b4456812debac9fd
-EBUILD asterisk-16.16.2.ebuild 9893 BLAKE2B c84f1403a0405224650395cc577f3e8af06a52856af956229499f1025fb933b1dedde19c638487e4f2b84b34dbea3c4e8441ba5647ba2c9ce86721a6c02c48bd SHA512 547c80803791260513d16f73b2fbe744ca31f46d20c28aa17f13f3708533d9c66e2740a21c1af86840b75865e9368ae5477f7a22b7c5d4deadaaeae91d931ced
-MISC metadata.xml 1377 BLAKE2B 4b7f76e4834ff58ed593b7e1141b4781b6dfbfb1fb32ee7a1e4f6a982f1267f2e690409f4d6d7f7ea45d4dc8f93bda274a72d1e39d9034f39ed6386a25382413 SHA512 192b14fc1c15b7a7117ee1653adada3fdc480082d2533662c7e7c8ccd13dce08d4eb0c02413c269f544b93870a1deb60092dee8ea92abfd6ce0a39630a9807d8
+DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546
+EBUILD asterisk-13.38.1-r2.ebuild 9725 BLAKE2B a25d483b9242d2ca6223226d75f5da9f5b56ef0aafc865393e876a1178fec355867e98ed178bb4be7dd5ea805137ee809a6e3274a53a54a6d0628a2cb8c6b9e9 SHA512 9021cd20e0bf2d825cbd9855d975c3a562bbbd00d6c4c8e8c246d85c839f3198b19cb62819c9a1708b4aec5d2784bb05079a04ead3f937f7fc661ef072434dd6
+EBUILD asterisk-13.38.2-r1.ebuild 10793 BLAKE2B 9e0ba0d5db3f56b8726a557e8f80ac5833aceb1a023f5d107f5736a275eb3866f98eec6cc9234af73c8ecbdc44302207a0b595e89e7f2a4c578b8553037e8ea5 SHA512 d324345df46ae82b113b06746a9ee4020700de68619f1f82f7c2d41da46f8056c9479b4f9e2cea96bc964c89b72e7fc300d9d5f91162eb0e0a922170916f9b61
+EBUILD asterisk-13.38.2.ebuild 9727 BLAKE2B 23045501df1313e8eaffff84854c636b451c62d866e08faad95c5e9437c3a4663bb8da102fe41e9ca353b1f281572aafead82a6cb949db173aebf6b5f9909654 SHA512 ff7df049d824e33618e7759930df761bdb0ab5e6dca852409daff2bd94bdb84fb99ae3139e877d14655b2cd7a12ec423a87fb2a9fe8aa13c7e9cb2a29867044b
+EBUILD asterisk-16.16.2-r1.ebuild 11358 BLAKE2B 11dfe65926cad46998ccc2942e00d2a43343dee69c6a0ce2b32c070d1927a58cefba753463467d55e0c3133bb3b01941c5879ebd8881c227cbc94089947b2722 SHA512 ab299440f47d5dc2aa16af46f6859ab4317ec1d83aef853fadcc403a44d3cbc4043a9b6cfe7ce146e6b3bc5958123072e04705e80a3b964009177266a12570a5
+EBUILD asterisk-16.16.2.ebuild 9916 BLAKE2B a02bc1d09394459ca9737f43dea546b16fe3230319585bf7a86a8bbccc123342054f63578382b17bf1c02cee94749c1516860aaea383aaec173990267ba41f35 SHA512 c06ebbc5202ddbda233747120b17b2cda0cb8db4465ea5f445f0d064c8efdb49ef7cf957c5da759bc392dcb5e5805e30b47268062c94b241d2cb27e0ec33c152
+EBUILD asterisk-18.2.2.ebuild 11331 BLAKE2B 89f1eb498c7e25872918ec01a865bb00c393f4b86e6199622f49259b9ceff341c71992d99adce75d8ef808edbf4d139106c3bd41f2ee46e69e013da1b0af03bb SHA512 f4568a1caf38249e2e62ee6a0033aeb023bb0c731820b42429f02afd3f7faffa64fa66f95d708f7f19a0032bdd0ab7c830dfe5a4f985f7ff40b0f7108ccdfb58
+MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
index 00fb2c78dce3..4afefac8480b 100644
--- a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
@@ -99,7 +99,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -285,7 +286,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
new file mode 100644
index 000000000000..93a5d9eec9aa
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
+	"${FILESDIR}/${PN}-13.38.1-r1-func_lock-fix-races.patch"
+	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( net-libs/pjproject:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		$(use_with caps cap) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(usex "$1" enable disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable $o menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	diropts -m 0750 -o root -g asterisk
+	dodir	/etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-13.38.2.ebuild b/net-misc/asterisk/asterisk-13.38.2.ebuild
index 84f0aec402f7..7a8d1d57cf86 100644
--- a/net-misc/asterisk/asterisk-13.38.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
@@ -99,7 +99,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -285,7 +286,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-16.16.2-r1.ebuild b/net-misc/asterisk/asterisk-16.16.2-r1.ebuild
new file mode 100644
index 000000000000..4dc58a42a482
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.16.2-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-16.16.2.ebuild b/net-misc/asterisk/asterisk-16.16.2.ebuild
index 6a7ee37f0807..2ca6f4a6d01d 100644
--- a/net-misc/asterisk/asterisk-16.16.2.ebuild
+++ b/net-misc/asterisk/asterisk-16.16.2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -101,7 +101,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -292,7 +293,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-18.2.2.ebuild b/net-misc/asterisk/asterisk-18.2.2.ebuild
new file mode 100644
index 000000000000..c253eb63cf92
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.2.2.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
new file mode 100644
index 000000000000..90c97e9df5e3
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
@@ -0,0 +1,67 @@
+From 840eaa67e1ee0d10aa6bfb1e34659efa3095b772 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Sat, 13 Mar 2021 13:01:50 +0200
+Subject: [PATCH] menuselect: exit non-zero in case of failure on
+ --enable|disable options.
+
+Change-Id: I77e3466435f5a51a57538b29addb68d811af238d
+Signed-off-by: Jaco Kroon <jaco@uls.co.za>
+---
+ menuselect/menuselect.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
+index 2eea3f09eb..adb6fa1777 100644
+--- a/menuselect/menuselect.c
++++ b/menuselect/menuselect.c
+@@ -2090,6 +2090,7 @@ int main(int argc, char *argv[])
+ 		/* Reset options processing */
+ 		option_index = 0;
+ 		optind = 1;
++		res = 0;
+ 
+ 		while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
+ 			print_debug("Got option %c\n", c);
+@@ -2100,6 +2101,7 @@ int main(int argc, char *argv[])
+ 						set_member_enabled(mem);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2109,6 +2111,7 @@ int main(int argc, char *argv[])
+ 						set_all(cat, 1);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2123,6 +2126,7 @@ int main(int argc, char *argv[])
+ 						clear_member_enabled(mem);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2132,6 +2136,7 @@ int main(int argc, char *argv[])
+ 						set_all(cat, 0);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2146,7 +2151,6 @@ int main(int argc, char *argv[])
+ 				break;
+ 			}
+ 		}
+-		res = 0;
+ 	}
+ 
+ 	if (!res) {
+-- 
+2.26.2
+
diff --git a/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
index 63b2896bb097..cde9ea0e15ae 100644
--- a/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
+++ b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
@@ -5,7 +5,7 @@
  NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
  OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 -INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
-+INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTETCDIR)" \
++INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" \
  	"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
  	"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
  	"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles3.conf b/net-misc/asterisk/files/asterisk.tmpfiles3.conf
new file mode 100644
index 000000000000..7af4ed720d43
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles3.conf
@@ -0,0 +1,2 @@
+d /var/run/asterisk 0750 asterisk asterisk
+d /var/cache/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/files/confd-16.16.2-r1 b/net-misc/asterisk/files/confd-16.16.2-r1
new file mode 100644
index 000000000000..a2da978af924
--- /dev/null
+++ b/net-misc/asterisk/files/confd-16.16.2-r1
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+# No default.
+#
+#ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+# ":asterisk" to run as user "root" and group "asterisk"
+#
+# Default: asterisk
+#
+#ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+# No default (leave scheduling to be system default).
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+# No default.
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+# No default.
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes/no
+#
+# Default: no
+#
+#ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files.
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+#
+# Default:  do not generate core dumps
+#
+#ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant).
+#
+# Default: /tmp
+#
+#ASTERISK_CORE_DIR="/var/lib/asterisk/core"
+
+#
+# Max number of filedescriptors.  asterisk can trivially run out of
+# descriptors.  In most (SIP) cases it uses at least four descriptors per call,
+# and this is a conservative value.
+#
+# Value: Number of descriptors
+#
+# Default: leave system default in place.
+#
+ASTERISK_MAX_FD="4096"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+# Default: 5
+#
+#ASTERISK_RESTART_DELAY=5
+
+#
+# The stop mechanism to use.  Asterisk can do gracefully, when convenient or now.
+# By default we expect you to want to stop as soon as possible, so we default
+#
+# Default: gracefully
+#
+#ASTERISK_STOP_METHOD="when convenient"
+
+#
+# By default the init script waits two minutes for asterisk to stop.  This allows
+# you to change that, or even completely disable and go into wait for ever mode (-1).
+# The value here is in seconds.
+#
+# Default: 120
+#
+#ASTERISK_STOP_TIMEOUT=-1
+
+#
+# Kill these tasks after asterisk crashed
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+# Default is to not do stupid things like killing random processes.
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
+
+#
+# ASTERISK_CONFDIR
+#
+# If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used
+# (typically /etc/asterisk) to be used for configuration.
+#
+# Default: /etc/${RC_SVCNAME}
+#
+#ASTERISK_CONFDIR="/etc/foo/bar"
+
+# ASTERISK_CACHEDIR
+#
+# Value: Directory to which astcachedir in asterisk.conf is set.
+#
+# Default: /var/cache/asterisk
+#
+#ASTERISK_CACHEDIR="/var/cache/asterisk"
+
+
+#
+# Normally the init script will not wait for asterisk to fully boot.  With this
+# setting set to yes/true/1 it will issue a "core waitfullybooted" directly
+# after starting asterisk, and wait for asterisk to start up completely.  This
+# is useful in certain conditions where other software requires asterisk to be
+# properly started before they themselves can be started.
+#
+# Default:  no
+#
+#ASTERISK_WAITBOOTED=yes
+
+#
+# When core-dumping, the default was to generate core-$(date +%Y%m%d-%H%M%S).
+# In certain highly unusual configurations it's helpful to also get the
+# hostname into this filename.  By enabling this option the wrapper loop will
+# adjust the core file to be named core-$(hostname)-$(date ...).
+#
+# Default: no
+#
+#ASTERISK_CORE_USEHOSTNAME=yes
diff --git a/net-misc/asterisk/files/initd-16.16.2-r1 b/net-misc/asterisk/files/initd-16.16.2-r1
new file mode 100644
index 000000000000..bdd979a56978
--- /dev/null
+++ b/net-misc/asterisk/files/initd-16.16.2-r1
@@ -0,0 +1,363 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+	ast_cachedir=/var/cache/asterisk
+	ast_stop_timeout=120
+	ast_stop_method="gracefully"
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+	[ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
+	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
+	case "${ASTERISK_STOP_METHOD}" in
+		gracefully|when\ convenient|now)
+			ast_stop_method="${ASTERISK_STOP_METHOD}"
+		;;
+	esac
+	ast_group=
+	if [ -n "${ASTERISK_USER}" ]; then
+		ast_user="${ASTERISK_USER%%:*}"
+		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
+			ast_group="${ASTERISK_USER#*:}"
+			ast_group="${ast_group%%:*}"
+		fi
+	fi
+
+	[ -z "${ast_user}" ] && ast_user=asterisk
+
+	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1
+			result=$?
+		fi
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-"
+				yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-"
+				CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS PID
+	local tmp x
+
+	local OPTS ARGS
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# ensure that ASTERISK_RESTART_DELAY is integer.
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in "${ASTERISK_TTY}" \
+			 "/dev/tty${ASTERISK_TTY}" \
+			 "/dev/vc/${ASTERISK_TTY}"
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : Yes"
+		OPTS="${OPTS} -c"
+	fi
+
+	if ! getent passwd "${ast_user}" &>/dev/null; then
+		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
+		return 1
+	fi
+	OPTS="${OPTS} -U ${ast_user}"
+
+	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then
+		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
+		return 1
+	fi
+	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
+
+	if [ "${ast_user}" = root ]; then
+		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	elif [ "${ast_group}" = root ]; then
+		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	fi
+
+	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
+	checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
+
+	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
+		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
+			# asterisk can crash during startup ...
+			ebegin "Waiting for ctl file to appear"
+			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
+				sleep 1
+			done
+			is_running
+			result=$?
+			eend $result
+		fi
+		if [ $result -eq 0 ]; then
+			ebegin "Waiting for ${ast_instancename} to fully boot"
+			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+			eend $?
+		fi
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing ${ast_instancename} wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping ${ast_instancename} PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "${ast_instancename} is not running!"
+		return 0
+	fi
+
+	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for ${ast_instancename} to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 2)"
+			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
+				echo
+				eend 1 "Failed waiting for ${ast_instancename} to stop."
+				return 1
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing ${ast_instancename} to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "${ast_instancename} is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 9951bd05d61a..730a8e858f29 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,7 +13,8 @@
 		<flag name="blocks">Utlize -fblocks (only supported by, and required when using, clang/LLVM)</flag>
 		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
 		<flag name="codec2">Enable Codec2 support in asterisk</flag>
-		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
+		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel)</flag>
+		<flag name="deprecated">Enable deprecated features (eg, app_macro)</flag>
 		<flag name="gtalk">Enable support for Google Talk services</flag>
 		<flag name="http">Enable embedded web server</flag>
 		<flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index 1ee496f37621..ce091ec44a88 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,3 @@
 DIST batctl-2020.4.tar.gz 112430 BLAKE2B 3fde106d7c422ed8bf8b259fc4cf95e0732a893eb06eb99da961c2d5664079a3611eac42491855288b42b94de75b642ea515024c309ec2d3d885ebeba828ec3e SHA512 ecb7c83883b7ae2a4cebbb4319ad7f6c2138d68b91cd24b9753b54e8b0c83080e1358dc61a6bd45d03cc64132bc4f2516b3fab422f71a1e63f53a0e2187fd7e8
 EBUILD batctl-2020.4.ebuild 768 BLAKE2B ca5d2c954323ad5bae7fd25e28d424b7aa4199c74fe0fcb830c4a1b29efb7eec557820c5002e1712398944cc6d01ad3059ade5364c2e94a20fd49111b621ab56 SHA512 4e41451bd50f8ff05af910972c7eed68f045aaf41c8e9e2a387ccf35b9f8d36d5cc09433d57ce664d242a0dbe26d6b04f92d65efe7ef49cbe73acd3d32658e45
-MISC metadata.xml 375 BLAKE2B 63ed1708614d32491216fb627a3f16a07a9de5d8d4925e2676a61744c5ec3a6d398ee838c8bbea0b5d50101d27383c9484c508dc2f6a9f4d953b67d8d2d93235 SHA512 6a83a787d099e17f964e466cfbeed9ae40ba657d21c9881c289ddd318572e292fb3202e95f413e2e3807f9f35201f40458dd0da74adf5af790dd44a0242bb8b0
+MISC metadata.xml 405 BLAKE2B 719af4f8dfc3545f1a93dfc42ef385658bf2de2aad67deb3abc16f2f898dca06af6b85047cb98d83eab2dfb988f65141742f3d19119a743d5540413e3a2b2168 SHA512 6e428a8de5643d3d151ce8375e8077a7519fd9c9bb11a82a6c83d6365c4e40f7632cc06e19d0b1ce1d39da8bf79b4b4dbd8a3921af0ca19cf6e556341467f6b6
diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
index fb16ff9c1889..c87c597f5728 100644
--- a/net-misc/batctl/metadata.xml
+++ b/net-misc/batctl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>info@harrysmallbones.co.uk</email>
 		<name>Harry Smallbones</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 84953a92b388..2d58ae642aef 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,4 +1,4 @@
 AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
 EBUILD bfgminer-5.5.0.ebuild 5168 BLAKE2B ab41b6d6c181cce98314d227ca389d3e3d05e65b93dee4704b8cd975aec4b8ab79990c418be2bda61912de22cc612833ce0d811e16817890e59144e292782b1e SHA512 420efee89dbc369305a111c28562180008096868c3e46a30618c27978f39d247dce3e253ef14c3a4c61259380df8f19f06e426926b473badef70bef0302b7915
-MISC metadata.xml 3948 BLAKE2B 90fec0d1ed8355c7e762057e82097b2446e4ffec901cfeac88bfc556e6c4fff6eea5fbaf3bb74ad381017b0a7b68324e388e3dae8af77b630ea02c9df7d12ff8 SHA512 25ef458905a4350d93c4bd29e5b60116c25765701fd4d3e7bc46593f1b33c51aba8336e346a026ca60d1e6c71eb8c9d4780a805e1dfc87688d00dc54152b5455
+MISC metadata.xml 3962 BLAKE2B 70c28b8c2c68996fb2d3bd7f134feb618776adf3a3e8b2e080dc00c813f072c80519909149bcd5bba17904d044fd49773dffca06880f07446d39240c87bf2574 SHA512 e4fa5e82269099a6d1681c22d3b9d31e8e73bef8b0555dee227c69008b40efc191819e61f4e61a3c7d516563627c910d5c473dd7413e94451d61c21aa64eba20
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index 738a929a1b2a..26e828f63199 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -5,7 +5,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index 455ba440af12..06069428d601 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -7,4 +7,4 @@ AUX bopm.init.d 450 BLAKE2B 22516346f9461d43c364115f04256090a8eef2e83dceb6432ce5
 AUX bopm.init.d-r2 435 BLAKE2B 824a52870c1724d1e6ce0b3bf319e5c7718d2591e87fb9b1115fe3a07b8ef5f4234d2d935b31701934ba7ab23b6340c068d6843227760fbbea00df4df8a260d9 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3
 DIST bopm-3.1.3.tar.gz 819273 BLAKE2B a0630ca3835467ae15622aa2ec5ee6174b57f43e7d22b1cd03884dcbc2e6d4967118e5c22f238b00a9495f76ec92537d0c4fb517ba7cf3e2c355cee366777804 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af
 EBUILD bopm-3.1.3-r4.ebuild 1383 BLAKE2B b1c515d5b44b1c0e2199551f40a0cc53ddd6281bb6cf89beb144813b8f7c7993743c76cc2e8ced03cf1d80dfa6a6088524c091b6dc256038c63537184a12d969 SHA512 2ce8f45a7538aeeab3cfb7e0c9561002a6a217002a388531e79ac0443a7efca1cdd9dd9856f6ae2c5956abefc445f1f56952fdaa026026c75941e8d7bc0f3489
-MISC metadata.xml 246 BLAKE2B a423f65b437e5f5da96a548b39655705d8a48e8404fe1c9b4922a97fc8e9fd89ac3107611b95657d2c496337cbe3a6ca5d3ce4b5b79d8ba35c356e8dee07d1d3 SHA512 0eb12cecf92914383c7ea1a3498961761c9d28b9c214ddbef36050790ff1288602302b2dbf5d5fffe24efde5268bcea8bfd2d49e4f261e6126d2b275f7bf3b80
+MISC metadata.xml 320 BLAKE2B 0df7bccca17096486031e49410ea661aa6e82e5b9da83c14e193805a2635438487c8d95107b8594a6917983f7976f89fc7a89af6f3cb6cf403e4318d40b09812 SHA512 7df57a22ef6611ea0872ba4b2fd29f6f48d88c18719f032a1f664a4e97945b89d707cec3bd95a1bb9714a4916cc70863a0f1d35e43f977dd829bcdd7ffa329b6
diff --git a/net-misc/bopm/metadata.xml b/net-misc/bopm/metadata.xml
index 389984f4aa0b..1ce1de9cfec3 100644
--- a/net-misc/bopm/metadata.xml
+++ b/net-misc/bopm/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">blitzed-org/bopm</remote-id>
 	</upstream>
diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest
index b309da4bfca4..65515c7b0283 100644
--- a/net-misc/buka/Manifest
+++ b/net-misc/buka/Manifest
@@ -1,3 +1,3 @@
 DIST buka-3.0.1.tar.gz 14697 BLAKE2B 2aabbe6bc78105bb0a1a44378c36ec82fef23df70d7600eaaa055d524bd4d38283644c49043f8c9d77cc52d7b1762f5ea4f2ddf896c0cda85ee677018679c1b6 SHA512 6893f1ad63130c55d2023abc0839e20f02ae4cede2162ec1d6e52d43f6b49cfc734b569776172b38bf2c208c2b41d123cb7bba9398ad689a22ce6703fa47eb22
 EBUILD buka-3.0.1.ebuild 740 BLAKE2B b85a0c4d3f1f056cf4dffdbfc3babcc10f2afaa88ce4387e44ba9551ca38fe63894bc3cf4a0d2a66fb89862d4217125090e32f104be925926ed964d473ddbd21 SHA512 59caf324a5aee21382a32bd64a01b19b5eb1a84ed3c5b18c7d3f4426360e18729cd8db8dd08d7f97fff3a35461b5f21c49ac997cde16594ef4781f570ebab030
-MISC metadata.xml 379 BLAKE2B 328396a1e5e28ba7d2bdbd2e1f995ce5567ec8a7b6545eb7825d94b199ab3bb6d56374a9f55db936eb1e90c788a900df0fabd573e5c3f641ffe2db18a6682f55 SHA512 1cf75a0399ab55e809a151750a1c93bb3382a7df902bb5386910186b38ce70e1bee163585feac297ba823c9b5066cdac8a7ae1bdbe5db5d1d8d23eadba62eb28
+MISC metadata.xml 409 BLAKE2B 1553f1ccbf71640efd93fcd94292db388ea4ba8be42c08fb24b25b06d7843c2b558047f6fad8ec120f8d89e7a23539a74f369b4a57d2b2002f03723f7ed8fc1f SHA512 0898ca2a3e1321b43fca3f8ae9252088dadfadc40d1b077f55a28157e0a904adfd7f4f2c18901805be2e3bb1f3b82fc8d2f2099993ab31dccca34a482731f0ca
diff --git a/net-misc/buka/metadata.xml b/net-misc/buka/metadata.xml
index 833b969f29bf..fa84ebe158fe 100644
--- a/net-misc/buka/metadata.xml
+++ b/net-misc/buka/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>mo@dragona.ca</email>
     <name>Mohamad Issawi</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Gentoo Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 33d958be7f8c..ed1ab1132b5a 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
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
 EBUILD cadaver-0.23.3.ebuild 1078 BLAKE2B ce8ac416a39a65d3c543503c7b079b56220c143430cba5263202aa9883f6992a6f0dcc7fc2a998f387bb96e8af6d5460656e99694c0ff8ee11d716679084c162 SHA512 8b664a3c3a11a2a1ad5edeb217ce46c14ea691a3499613e0de6b825b76e1f8c2b78dc185515024ad0eb016eab1b1a0def7d6a575e4b7c891f019c305f3eeed29
-MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
+MISC metadata.xml 359 BLAKE2B 2e0d3e108f50e8f7e36f5c49b73ed3618a6848be9cbc73eb213545a40ac2e959f63e215b1b23f13665ece13cf7c548d5126112efd5df8c8ec6b05bdc5893ac3a SHA512 89556255a93ee1ed2bb71c9f1404de6547db145371a062e7be6daff4e8ea8a418f0fad2223caada5d3b75d8d625d6cbf9be3440aad7bb9c69c11d6e09c96e139
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index ca82cfff518d..f51c2847f1a6 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index ecb0a969c26d..4776f524db14 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -84,4 +84,4 @@ DIST github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
-MISC metadata.xml 255 BLAKE2B 327b939e3f064ebf891076936ec8505f1c4c0aa4651c7afb71b78803ab7088b8212357e1c97295dbd51c7da2ea9bd5cbe1b6082b626d1b6b58c46368c05842a9 SHA512 b2eca26fa24e481e0129a8a44bea385892fa08b2c0997ac719bbfbe4119cb3c2b8a8ea36e4d714cf0143b18e3b1646f9408d4d668d1b7444519b8aed7541ee25
+MISC metadata.xml 255 BLAKE2B 4b227e2dd7eeae67a74370cfd3ecd4d2d7da0e8ab31821cbfd1ca48a20c7086bb9753ce4b9b05fd8619333b06015760ad44e0e9c07836d325495f4081ef0f839 SHA512 954cdfd8db553e392d820e5d319458867dafc36607a8ca9fcf81b6e35d6491d1baccf72ec2e0673bdcbc05d0154db603a45adc0b198302ab9bce371c6636ab8c
diff --git a/net-misc/calicoctl/metadata.xml b/net-misc/calicoctl/metadata.xml
index 29a7bc2a437e..885149be1d40 100644
--- a/net-misc/calicoctl/metadata.xml
+++ b/net-misc/calicoctl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-misc/casync/Manifest b/net-misc/casync/Manifest
index 05512607903c..52d142a5b876 100644
--- a/net-misc/casync/Manifest
+++ b/net-misc/casync/Manifest
@@ -1,3 +1,3 @@
 DIST casync-2_p20190407.tar.gz 1315643 BLAKE2B 2cb52682d14a06844bb6d08d9c20d3e356fc40f464463151adee7c0446b64ba106ed29873d71d757452b3dd81095efb1b5d1014b294d58724e4c70bf404b47c2 SHA512 973b4cec8289e1223eced5794d5f6e7af25c60bd52d3c8932005ad0b55aebbebba78d5514ef7be4b3b92a76915d6e3f56bd53d797c2d72ffde2bba98f926bd3a
 EBUILD casync-2_p20190407.ebuild 995 BLAKE2B ca87f5cb5977c4501534e62ee14caa606ebe55c0c5e962d9704479c3802c70add18676b024351fd1126e77550e50e119819f9924cc8dae6a85229f2696478df2 SHA512 3339d37c9b73a11250fd0201f62e95433360244c426c49088bf4480b6e5744dcca2d5339d499d0fa06ba6c7d2d87347e5707412d29a4a9f7d1b8834a2750bc21
-MISC metadata.xml 619 BLAKE2B 581feb2dd203fbd6b9c01018f7471c257d45a5a1a8bccacd3a29ed5781bb24b88d42d14948e6c8b4d9518b91b639f197601de9f63ae9b46261378952f607b6b4 SHA512 184753b356a27654f2b0515ff4e9079d053406e7be78269064151914a09540dc5a8e8ca06b3cad43a6ef35168475f8b11005cd4ab0bd2b0919fc6bd12f86a354
+MISC metadata.xml 663 BLAKE2B 371153138e7dad559bf266f9d99a7d0ec4a62ba42897be52ea3b219ad48b26a4f98dee162e0e9e1ab607662502fb4efba42bf753f5d28cc69587524ac02c0469 SHA512 160890daa50f894fd4898f3c55ace2d51eb916d8dcfcc9a24ada713d652a1647837a10410a82c25a24376023919dcdfdba19af3934689125b5b3aeba05c755ee
diff --git a/net-misc/casync/metadata.xml b/net-misc/casync/metadata.xml
index c18a20c803dd..3a01e2fa2b76 100644
--- a/net-misc/casync/metadata.xml
+++ b/net-misc/casync/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>zoltan@sinustrom.info</email>
 		<name>Zoltan Puskas</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 9eb80025fd94..a62f4e656ed4 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,3 +1,3 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
 EBUILD cgminer-4.10.0.ebuild 2561 BLAKE2B c83adfe93051f23be466d8d324da27690ec96dfa6887e93668f510f09f8b43b7c5bb6351a2941b4d02ee67b50965cdf42fb722b49c877ec5e9da5d2683452df6 SHA512 3ad82b78ee9796f264ae259b0b1e60fa95b73c50b772ffa427f113eab9d373723d27592780282a9d1c36f3352e6dad220a56c23b60c4fb7a3d5acd3440e76ee2
-MISC metadata.xml 2137 BLAKE2B 8bb2fd05a390c5c5ec5ca3dde384ab611311d50256668208184dfb978ac5a0debd75ec63cd35159dcde36b2a964d0bedf6aaf3422261f998f2262c1007c3ab29 SHA512 6cf1454188266ffdab67a7caa27ece041cfc4c3cb4fc76b7fe5fa24bed30002df717afe4e8693532a4f78b077374200cb2a9e91b460372193f1b623238d50b38
+MISC metadata.xml 2136 BLAKE2B 0f5b8a40b03a19fd5e822bd4ca2d92fb99bbceff758ccc682fd4db4e0ea4dc5d12ac6ecc09ff9f9613e35ff515f9d4faba4469f4ed79d962500b3bb43fe0631a SHA512 f811a164e54a9c4cf5fcfedc9c03dc5c0d533a6f023e02a8711969362f02bbf72e24d3846eb36e5496a311fcfa4cda0d7809679e6fee29bd43b9355e5ceb9386
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 14800d5d5ab6..877f7b644c09 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -36,4 +36,3 @@
 		<remote-id type="github">ckolivas/cgminer</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/connect/Manifest b/net-misc/connect/Manifest
index fb37b06217aa..78eca85ae99c 100644
--- a/net-misc/connect/Manifest
+++ b/net-misc/connect/Manifest
@@ -1,3 +1,5 @@
 DIST connect-1.103.tar.bz2 37980 BLAKE2B 5f7639c06bf1486e541003ced967c486debfacacde9701ae079fba4c41fd9c77e25c3140e6b0d52782f22912cfdbcfe59e882959b30910de55d0752ed5abb365 SHA512 6de32aa48171b1528abe12c1044e1d498cd10c3ef7b4652318402b7bc12bbb50ce0f9eab10408dc3cc26c1c0d56804bd088fbedae688f921c84c40d1aa0ae4d9
+DIST connect-1.105.tar.gz 40778 BLAKE2B a54fdb5bc808311fb6b4c61e05fdc135db55b714c11ce64565e7e315988bc70b1b6b1c4f6857dc621b05f0434b9bed6e5507d5966e516d2ab444d5435eec05a1 SHA512 f49001043a8ffbda3823d0ea3640cc85536ce3d23302fd4d704d8a520f99271a2ed66fda11a5402382edc1dcf874988339ebcaf1d6335249a8dd2a8b4ae965a3
 EBUILD connect-1.103.ebuild 871 BLAKE2B ceeb5875db5cb34ca4c22e6cf3855f74bda7e4befd5af0e5215375d1e565ef83f86abec9e7dc2585bee7b34adfce5723c419e35bc07ee83096bfb7a0dd7eb830 SHA512 ced575df5881d3bf018fe8d46dfebd44cc7c26fc7292befe2f3d4946bf53cf1b1bcadf9ee86d1659eabf2c006bf5ef3edfc87349c4875da90a65dbfdb1b89ef0
-MISC metadata.xml 718 BLAKE2B 84b3935b798d13b3245a0beadfb4124f7bd73d88403f910210f6ea83d9c6bd67c155918496f18264879842577c52d4f60051f98edaa0c355924a33983ebcf63b SHA512 7fdb12c7a275afb669ee9ec20124811133ac4d6aada04b48c4e22a1eb98676b55b306a35138481cf8f72996635b66caed88f52d4e790015c5fb2874df06dfc5d
+EBUILD connect-1.105.ebuild 516 BLAKE2B e8be9ff6081e16d98aa1de140adef8cff02d30f016962be9a342b5c1a614614bb6affc4fe2cee1e177baf9862ca205224d3a0e4cf600123cdf96c814c6090daf SHA512 b6d9e52b58006c6ff412b353b4000c19adf385f703588a5e1aa40e9f8eb11f91df9c3a0080f91fdf1417330b5638cbe5df5450cecc33b28ef5eae16e7fb50507
+MISC metadata.xml 718 BLAKE2B b8061c57dcf69174394046128800dd1a6b90a92d759064efa069d41979b8ff546d722a7fd5a98b623d5c5377204fa8e2067720add25588b0ab4a2bccc4912364 SHA512 f547257db8b2f63faadd14c7c87db691340859ea54d11385cc685d662e10f69644d997921635044b24470aee0b3ee74dafbd6df409499e4470808ad39dcda7b2
diff --git a/net-misc/connect/connect-1.105.ebuild b/net-misc/connect/connect-1.105.ebuild
new file mode 100644
index 000000000000..b1c4c97f5b62
--- /dev/null
+++ b/net-misc/connect/connect-1.105.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="SSH Proxy Command"
+HOMEPAGE="https://github.com/gotoh/ssh-connect"
+SRC_URI="https://github.com/gotoh/ssh-connect/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+S="${WORKDIR}/ssh-connect-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "s/CFLAGS=/CFLAGS+=/g" -e "s/CC=/CC?=/g" Makefile || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc doc/manual.txt
+}
diff --git a/net-misc/connect/metadata.xml b/net-misc/connect/metadata.xml
index 423f2176b3c4..34ed245ed68c 100644
--- a/net-misc/connect/metadata.xml
+++ b/net-misc/connect/metadata.xml
@@ -13,7 +13,6 @@ Connect ã�¯ SOCKS 経由ã�®ãƒ�ットワーク接続ã�¨ HTTP プロクシを実ç�
 �を想定����。
 </longdescription>
 	<upstream>
-		<remote-id type="bitbucket">gotoh/connect</remote-id>
+		<remote-id type="github">gotoh/ssh-connect</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index f7cf79cfc9dc..d6ac785b8d32 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,6 +1,6 @@
 AUX croc-disable-network-tests.patch 813 BLAKE2B 305ccd0cbfde01e44bc89cc9bd5545134b02df4f91e217f4eca71cbc4b4c0f2fc908912f16b47fd4867c4472cfb861bc17263cf378106d7542a7ec78287a69f3 SHA512 f31578ac1530e20715a4be305a18245f201ea16514bb265c0b676d72190e3ac90d89d1e846e5bfb8199fc0e532ed56b890b7e2b1389834564686c7bb36fc2e46
-DIST croc-8.6.8.tar.gz 2659872 BLAKE2B a865529d44027167da83994bc682c9df789c7db8912bbf954f2a28b73990392894463da4a619ed341901939c4f6933486ccfed9aec27fbba19c993633044de1c SHA512 a94460beb120b2d15e3930f50ef0870ba82ece5cd69ce6f1af994ed9d5ed1855f7ab8bd4dcdbd76950d167e6cc66a1aff6e4b2d46a7a48ff76cceb615a568cde
-DIST croc-8.6.9.tar.gz 2755193 BLAKE2B 2cae20fa5e965bf9bb547216affcacafec25f6b24bc224d13854b876aefc35a9b442d1fdaac6af8b7ee62987a86881e6083ba3d0d19fc227f17c80902e6ccaef SHA512 474cf105e636e8c0221beca49372bf127f967b54ebc75c12642eb984f60678d17e352efe314ba16304486545c007997afc1fbd53e95c2e8b2a804a120227eece
+DIST croc-8.6.10.tar.gz 2756887 BLAKE2B 8c18ce57c470611d265ec3aa122380a24238c2f5cfe55837c4aec45577e882e888ee6595d4641acbde69c6bfb80d52f33f3d8471c262ef6dca143b3554ba879d SHA512 abcd71377c9f22376e901ceb08441c6b7ae1ae4aa444b1f52086ca06a78f3f33e8718a94829b12a49c34c17ee5fc4afa60370f02e423de37366eb7b713caded1
+DIST croc-8.6.11.tar.gz 2757822 BLAKE2B 3599c4a6bde17f7b7816c935a5de0d05269e64ecca27617b8f5b0d7510a53d0fbfec834f076f6cb68649e252abc91de1baa1c7127125937e7c2ffb59b0076cb3 SHA512 5ff0d84564f0979df850941dc6815841b18842e97b1ba448f8e2ada67ecb7e4a928a67a193b5d7b9b2cc0212cf7f9b48998a62d89df2635c526f2410257e3bef
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -44,10 +44,14 @@ DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb
 DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9
 DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.mod 256 BLAKE2B 70fa2325354dbce5bffc6b0b1a3f29e49177ce84dd79d6a3aca03178b0d79cf4630c856d127e43e66409a25db33b432a33bdc956e1da9de0d53b1c4e3d369b50 SHA512 ff7c7c934293393d8d60cdc02f35f015b5967483458417087771cff837798d44d0e1b7b79829dd97473169c042597cfda2d72865a8ed38a9181e2ae5f4fb5175
 DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.zip 7866 BLAKE2B f464e721e0e0d5858947c7fed35937490bc07107c7f4da81685450507cced82dc839c6c34a94da20ba1293c6c28c0d126d5383be30b73bf3fa05f767cfba29bc SHA512 ec238972ad1f967423a43e58b5758c0b064a73d7642fb2dec084540f9fb13d321e03144ab88ca0a0ed6f70ea35bf8a0448b0e838dd66bcb6d15e63e86f9c4b4b
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.mod 256 BLAKE2B 1073924c937ba65c2f09f8245fe8563c2a4d420c47c5e2e960cc73c4a9c4c8071075f057da4546423928b421f790d29ade8dccc461290a7a798fae5ffcd3f2e1 SHA512 49638a21af6b9b81810d117e6b2a35c411dfcd38cecb164cf8abba0ab22c19b2cf2bdd975c617625dc03892d12a13697462368345a2d3acd40427946e79d8168
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.7.zip 7821 BLAKE2B 689b5064287a3a4f1e91f53cc68c8dd02b7bff9c834bc60d93ccef9d4accd4e7c1a75550c9bf0f71c5d22888c6d8e85b2ff890c030ad8a051eaf8e160e94066c SHA512 4c82e3e8a8a88d879b8f4a30b7875ba6570b66c9bdd0804635b3ef151f3313fa9ae9bb98a52be07a1795b3295564b66330e1ee28ac64c6d8b8407fafae426675
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod 216 BLAKE2B cab544fefb07749635d4f00451aececdb02ee3f24a08762f5ce2af7ca356693b2dbadd1190fae5aa0b67564d34faa5afef9882ceffec4389c2ab26b6e5da70c2 SHA512 4ebaa50c73558c972222a6c44f768442542ceef31a1b4372df732b6c634443cdda8dc6ab8e468a53380a4323e05464b995364109ae9f17e215ca2eb55f0b5665
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip 9036 BLAKE2B ee36c5c39df2e10c28c6caae3b40c876ab88fd314dfe65809f92914429156cf87eafb0f9709df8a6b9ca45427a69dc62d03591c4d3da00376c4065617f44799c SHA512 a1686577f23bdc2121197742103a4c35685e3aaf4251ee26e2352f830a1244eaaeceb859cba23410a1a12d6d59e9f62b03cd8aeaf287d10c59db6c784d51ac68
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.mod 595 BLAKE2B 4ceea6efaabfafc1a238f78594f360363d397d4beb9c80d449846c86955c1c40285c96fe25d6f0366fdc87ac7eb68b298271942f77c5c52ee89e192953c2f3f6 SHA512 8abe6f306b6c74794742ff4047bd70e18f3f14d5361ea91f1abbd398afda445703a5d35ea190893d7499646190bf1ce7345fab4c824b6c73a968d341b8a2af08
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.4.zip 606537 BLAKE2B c3f9914f228fc1aaefe3e3ec2a004b1284609a07b7a9099817d9bf3a2636a727c79f4acba55f2e2b33a649765b169af27940a6b821e34aea5a9f6339d2ace052 SHA512 e836b9b16a809843b69d5944088163a53520eef0edf6dc2156165e92ff5bb12bd46e7b30f54570d0e119a99fde22793c0a2d4b87bee59a566b7f07bfacca12e9
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.zip 606458 BLAKE2B e22a5c544a46b42aff8cdcd1fee43531d63ecd13a25b2b876004ac754c117ade1599ba14b180732361f045a13c31056db84451e98d68cacde7e285e3c86ffc99 SHA512 4548ec4cc5645c7ffbf0eba82a31512711b57368c408aebf884a314a6dfd49035f3e6391fbe526194357ce11c0ac717fd7f1d45a308832dad47e6862b1bcc8f7
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
@@ -62,21 +66,24 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip 1864871 BLAKE2B c621f8aecb2a2732dab3954a1c74d8d657ce336ae195a1c81f2e4521069a8afa0e60e1e204460b922474dc17ea02ea5f5a7cc08902bb2da49ee7a4cb0e4e9d48 SHA512 3a80bda483d8e3b8297b09d97c2a199b132d4f932485fd30020ee3c9fe9ad08c1d2793a3cdd749f3d2731815713bdfa40c6a50234ff991392db7475d2c45abe2
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210314154223-e6e6c4f2bb5b.zip 1864817 BLAKE2B f7eab8f9a16d94b5b316e1fa7ffe9c08bff170cebec2180e437100ebd0e8b3ea13c968a10c26ca8767f06c0a7025253d5883ca5394d6cb88888ca4e4eaae43b5 SHA512 34329ca71445a969301f1b1642db533ae0cad01d00c4071fb7a2dafda152c398e39faeb4f3e1f684d9e087024cc6155705990e38e6fb5a5c4dc87987e1bdd859
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210222171744-9060382bd457.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210222171744-9060382bd457.zip 1586290 BLAKE2B 5e986f99a392d16fc359316ed193a1c0868589db0c2d7ef99347d297196e7648f3e45bf5c8f57277bd45d37cd72f8c2c6edbb597a483ea18d0841acf9845584b SHA512 9c428bbb2f92b5d082e0128dcd630f7a64c282ef92630d452f0bb5fa766af1ef7eeaf4be8aaf761999054c6796c2bf952f44e16259d7c4b6292a762175a65fdd
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210315170653-34ac3e1c2000.zip 1586988 BLAKE2B 0a73047c15bec39e2b1f2cd899f47507d28a26690e960089e77653409f31896536fd292e5c08e385351ec2425d4beb81b4beda3353432c49df4a66cfe8396c4b SHA512 0b8b1868ec897be3ce309249bf8b0c8152f2d8d8a3be6cc53fb25f8b432aaee85cf3b2cff984129fcfc73f61fb15a6eb67b3da3e1eb8696d17d17f02c9bd56ba
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.zip 1561943 BLAKE2B 444b6ecf973f41ba36c3aaeefefe416cc2df06bea1fa9a097388f0b0e916efc90b6c3eaf98da3a3414e2eed364987a0ea27be323343ed5f49367a922941a90a4 SHA512 8fac1d3aa3a5f858a342215fa94efc8b699a8729f637cdc9aef61958bc34f2c5aa2ebab83cb0fac9cf8e3360d781e67aa963068c3f92e8fa396c77f4d51a4df9
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305034016-7844c3c200c3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305034016-7844c3c200c3.zip 1672132 BLAKE2B 9bf08ec2e64ef42ea0247462512f5106aab03570d90c23c924f30cef721909d1985a138e62d21e11996fe16e8e9ad97b5fbe572093d644e56e57538b559d62f8 SHA512 1013fc72b01a96d232e611c1cf5c46ae884c30d294fafe53b0d8536f0de0204f55992d8af1d0ac3c68039a5c081ed09c3378b1250e8be7cd18290f2743638a25
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.zip 1672831 BLAKE2B 52abdc9448149a1def99bce77eaddb2481897636fe2181488ada584d15e4a6703f8f27447ae1cc2e8fa345f7f4e78d7d918032c3fbd40a83b2b66d65c9b95143 SHA512 6efa521056d306ce6ff9b135942b1b36515bd69d0481a729dfd78a1c0a7136ca65972d38a4d0df7962a6f1ec950186bb8ce58f5032567cf98c600803ff8ac5f9
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.zip 1673533 BLAKE2B 5dd8dd215ba0b2a410212363626a6e3c2d5a738cdd1c46563bdecb222487e412ff7faea05688f5b3670adafab867148bdb64ceef59ee4150b9be94f26836892e SHA512 e9880a3401a20f4e8e0304af6fb1f23aea07a06c32673a5ad8c41107bce3d5ef019614d3acf475484e27c5b60f07c6f951b6638adf7edd7adfc1c95b6337bf46
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -95,6 +102,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-EBUILD croc-8.6.8.ebuild 5551 BLAKE2B 478b8b8d16abb91b2d04aec605119c69a3373c20d15c4e5607529706ecb7a73dc9f31fa9b56d3d3c88bc46cb7cbc67bd03b8ac8665ab04054b7a826c6ec0d2ac SHA512 fe9def804f28c67423c468244f7f2ab9b22d7dc7535e97102ed5cfedbe4175457599300f3620c5d48c2a70968d971f0aeaf4969e30b539377a78f74ac3fe5179
-EBUILD croc-8.6.9.ebuild 5551 BLAKE2B 4a89a39dc5a53a3fae8889d1879a0a631a317b8425cb9f0e4e72b1b0717f5ef32421d76ea61bece4eb9739ce743cba4dac3648c115d82859dcd5a901fab3ba7d SHA512 963be9dcda3331922ee7f20a6f8491b970ba6012ed2f50dd8eba1381afa3cdb3051482f3c46ca856f1f2e5b456dcad72ade07b922a676ac5125acb37b7efa183
+EBUILD croc-8.6.10.ebuild 5551 BLAKE2B a0d53a25e9d01b975942147fb64f80415b348d0b776f9ac36769efce4cf27594f954a3fea262a8251b8130db932dc259a1ca960a23eb6153137401d1793a5122 SHA512 95036477bad3589ad50af5571d0ff0cd6cd9b6eb94d3bb982267b89f80f6e972c09f16ff86d51fe572bb254da70f55ce8c396170bf7a542c8d790d3c832d640f
+EBUILD croc-8.6.11.ebuild 5612 BLAKE2B 18ce07b68186649de78c5cf8b805d8aecbb63584b9ece77c49826779d581736234b6ebd2083f7d8df98fae1f3d2a597901b1b80ed53ca80f64b08f7c88852463 SHA512 2aa66e12e684fcdd81a5b3e3777a33191a0b9718a56a72dbdbcb8e7551ed29f62e789d6b2b2ca1b7338254152d8eec1b1e55e61484dfcc8033abc9e8cfa46318
 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-8.6.9.ebuild b/net-misc/croc/croc-8.6.10.ebuild
index e3b197e5949e..c2779660e2bc 100644
--- a/net-misc/croc/croc-8.6.9.ebuild
+++ b/net-misc/croc/croc-8.6.10.ebuild
@@ -79,8 +79,8 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
 	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3"
-	"golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
 	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
 	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
 	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
diff --git a/net-misc/croc/croc-8.6.8.ebuild b/net-misc/croc/croc-8.6.11.ebuild
index 59a35fdce545..1a1cfe1b063c 100644
--- a/net-misc/croc/croc-8.6.8.ebuild
+++ b/net-misc/croc/croc-8.6.11.ebuild
@@ -50,12 +50,12 @@ EGO_SUM=(
 	"github.com/schollz/logger v1.2.0/go.mod"
 	"github.com/schollz/mnemonicode v1.0.1"
 	"github.com/schollz/mnemonicode v1.0.1/go.mod"
-	"github.com/schollz/pake/v2 v2.0.6"
-	"github.com/schollz/pake/v2 v2.0.6/go.mod"
+	"github.com/schollz/pake/v2 v2.0.7"
+	"github.com/schollz/pake/v2 v2.0.7/go.mod"
 	"github.com/schollz/peerdiscovery v1.6.3"
 	"github.com/schollz/peerdiscovery v1.6.3/go.mod"
-	"github.com/schollz/progressbar/v3 v3.7.4"
-	"github.com/schollz/progressbar/v3 v3.7.4/go.mod"
+	"github.com/schollz/progressbar/v3 v3.7.6"
+	"github.com/schollz/progressbar/v3 v3.7.6/go.mod"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
 	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
 	"github.com/spaolacci/murmur3 v1.1.0"
@@ -67,23 +67,24 @@ EGO_SUM=(
 	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
 	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
 	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b"
+	"golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
 	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
-	"golang.org/x/net v0.0.0-20210222171744-9060382bd457"
-	"golang.org/x/net v0.0.0-20210222171744-9060382bd457/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000"
+	"golang.org/x/net v0.0.0-20210315170653-34ac3e1c2000/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
 	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d"
 	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
 	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
 	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
 	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
 	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 51aac87c03a6..8188530bd160 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -9,4 +9,4 @@ AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd4
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
 EBUILD dahdi-tools-3.1.0-r1.ebuild 2017 BLAKE2B af2c1c8dc9645139ad80ddf21d69b36d53b03c12ee80c6164906f3b5884922c1eac086e9de5340f3c073de72186277d1f6497ea6405280624a625473e5650bc4 SHA512 e2214f1d1d56ba9ca78446409e37ebd94c5fe1a83da2a25ab95f94574c568c56007b3b9dbdd43f8aaff0aaf5e1e5a081d4bec58b66cd12a5a7de6dd70ac4c83a
 EBUILD dahdi-tools-3.1.0.ebuild 1692 BLAKE2B 7ed3148872c5975ad46517a4e687509610ebe57755be7e6ffbf5b1d8617f6a4ae12b7610d30eac5192199190e160d7ea6ee791e62f66deada89c40a39c15005e SHA512 e20f7a9fb034725b1b96a23630a5bfc37d2b90bf702343577328a1c1a078094ed93085e64f5be8a627570168916ab56efdbbe697f4fded5a5f774195b7f4d5f0
-MISC metadata.xml 443 BLAKE2B 5a35a0f5e7aa8d8b19423f8aab317e7eef695b76f1b541a96af1c0f6194d3919a56260e3a461a0acbabd268f884265876b9601348179a976b620f39ca4bcab48 SHA512 d071770c4efce5c06137822cbf002d29c11b59f004afc537008417204851e05751df7b21140abc74e8439baa00d2e15bd596b4436f8e8aa5815ea8200018d007
+MISC metadata.xml 473 BLAKE2B a1dc5e28f6ed28a92131b23462f4f5948643347786c3526c3496fb93f9f3d4d7b15afbcab367e9be32f8c99248e72abba5c9ce130ed1014a522be5aae3f1d241 SHA512 be7ceb43b06eedba076244b078ded1288e3509cfcc7df4513d2c4d9bb8b5feb356e2890e51ed7ff825a8b568e61273499e0d12f080c96f2014ba0a48af77289b
diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml
index ae2616ecadf6..d83f18262125 100644
--- a/net-misc/dahdi-tools/metadata.xml
+++ b/net-misc/dahdi-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jaco@uls.co.za</email>
     <name>Jaco Kroon</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 995304d61fc6..b2dabc3d2758 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -21,4 +21,4 @@ DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c2
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
 EBUILD dahdi-3.1.0-r2.ebuild 4797 BLAKE2B 0678c138c04c0d18e7b1220150615cc19bedc684ba8e22129439e938c80eed8af614314849e2d86811e18bacd78eb0baf4403784f658e5be4b473e66af0528ef SHA512 5846b09fe4cb0103c97f7eab2ae4e4a2ae4ad4872bb36979dac84378095611cfee432b1ff326d8fabb3d9d4d877fbbaa81a1fed93118c8acc7787d3159753101
 EBUILD dahdi-3.1.0-r3.ebuild 4806 BLAKE2B ae62f4327aa2a8cb09a5892230e2088c5533fb5e33c8480c119c6e58ea2695485ebecbd2bf4c0cdc73202e83891f1a5ae49a06ddda44a28b652e2c5049300666 SHA512 d1851513061f7b66728415f7c041bdcc16de673d571ecf5010a5e443be4db95d7d640addbb511ec39e2b850fbe4c34b369f43207a66306cc110cb1558f963f6a
-MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
+MISC metadata.xml 569 BLAKE2B 29c44b59081d83f8d8fe32b9ae21809295dc07707d14947c1e1a4bbb3b5d183938053e521c743f0fdfa0131cb42a464bd688da35b7d600f30944af714901f8ca SHA512 a69687c4a087484a60a1dc10993706fe4ef9799d226884d93788d9f726196ae3ccdce2a0f458202b3974c55aa8e18e0debec10116c6b86386331c3ae955adbb6
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index b132a89f1bb6..c9622099c1ca 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jaco@uls.co.za</email>
     <name>Jaco Kroon</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/dhcdrop/Manifest b/net-misc/dhcdrop/Manifest
index 53c94dd1ccf5..e20f2d8c97a9 100644
--- a/net-misc/dhcdrop/Manifest
+++ b/net-misc/dhcdrop/Manifest
@@ -1,3 +1,3 @@
 DIST dhcdrop-0.5.tar.bz2 279218 BLAKE2B e09921633e00b17ca703400bbb50b5551266b80521985c57501e4d94eafca3da6d35c55a78bd98ec832f733e5a11321b2ba56c301aa14e21b0b1fc3e582851b7 SHA512 11ac0ca6dcb65f696936e47e43cfbdd59083b607b26b5d12274cc04577be257dda94e9c27eb0c4aebb40f5f572693478cceb04cc4b5b06bf8882c3001fc46142
 EBUILD dhcdrop-0.5-r1.ebuild 715 BLAKE2B fb01a2f4f786208f2d9b46565b467eca502988abad809f228678d81ee6754ae414b7b35129d1b6690470b580d29968c3ba494695d8cb57a418347102599f3cf8 SHA512 3f0d28f9765cb1545ad5abad5f6bdd98fea24082c7770f2ea6a594aa9cc82b2e5b4122ba381ef5d0d2ff294ebb22fcdda70ff49b9a7c59804be24c7a1ffd592a
-MISC metadata.xml 996 BLAKE2B dc9777bace1e52c34401d45b387e3583d25e6c93208d884f4fd61a895fe23c9d7143a4438ce195fbe822a7488ee4aac1eb9b6ece7c2801af79bed100c9eac63b SHA512 3096fdaf9def441097b4464fb69719ec46b633d3d3623079a55fb14ed264431c116e36361803d54e907673e27b30428687d60c60aa7ff490938d61b90fa35fc1
+MISC metadata.xml 1026 BLAKE2B 2bea43e6bd0d583990869f8567771181d4825ae641ab70b79950af20bb59ee236f80401c1aea57a92e2b67bae14629c1bb0dc4daa1f08290c4a07ba3354c41f5 SHA512 ebdf84aca965d7cb6fbc25c60296fd15fbeb95fd714b1ebc3f08320f2e83738e89e244f5332c76fda90d8542727183efa56107cfcca56fb6316005109bfa35c3
diff --git a/net-misc/dhcdrop/metadata.xml b/net-misc/dhcdrop/metadata.xml
index 1c32710ea3cb..733598fc3e29 100644
--- a/net-misc/dhcdrop/metadata.xml
+++ b/net-misc/dhcdrop/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 7d1fcc2a5bd7..57e01f355dd3 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,6 @@
+AUX dhcpcd-9.4.0-memleak_fix.patch 730 BLAKE2B 705d0d6a203560315702af8ccd491cd3529cc7abe5038cb3a8881acb88e5c14d3bb75af267e2ba338e4ef4a6a9b85c0b47ca004f30b2018d978214f260e46fb3 SHA512 3a2111468bb8def0353b153c6d234ee70e7de9606ec4463ecf3276afe82dcbd772138ac7b429c6723112d61f0b22e27760deaf43a2838b7406d8886a29f6393a
+AUX dhcpcd-9.4.0-sparc_privsep.patch 1657 BLAKE2B 58564b77f97fa469ae64747915ac27f733e03d833d73edaac64293f1552c3be9128091683b061a05095244a3c59729f3aacd69ca3220bfb3f66bcf09112dedbc SHA512 d9dff010beb3eccd8f6f3adfa9ab2162d16b504f17f6f66363930be693760b16e1f226591e7486e893e99511480cba29d5baaeac1d23e5387e6e5d0e8f4dd1a0
+AUX dhcpcd-9.4.0-unlink_socket.patch 1657 BLAKE2B 6c66e78fb0be1ed60176bee31240b9185b9bf71e80d9b0d6a03d77c1cd5ca7b7a4dab468d5299887443e8e1ef17556d89d569eebdb8eecfbe0e0bf91b381d116 SHA512 17325af7fd51dd9a6eb7edf8e952eb096c054414a7ad7fdf242d19500222832e994815ed9eb3aafb7a68a62dbaa7c9b9e77dc7b632919127662c805e4117f11e
 AUX dhcpcd.initd 315 BLAKE2B c972ddd75c879d4e6a109cc4fd7b377ea27aef0b79ea5524cc456050117627c1baef8e884dbcd2cec987bac43efb42b77b426d6f2f864f09bf922142e08cd6af SHA512 f554a78c04ddae8fdc44a9427c5fc318d4eb31b6771bcc46e9b06feafc061ab9c1ceffb7d740cba57905f0820ca5e2313b152b217772abd5a9b9385e9aae7459
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
@@ -7,7 +10,8 @@ DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da6502
 DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517
 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
 EBUILD dhcpcd-8.1.9-r1.ebuild 4505 BLAKE2B a1646a494c20d4d7038ec42941e4afaeac4cf1b2246f89eca4614ef060ad31813575218a3fdd121566001a0c41cf316ca50d91dde3ecd11603cd48c6d4bb47d0 SHA512 3ee0e788ceb7534702147458c192c57aed9e091a94cf0958f28f2a108890f1e07079aa024e964e9f529c62d2c1ce89cf3c54023d9f90ba34f41c9e24e3132ea4
-EBUILD dhcpcd-9.3.4.ebuild 4610 BLAKE2B b7ffc110a6a21b6c62e7f28abbcffb782bf0de08663a79fb2dad8ba9f924890f17385ef3bba1b7c57853a13dba54c76f3d076e2e2cffa3424084d7fc8a9839a9 SHA512 c69ebf80755230e6e88cf2547351c9f7f4702215fccac87a032bed0b9c969efc31d6f0a3696041b5488aa3f3a2978db1f287882d49a7cec4b489f81fb45a4224
+EBUILD dhcpcd-9.3.4.ebuild 4676 BLAKE2B d7015dcb29660199edc472049b8dbd7eff7f7bf1d8d2ff91a28125056dab73cb5292ca8d5e106381a6e1a3c0baae5f537b0d64822a10da331d0404100babe245 SHA512 2260f54aaed43a4eeba216b1dd930bfa63692336c6ee93f5db2f1c46e23d8ab0d0bb1b3910f4feb240ca833ba8039b6b1d3cff9c1f3eb03e6957192c7bb9e181
+EBUILD dhcpcd-9.4.0-r1.ebuild 4752 BLAKE2B 5b8044625fd6cfcceced8c61ec58d821854e730e5563acade906f66039e1414f3414b8e454e39120d638eaab64840c6de20a135085e1b745f014d5edebceba4e SHA512 bc1ac38efdf606c7da4d12573741d9b6bbd626c056cfa4f4cb4e702448766540e5969cdcdaee354948667255694c015f13b4d0ed2abab456df69062506a4b02b
 EBUILD dhcpcd-9.4.0.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
-MISC metadata.xml 646 BLAKE2B 80de0aeee2dbf33f6bebf9a64be5b13a8eb078e7693157ede4e31bc2ab86b9588b40949af7c9dc511e679202640a7c053689a5c562dadcedf9216d9dce25b1e6 SHA512 5917c153c5fa048bdca17cbcd0b5ce81a152635de166fa140ced7e46bffacc9e2335092d8c4454fd33515a8d28cb8b1f114dcef8465526837477a90dd20e980d
+MISC metadata.xml 702 BLAKE2B 8fb8f980d543f5dc016383e89bf69a952a3bcfd47ee750ba241e0e77878fc886105607cf3de196fd43a4bba259591d53bbaa902b9c9d216b285f8cfa3f179c6f SHA512 3f8b3d9d8a41addee641c06cc2bc717f00787dd04450e68807e92345b19d1b45a1b17145a4d3adf42dea4c4e525cda058ed3559818d3893de60da2a3d4e45df1
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
index ab2855813cd2..90ee346ea29a 100644
--- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -33,6 +33,10 @@ RDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.0-sparc_privsep.patch" #776178
+)
+
 src_configure() {
 	local myeconfargs=(
 		--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
new file mode 100644
index 000000000000..51628651f42b
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-memleak_fix.patch"
+	"${FILESDIR}/${P}-unlink_socket.patch"
+	"${FILESDIR}/${P}-sparc_privsep.patch" #776178
+)
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
new file mode 100644
index 000000000000..61aed69656d3
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
@@ -0,0 +1,36 @@
+From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Sun, 24 Jan 2021 22:53:20 +0000
+Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is
+ reopened
+
+---
+ src/logerr.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/logerr.c b/src/logerr.c
+index 21e933b8..35268870 100644
+--- a/src/logerr.c
++++ b/src/logerr.c
+@@ -484,13 +484,14 @@ logclose(void)
+ #endif
+ 
+ 	closelog();
++#if defined(__linux__)
++	free(_logprog);
++	_logprog = NULL;
++#endif
+ #ifndef SMALL
+ 	if (ctx->log_file == NULL)
+ 		return;
+ 	fclose(ctx->log_file);
+ 	ctx->log_file = NULL;
+ #endif
+-#if defined(__linux__)
+-	free(_logprog);
+-#endif
+ }
+-- 
+2.30.0
+
+
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
new file mode 100644
index 000000000000..a91db28d08c7
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
@@ -0,0 +1,40 @@
+From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 5 Feb 2021 09:25:12 +0100
+Subject: [PATCH] src/privsep-linux: fix build on sparc (#26)
+
+Fix the following build failure:
+
+privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined
+  203 | #    define AUDIT_ARCH_SPARC64
+      |
+In file included from privsep-linux.c:35:
+/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition
+  392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT)
+      |
+In file included from privsep-linux.c:36:
+privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
+  215 |  BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
+      |                                      ^~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/privsep-linux.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index d00894ab..5c80c1b3 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
+ #  endif
+ #elif defined(__sparc__)
+ #  if defined(__arch64__)
+-#    define AUDIT_ARCH_SPARC64
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64
+ #  else
+-#    define AUDIT_ARCH_SPARC
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC
+ #  endif
+ #elif defined(__xtensa__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
new file mode 100644
index 000000000000..493e9c342f51
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
@@ -0,0 +1,55 @@
+From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Tue, 26 Jan 2021 17:37:29 +0000
+Subject: [PATCH] control: unlink privileged socket when shutting down
+ without privsep
+
+Otherwise we have a connection refused when dhcpcd starts again
+as it sees the stale socket file.
+---
+ src/control.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/control.c b/src/control.c
+index 71405ed1..a601ad0a 100644
+--- a/src/control.c
++++ b/src/control.c
+@@ -50,7 +50,7 @@
+ 
+ #ifndef SUN_LEN
+ #define SUN_LEN(su) \
+-            (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
++	    (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+ #endif
+ 
+ static void
+@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family,
+ 	}
+ #endif
+ 
+-	if ((fmode & S_PRIV) == S_PRIV)
+-		strlcpy(ctx->control_sock, sa.sun_path,
+-		    sizeof(ctx->control_sock));
+-	else
++	if ((fmode & S_UNPRIV) == S_UNPRIV)
+ 		strlcpy(ctx->control_sock_unpriv, sa.sun_path,
+ 		    sizeof(ctx->control_sock_unpriv));
++	else
++		strlcpy(ctx->control_sock, sa.sun_path,
++		    sizeof(ctx->control_sock));
+ 	return fd;
+ }
+ 
+@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family)
+ 	if (IN_PRIVSEP_SE(ctx)) {
+ 		make_path(ctx->control_sock, sizeof(ctx->control_sock),
+ 		    ifname, family, false);
+-		make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock),
++		make_path(ctx->control_sock_unpriv,
++		    sizeof(ctx->control_sock_unpriv),
+ 		    ifname, family, true);
+ 		return 0;
+ 	}
+-- 
+2.30.0
+
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index 4b1d24a8fad0..45f27d424f62 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">rsmarples/dhcpcd</remote-id>
 		<remote-id type="cpe">cpe:/a:roy_marples:dhcpcd</remote-id>
 	</upstream>
 	<use>
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index bf1c5d76ed68..c3675b9d1b04 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,6 +2,9 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-117.4.378.tar.gz 98240407 BLAKE2B 2a4a1f2967cc3b4fb59461d3ab94a8cb120db5ec3283d4ef0b1b13ad69e903bb87e11dbc72b1d1e2969aded63f03390af0087026864699c679276d195ec6e54f SHA512 261aad190643e02a102b70ce5418cf61f8affcf3607e6b35d91ec5713fb7ee058d2e20390fd6e8c434ae69d6f888ff390b12d2f544aa2b08a7ac98a9c545811d
+DIST dropbox-lnx.x86-118.4.460.tar.gz 98620060 BLAKE2B 3b2aa51cd93d2ccfc78efe434ba2fd2a7bf270c54e64d009ce7d82927b85805d1616525aa8433afe3c59c8b7d15b3cfd129b8f85a504210e05fd2d95024e9589 SHA512 1858c1bafcb87cf5db44549ac3b12f56402ac2ef63e959d9d22a42952ca4a620115f92021736560e350730a5f5f0da52abf2d5b5c7765f82e39fb4f9b76098e4
 DIST dropbox-lnx.x86_64-117.4.378.tar.gz 101675442 BLAKE2B 42dbb52a4cb1998b1e114e5486acc0a89191c1856f1391c3f19186937faeae12ceec39e5496744f3237e457656f50d4c6af6b4f9ad5b02541e946c96f325ba92 SHA512 876314d7d56692c34c714c7aa8d03d5e9250a5a5bb72c74a16eaee68cf1cf28d4585e4b3ac457dc42d0230d222d62eeeab66672765c182d999f7200a1335a4b7
+DIST dropbox-lnx.x86_64-118.4.460.tar.gz 102012647 BLAKE2B 87ee9e246e5e4c7cd4b5fe7aacbbe028ebec3f02abf650b1d8d8f867aea0900d05ae697ec02916b59b19ad3049606bfa1c63a286f7d21a335650a4322978c345 SHA512 206bb2bc4932d0784438df8de4dfecbbc6deda4ca71f8cd5dced17066293f41f8a722d7e05516e24fcc163cdb9e475733d75d19b369a7f63b3a7f1a966f0d5f4
 EBUILD dropbox-117.4.378.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
+EBUILD dropbox-118.4.460.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-118.4.460.ebuild b/net-misc/dropbox/dropbox-118.4.460.ebuild
new file mode 100644
index 000000000000..a77b20f7a3b2
--- /dev/null
+++ b/net-misc/dropbox/dropbox-118.4.460.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 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 )"
+
+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
+"
+
+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"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	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/electrum/Manifest b/net-misc/electrum/Manifest
index 695d7280e9df..04c2a970b8e9 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -3,4 +3,4 @@ AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa15
 DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d267d9d99313480bf06f9b748d095b33859cd8ea5dd5a135b38a1a206858e08ce500af8982ef7a6e3b3f7ff0233b9637 SHA512 a9a04163c8d76006ca18e1c50f38cabd7c3d7d75b16c8504627b9eb49bf9dca91800e18a585e7afd0b98fafeeeb821b967bea29928a46d10f65f0abc3fb90887
 EBUILD electrum-4.0.9-r1.ebuild 2260 BLAKE2B e3e444bedf6174076d32d72e79328500045d0ae51a1d4b4beb939a4260e876eaec449d7a5ac4eda90ffb339530130e9ecf9932f166b0e7b91bc4de58ffae9f41 SHA512 eff401fec30e5ffa40659fef0e15665211bc09324ff4d3ff0677a3c019d19871b49a54fbe72f4c05d449660e27fcdf9bdc51ec745451d429b72cc644dad65216
 EBUILD electrum-4.0.9-r2.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84
-MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6
+MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index fdc8f0ebe23a..2d07da28fd0f 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -9,7 +9,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index dc127bb4efdb..c6d1341e5a7d 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -2,4 +2,4 @@ DIST ena-driver-2.0.3-linux.zip 446695 BLAKE2B 43d4dc947f53c42c6ccda7a0fd3e32cda
 DIST ena-driver-2.2.3-linux.tar.gz 406557 BLAKE2B 3e77bcb8e5bd00e0a643c17ad780e3abb5ff71859cdcb1257f9c73c7d5a14b0922cf97132ed40195a69e233b2850cb62f1854b49c8ab5c92b6b83dadb32bd7bd SHA512 257c959a6727213df6600cfb09741f5036d4efb950c1460be85bab3026d7f0fa5af252550bf395665dcf0de5dbee75f751516ac80ecf3d470aee996d12796770
 EBUILD ena-driver-2.0.3-r1.ebuild 893 BLAKE2B d888bafc4744911c91759f85013008dacf2aca3fe5f6fe5d504412a451dd32d65b8fc4ffdb8b44435826fcfbdb021e52b668ef2ac05741beda8da22d0a5deec0 SHA512 39658ba6890efdfde3ddfc43aa81072e20f52ec1da992434544fef65173fecf0a69f6e087aff77fa2b5a90fa2372c88a0077c7b6f708e976fdb13eae9b30e2d7
 EBUILD ena-driver-2.2.3-r1.ebuild 946 BLAKE2B b1952dc511209d94c71ac948c737d39931b2ecf7bdc7b868adbda31fc8e907a448b9a36172f9e15b368ff1c4c2d152a3d28792533a4e3a02833bf2c15f4bafea SHA512 1808fb697249bbbce14f426a5a41103632a56cf9d3e6dc90e1ea0e35631b1f31e421bd8a5791abffa936bace814bf9d91b9b907ee5c828db36be77d8ab95452d
-MISC metadata.xml 346 BLAKE2B 52871ec0869c595fe75316469f0ad9174ebf75131f1d894ee9ce31c44ef34869c834c95ddd59efa150a80c086c9c1c5beac71089727359e9594c32687735c9ad SHA512 89d1251ed79b0ec69632b6f672cc4282ff6e10ba42bd6b8f2affe3e59bbd066cbee11d82fcdd136ca2eaba12965ab5f8ead246b69907a99c862a561171d83b1f
+MISC metadata.xml 346 BLAKE2B e9e6ee8a307a333bc5ba90542031ff5ace4d4f66aa9bd6340cb3c6fb246c3a0889be2f956db9f8647caa646eea89ad5fb8272179635f328731a826caea99f4b3 SHA512 29838725724233d10c1b07c4611957836315a439267257ab075b21b7ef459fe10f1b667abfa2ef64e6756de40c499aae06e87f64330df93a4f936e15757b4894
diff --git a/net-misc/ena-driver/metadata.xml b/net-misc/ena-driver/metadata.xml
index 3a5763bb8cf6..82e6e4a156e6 100644
--- a/net-misc/ena-driver/metadata.xml
+++ b/net-misc/ena-driver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index cc87e7761f20..e496f2f14f60 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -82,4 +82,4 @@ DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
 EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
-MISC metadata.xml 328 BLAKE2B 8c882f303485c68cd1b46cf55f194d15b2e6e191de8ccbeec7756ef43485e868b950b6138e196b465cbfa07da1df0ff5d7dc9441b349485b6cc55334add26f4d SHA512 39c22655bf9f27a303631f7640be0d375bcd3c25b82df94da86d814614b16b94b7237bbc112e3deadb6489d090dcc59060c6d186a9790d29886744942b5b156f
+MISC metadata.xml 328 BLAKE2B 44deddf021861c9c3e343960d577a11a8c886cbbd6984f1cb9294e6931596e1a6e278b2b1e40d47dc68135f6b6aa6fcfdf2d2f64b7a989bfb4dbd112de440681 SHA512 6cdb460f0d3324ac551281855a539384307afe31c6e3e05060276245c9871c859c993c89b8eef1f9524a96a0c8d7e30a24ccef4b73a8849aa12c2903b8648035
diff --git a/net-misc/felix/metadata.xml b/net-misc/felix/metadata.xml
index addb25dbd114..13b40a436c81 100644
--- a/net-misc/felix/metadata.xml
+++ b/net-misc/felix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index b23d2b731fce..2626559e7b4a 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -5,4 +5,4 @@ EBUILD gallery-dl-1.16.0.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402
 EBUILD gallery-dl-1.16.3.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
 EBUILD gallery-dl-1.16.5.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
 EBUILD gallery-dl-9999.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
-MISC metadata.xml 763 BLAKE2B a13defe6718f4fa859877881e2fa08963dc284fb2ccdb36b7145bfe2aaae551483551f2ebc3c1410df7ef1fca2ba161936280e8a745c29322bf4e70d0e45bcde SHA512 1467b9c9f727a5dbdd97ae1c0e66844721ec17443ba08cdc77731a1d3252277722cb719892409b079db1e6bfa9185cf3f87dadaff5c8eaf90955fc294dfd7d44
+MISC metadata.xml 793 BLAKE2B 0c014ab324d1fce9d2242f124aaea8273cb6de0553b5c0c6a65479d853ade3f1a9b8a7f482da9bd4ed6ff72ffd6138c35cde4cb373e92b5019e94405e29ba69f SHA512 2e7b177f458f13b084e28e0a59613ee58dce7ac0ad9483b04a2bb79df48583043924f13b5e3899d5f76a44b76ce2e4a04c63e71bea1916031c378831ea613fad
diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml
index 63a2a6768ea1..edf54695db5b 100644
--- a/net-misc/gallery-dl/metadata.xml
+++ b/net-misc/gallery-dl/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 9a32a67fa484..621414c54f69 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,10 +1,6 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
-DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c49bd9e89898f6b7248d3389a81f9c680f9979293fa2acaab0727b3c915926396404e19e90ffbb0ef6647a64d30c14a SHA512 9efd30593df0a2564f98a0e99d02ac3671e5752034d8c747d84a204cd620845e619bec511b6004d895cdb611a2d98b921eb830192d258c572ac9efd603cd5c99
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
-DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397
-DIST geoipupdate-4.0.4.tar.gz 107115 BLAKE2B 1ab08a34c41ac08aa26faf2078e7a964350c09c65871829023928dc25011a931f9be4aff32300778ab645831b8786898a986e15aec8bceb31f77715be77f857a SHA512 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c
 DIST geoipupdate-4.3.0.tar.gz 28170 BLAKE2B 4a7cf9820a37b063665cd0494003fedd4b8a9835dc0746477f28287ccee619efe07c7af608ccb04293b817151fbe409f24c828a0c5f2bd4d60f8570b4df8d4f7 SHA512 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3
-DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
@@ -40,9 +36,6 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321ea
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
 EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959
-EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
-EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
-EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 EBUILD geoipupdate-4.3.0.ebuild 2787 BLAKE2B 748a78c6fad95c490c683203f7a2b8dbf193c5dfc6e2e46829f5a0fa17b6b38b6d889f73ceb428f84fd083d17a61a715e6e12031771dc80b7e6ede417be04dc4 SHA512 951ed051f904adc8ac3d6626135b25668540927f06ff6e4d09a15e5b1c5fac6152702e7556a5753801e98e496079202addb4ebf0aa095f5528fe914644627c52
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
deleted file mode 100644
index b80672ca8484..000000000000
--- a/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND="
-	net-misc/curl
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-libs/geoip-1.6.0
-"
-
-src_install() {
-	default
-	keepdir /usr/share/GeoIP
-}
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
deleted file mode 100644
index 6935a3f3a365..000000000000
--- a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/maxmind/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://files.adjust.com/${PN}-vendor-${PV}.tar"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( GeoIP.conf.md geoipupdate.md )
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	tar xf  "${DISTDIR}/${PN}-vendor-${PV}.tar" -C "${S}/src/github.com/maxmind/geoipupdate" || die
-}
-
-src_compile() {
-	cd src/${EGO_PN} || die
-	# requires pandoc but the information is still in the distributed md files
-	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
-	sed -i -e 's/go build/go build -x/' Makefile || die
-
-	# the horror, the horror ... but it's all automagic
-	export GO111MODULE=on
-	export GOFLAGS=-mod=vendor
-	export CONFFILE=/etc/GeoIP.conf
-	export DATADIR=/usr/share/GeoIP
-	export VERSION=${PV}
-	default
-}
-
-src_install() {
-	mkdir "${D}/usr/bin" -p
-	cd "src/${EGO_PN}/build" || die
-	cp geoipupdate "${D}/usr/bin" || die
-	keepdir /usr/share/GeoIP
-	insinto /etc
-	doins GeoIP.conf
-}
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
deleted file mode 100644
index 37d94082af11..000000000000
--- a/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/maxmind/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="
-	https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( GeoIP.conf.md geoipupdate.md )
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-}
-
-src_compile() {
-	cd src/${EGO_PN} || die
-	# requires pandoc but the information is still in the distributed md files
-	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
-	sed -i -e 's/go build/go build -x/' Makefile || die
-
-	# the horror, the horror ... but it's all automagic
-	export GO111MODULE=on
-	export GOFLAGS=-mod=vendor
-	export CONFFILE=/etc/GeoIP.conf
-	export DATADIR=/usr/share/GeoIP
-	export VERSION=${PV}
-	default
-}
-
-src_install() {
-	mkdir "${D}/usr/bin" -p
-	cd "src/${EGO_PN}/build" || die
-	cp geoipupdate "${D}/usr/bin" || die
-	keepdir /usr/share/GeoIP
-	insinto /etc
-	doins GeoIP.conf
-}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index ea915d39b1db..1e9b54a6d4a7 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -2,4 +2,4 @@ DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B 16501f3f2c9efa3f2bf0305f7af159f91d36
 DIST gns3-gui-2.2.19.tar.gz 5162823 BLAKE2B 58ed776ac542ff06e288c8af80af256e69d5c7bee637fd3ba539d0601035ea72f8673fb6fa31bef4671d1934d0e5bf06a28aa1281e2e6fb71408e8e09fcfdc05 SHA512 a1ca103f57edc639f60bb447f04b86f439e29500a8446c046cd2fbe5f9267e87394e1f2cd21e8f894c1e520ff0493f16235debba26d3855e1d1a423e2b7bb9af
 EBUILD gns3-gui-2.2.17.ebuild 1128 BLAKE2B 69dd59c79cbde82c113cbd0f9f96978040680a0bd17b4d3374c06e265692c4809e46157be448ce7f3761d49e13f8151de5018ca2a366f9e5bbf0804c014219f9 SHA512 c7f75554ded5a8af7abf70288239686f25f561a013f6c86bdd0ce327548a1655c0e4f8a545355fe52783c4653bb069494caeac63fb91e584836cdebb1c29b419
 EBUILD gns3-gui-2.2.19.ebuild 1099 BLAKE2B bb40c8d8b4fa70391019d3cdb7c09081db92ea33303185a6d4d5a9811ff48bb0fedf9239ae82da2f60f73907cc6e4bc35cd5bfd7cf230c6b8d632cb8df66323f SHA512 aef0c60f7051d94577c2affc687c924095970e810bdab540ed0fbd690722ab20bd61bc4f844d0b2ab795c91a45f4fede9e86ba87f0696af979c3ece6b9a806aa
-MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
+MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index 99647f7dae74..f38ba8834651 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 4b279be35983..5ee23da0445b 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -2,4 +2,4 @@ DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B 0f3698adeb7cf9daede05c0281a2c324b
 DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B 213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e634934431111c82b0d91b5afb61f SHA512 f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
 EBUILD gns3-server-2.2.17.ebuild 2141 BLAKE2B bdf09970f3219a647417c16be639efc24db650957ecc8d1d33b0a782aa428f1499faa34e9e3147fd1ee0359937da6d0cd8714e849eb29246678e8dd4f306bc43 SHA512 9adc66b53022286421d46f591ef79eefb1b186376a5cee802c41b1a89e770e0ac7972c1b748e570da4dedb42473f6d89d032e698c080ff8f96e7fa3b29775507
 EBUILD gns3-server-2.2.19.ebuild 2113 BLAKE2B 7350a2d2acce98ebf3e5d468b51eb21a05982c42c4afc75398940632b3ddd27c720f9d917d2385a1556ac4e0e2ac75fe6f084e78a884225f32c614ab072313ac SHA512 235e8acfee7f30f7ba7e6de65b36bfa710a06cf2154630ad34b87d59846e5431837865557b3cfae7668a613f9151e34cca0f371f39bd1e24e988b17e90c7cc64
-MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
+MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 99647f7dae74..f38ba8834651 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 682086c422b9..573214c62b28 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,9 +1,3 @@
-AUX gsasl-1.8.0-sasl-gss-extra.patch 950 BLAKE2B 958805e574a26f13a199eb5f53df9830586d8d3e81c32bad9a4c711c57ee097139c2653426eed3045f16bd76e4ce1c2bb6ed70fbd378266fedc8247da2a815ab SHA512 0f8ad16b96265221bb045b19724b7a247350e9503b7e5abc92905cc07c11bdafb9a92e91d1959d33075ec96631e6f033b20192993c9ee732d71d86ba5ac3fa22
-AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a5f1bd34c40527edf65a2aaec81a85004106a229f18c0d9d623d81e6e98f1786b213b2e6481814b1ee0e11c44eac9ff33d SHA512 ea406d5de99ebbff454ea453cc3c857c79d0120405d772cd893a03840d720e97000bd1edac1ec52f44208146287531a268bd582a0e146b6097b48671b92b9c88
 DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
-DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
-DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb
 EBUILD gsasl-1.10.0.ebuild 1779 BLAKE2B 416e387229cc0a178d948053793d7f6c010f32cae055900323a5152d1863e706bde9659dabf9ca96559e1c88711366dd7d840cf1b40fa45b74990cd39c21b2e3 SHA512 dba3b09d9e235753231b83ca2689018336c17d063b98ed485a490296df56d29f436a8f4f8f20bb97adcacef745f876522ee722ad69d38b51fea4980543bc6327
-EBUILD gsasl-1.8.0-r1.ebuild 1840 BLAKE2B ee6f2e8631f11e3feeaa08b3536d7398c3dcaac7757a47c26cabe85a677580d1dbf381c61d207600a9499b5b4c22130e38fbf277a6a8e7519bcc64b265994633 SHA512 bb91d61532d7743c7bd97707e24628cbcacbf02accaeeb74af9a0621f0caa014824de4bfd3681cf025d533858883adc1d9b157a024cf7c653cb5b6d25a6d8702
-EBUILD gsasl-1.8.1.ebuild 1840 BLAKE2B cd9a24685a71838e915ddaa90921c5e9f4cc94e487fbf9b86ba33dd0ffa91521a5700f2b0f378c9c7463372320393febc3896814677820343202cd672cdc1fa5 SHA512 dade3867fbf769c5b4dd2cac931f00c1b48c5a8aa9309bdb7f54a22eb78ce354476d42485787a0b35018010fb6eed6edeee5d7ced12fc275d7df7c6acd84fe64
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
deleted file mode 100644
index a3eec016e40c..000000000000
--- a/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Based on gentoo bug #359005
---- a/lib/gl/m4/gss-extra.m4	2010-12-14 12:57:08.000000000 +0000
-+++ b/lib/gl/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
-@@ -19,7 +19,16 @@
-     AC_CHECK_FUNCS([gss_decapsulate_token])
-     AC_CHECK_FUNCS([gss_oid_equal])
-     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
--    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+    	[#include <gssapi.h>
-+	#ifdef GSS_C_NT_HOSTBASED_SERVICE
-+	   hostbased_service_gss_nt_yes
-+	#endif],
-+	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+	    AC_MSG_RESULT([yes])],
-+	    AC_MSG_RESULT([no]))
-     if test "$gssapi_impl" != "gss"; then
-       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
-       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch
deleted file mode 100644
index 6aff3878a05a..000000000000
--- a/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Based on gentoo bug #359005
---- a/lib/m4/gss-extra.m4	2010-12-14 12:57:08.000000000 +0000
-+++ b/lib/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
-@@ -19,7 +19,16 @@
-     AC_CHECK_FUNCS([gss_decapsulate_token])
-     AC_CHECK_FUNCS([gss_oid_equal])
-     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
--    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+    	[#include <gssapi.h>
-+	#ifdef GSS_C_NT_HOSTBASED_SERVICE
-+	   hostbased_service_gss_nt_yes
-+	#endif],
-+	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+	    AC_MSG_RESULT([yes])],
-+	    AC_MSG_RESULT([no]))
-     if test "$gssapi_impl" != "gss"; then
-       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
-       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
deleted file mode 100644
index 35ba6ca5ea1b..000000000000
--- a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# NOTE: Please bump with net-libs/libgsasl
-DESCRIPTION="The GNU SASL client, server, and library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
-
-DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-sasl-gss-extra.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
-		-e 's/ -Werror//' configure.ac || die
-	sed -i -e 's/ -Werror//' lib/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local krb5_impl
-
-	if use kerberos; then
-		krb5_impl="--with-gssapi-impl="
-
-		# These are the two providers of virtual/krb5
-		if has_version app-crypt/mit-krb5; then
-			krb5_impl+="mit"
-		else
-			krb5_impl+="heimdal"
-		fi
-	fi
-
-	econf \
-		--enable-client \
-		--enable-server \
-		--disable-valgrind-tests \
-		--disable-rpath \
-		--without-libshishi \
-		--without-libgss \
-		--disable-kerberos_v5 \
-		$(use_enable kerberos gssapi) \
-		${krb5_impl} \
-		$(use_enable kerberos gs2) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_enable nls) \
-		$(use_with idn stringprep) \
-		$(use_enable ntlm) \
-		$(use_with ntlm libntlm) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la || die
-	fi
-
-	doman doc/gsasl.1 doc/man/*.3
-
-	if use doc; then
-		dodoc doc/*.{eps,ps,pdf}
-		docinto html
-		dodoc doc/*.html
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/net-misc/gsasl/gsasl-1.8.1.ebuild b/net-misc/gsasl/gsasl-1.8.1.ebuild
deleted file mode 100644
index 06d078bb87f4..000000000000
--- a/net-misc/gsasl/gsasl-1.8.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# NOTE: Please bump with net-libs/libgsasl
-DESCRIPTION="The GNU SASL client, server, and library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
-
-DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	idn? ( net-dns/libidn:= )
-	kerberos? ( virtual/krb5 )
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.1-sasl-gss-extra.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
-		-e 's/ -Werror//' configure.ac || die
-	sed -i -e 's/ -Werror//' lib/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local krb5_impl
-
-	if use kerberos; then
-		krb5_impl="--with-gssapi-impl="
-
-		# These are the two providers of virtual/krb5
-		if has_version app-crypt/mit-krb5; then
-			krb5_impl+="mit"
-		else
-			krb5_impl+="heimdal"
-		fi
-	fi
-
-	econf \
-		--enable-client \
-		--enable-server \
-		--disable-valgrind-tests \
-		--disable-rpath \
-		--without-libshishi \
-		--without-libgss \
-		--disable-kerberos_v5 \
-		$(use_enable kerberos gssapi) \
-		${krb5_impl} \
-		$(use_enable kerberos gs2) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_enable nls) \
-		$(use_with idn stringprep) \
-		$(use_enable ntlm) \
-		$(use_with ntlm libntlm) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/lib*/lib*.la || die
-	fi
-
-	doman doc/gsasl.1 doc/man/*.3
-
-	if use doc; then
-		dodoc doc/*.{eps,ps,pdf}
-		docinto html
-		dodoc doc/*.html
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/net-misc/gvrpcd/Manifest b/net-misc/gvrpcd/Manifest
index 514e53638c71..fae15746673c 100644
--- a/net-misc/gvrpcd/Manifest
+++ b/net-misc/gvrpcd/Manifest
@@ -3,4 +3,4 @@ AUX gvrpcd-respect-ldflags.patch 465 BLAKE2B 1dc62e0caf54d120bdeaa3ad621f624ef00
 AUX init.gvrpcd 1055 BLAKE2B 6de4641a5c383769a8da604dc37a915a165a3164d4430a4ab70d8cd2a001e77dfb06ff60f22c830efec84a71e4155e7896c9de5c858e5279ebdb5a330d95212c SHA512 57fcd87fa6e209907352bd85984120ce2cdcd73cf008f41dab34d0b739d014229d10976416d0c6d4b154b81e36c6ac2e9cc961b79cf3e507a4b9d70d039ecaa7
 DIST gvrpcd-1.3.tar.gz 12066 BLAKE2B dbe28e45b9efdeca7f4d21fdd3e4cf0470b3cbe90866ee024ad0b681b6a6825ca9844cb06e58eaae95fe38561caece1607c0c0473dbc85affcc72b6be966eb86 SHA512 53f2ad4c9ce5ee2bbf72c691ca0ea1d3d2e22dba98c18cdcbecc09c9082427f8ebc83277b4ffc40fd693652c932a4c093512f99157e82d5a3b97bb6f3d8ff444
 EBUILD gvrpcd-1.3.ebuild 737 BLAKE2B 85699f26af1e8bc2d9956b3fb0e1ae1ebaea5e6508c0d847ed15b4760ab7321a7b51c7564ab79ff3428ae923b2d33c4ff4002ce28444bb7f981abf0a362fbe49 SHA512 ee9de9b7741ec07bedcabe3d800f33de9feadefcc208087020f4baa670805c2927c738e0b08dad0824c4f7afd5ea8768d8f0cbd64f0c0d51e9d201e3cfec02a6
-MISC metadata.xml 483 BLAKE2B eb82f8d2d463c50807774872581c5e76baecbf79f1ab244fa9839617945fd18c360dca961cfbc9b2df000d587877fe79ec53cdfa31f7a5ac56603edc88535bb1 SHA512 cab674a9dd6cd23a1be6b39c0d336053c4aedb85e46757b635c5842d28add4e526ccc3609065017384485cefae32f155e7e325728078f5b0f88abd2e0885185d
+MISC metadata.xml 513 BLAKE2B 969f21c45edd61752599bfb833e53a4e9e24658bd9e927a121dc15d1aebbaf7b60ef406de62d30770be779a8241ce288dbc765734d272f98dc21e491916b9fe0 SHA512 f5cd1e6f716565568ea62daf112681aa7a51c851a8288b66e798501dc52b974254739309612f82492ed379f59061f9fd1dca5b0ac141101751398e5d7c188935
diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml
index b326bd295ec3..12b6b303c561 100644
--- a/net-misc/gvrpcd/metadata.xml
+++ b/net-misc/gvrpcd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 5a37582153cf..e6064ebd3f4e 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,4 +1,4 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
 EBUILD gwhois-20120626-r1.ebuild 1356 BLAKE2B ba40647d5f2ba2c288fd35f4eeb32f01e37d5853a72e3a3fd2d3ffcb0668e949da45c9bad2420bc39cb1ba38baa46af11328b9ae3234e7cdf4acc202df5b2983 SHA512 ee2c6aca920fe76516f25bc09be95faccbb0cffd49ad4885d729bf11c637def0e2e111495a06ff373d4d9ff4980502ba413efe58967c9d514de0fead99451ded
-MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
+MISC metadata.xml 529 BLAKE2B d2a0de62ccc31e9909a4a9d51d4c4443371a569594ec6e9f9d0111ecafe74317a52adc963094e3557f61b9bae0700e4c728450cac6be03c51fdabda1f084f9f7 SHA512 8ea0f604c288509e3097dec79009524f489f1f86b5147962cc4bc1d9755696176c18f8e2a5b30782eff23b4c20923ea6648ee363accc6712f0b72fb5e8c64718
diff --git a/net-misc/gwhois/metadata.xml b/net-misc/gwhois/metadata.xml
index 878291580359..738c7375627a 100644
--- a/net-misc/gwhois/metadata.xml
+++ b/net-misc/gwhois/metadata.xml
@@ -11,4 +11,3 @@ gwhois � (x)inetd 経由�プロクシ・サービス���利用��る
 ライン�作�一般的 whois クライアント��。
 </longdescription>
 </pkgmetadata>
-
diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest
index 99cdeff97a6b..7ed89570aebb 100644
--- a/net-misc/hashcash/Manifest
+++ b/net-misc/hashcash/Manifest
@@ -1,3 +1,3 @@
 DIST hashcash-1.22.tgz 195193 BLAKE2B 2944dd8a852720af7deff1a85cbfc07e828bf2242996b95d8d05a3a8a3ece90abc47483252920ec14b603978aae2ddb9e770ef7b52904b3d24320b68e6695b37 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2
 EBUILD hashcash-1.22-r2.ebuild 650 BLAKE2B b5db1d10663185b0413120f94f394d7758796a2e2f7ef9101194f850bfadff2673de5f5ac21ca37aa6dd718f882c40e8b5fe038dc0447050dbb69d29d1505c60 SHA512 b977fb72b9d6bf9f4490079e6e51bb10a7ec6d193d51a0baf3836505038d11ab92157a348f002fca61de6111a6aef8be531d56a2d86c7c42f5e8e4b02db18072
-MISC metadata.xml 367 BLAKE2B c8709da086e6c51fe3535a4e70e63f671f47b9c5cf79e3d12becc98c037d858d4f9e2d34e05dfe534a774cfe1cf87b93e00eed956fc02342d06e64515ef1a7a0 SHA512 4f1cd259215742388e22ef660d3386bd9c887a96269989e18f8390a04c5ad1ed832cf4765b37453769808bc52eebbb72043c120aa5191601d1fb8754ce020fb0
+MISC metadata.xml 397 BLAKE2B 70447e3f6204826887af123c5aaad05168f08bec1416fa18d5fd9b1b512a5991687e8d1c04856b96b5c62a5e7edbfb09aef7b329ec952f9b05d5fb481e183d1e SHA512 0ae9d848f64816cb0b0474a4d25a97ba82165cb3754f2c4c22f5fbfa4e569f841a1818c851fe0b181724127b50ac9ceef0b593d0de1ee3d71a4e03db88a59254
diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml
index d49539b4f661..d9944d7718a0 100644
--- a/net-misc/hashcash/metadata.xml
+++ b/net-misc/hashcash/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>ngg@ngg.hu</email>
     <name>Gergely Nagy</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
index e28001ea87cb..8f629b3caf36 100644
--- a/net-misc/kafkacat/Manifest
+++ b/net-misc/kafkacat/Manifest
@@ -1,3 +1,3 @@
 DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad
 EBUILD kafkacat-1.5.0.ebuild 669 BLAKE2B af42aa0a0718a66bcbca7a58e4aa41067f3c529c57a18015e602ddaf41f53e01809408cb7797ad1b352ffc43949cd389de21d415437a254a0421563929ff30c3 SHA512 e605348a3662f5e3f3cf54f87d8455769923835f2427659715c031628ad87199f2f67a8b69258fd2b56f7c7a3171e9b41f1737ce665899793951ea54a854dce6
-MISC metadata.xml 467 BLAKE2B 6633c43878cbf26bef2b10e3eb16b9e1328e1fe1c99412d802ab8c30f7f88b6075b0a21f0e69fb0bc33642077f72cadf62bfce78beeb1d35b370f4297b8db437 SHA512 1aae094bbb20905e11f146984c42140fb8338ab632786be3491b1c70a254465e507459137ba241bd8d4f9313f3567a89985f72ed4f3a2bd407981cfac9322901
+MISC metadata.xml 467 BLAKE2B 7814e6373127cd66464bdae235e7774e5fa6abd222d6365e73def5ca56eeeecbb5d6fc96fc1d0ae8a7266d24af94a4e0ccb1a9ba6268330cfdcece008391525e SHA512 95597e53b882d0b5676375b2435176b895b6a9e1325b00e04602f673868a866ea2ef7a575dcd62ebd7cb8a891fcd08edb23dae12be9cbf3f069aae89ddb39c1b
diff --git a/net-misc/kafkacat/metadata.xml b/net-misc/kafkacat/metadata.xml
index 38dfb6bd2c6b..b1ded8c54639 100644
--- a/net-misc/kafkacat/metadata.xml
+++ b/net-misc/kafkacat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 8e36792e7a63..49770c853442 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,3 @@
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.5.ebuild 636 BLAKE2B c9c96a4ac7a8488a60e8a8ca85a68d60165cf7335432fa8af5fca0820810f6765896b69bdd58dbc0c65843a0c32727861d7e55c013f63ed4d4c5debf91ced96c SHA512 e0ff068577b86ea54a64c300e785ec60eaf6bffe8797dc39696882c40e53302f5876dd14d44240a9ee6c24aaf7ef2c39c46269086f2a95740d43d5896541282b
-MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
+MISC metadata.xml 526 BLAKE2B 7be1e9ee4eec532a83c4d429a1318a5fa75cc9960fe9b81e77f6fb352707e4ec2ca8f72b8e19cfecb10fdc318b8801dcbd48f6f507a5ea4036504a38afe6c077 SHA512 377f1fd44b93bc7e4f7b044ff58d50d941d0f2062b9755569692911a16731453ee723bdc7d5c6f6111474e3267b2be7cefb8beac2d402603e27ee4bb97bd29a2
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index 41ea37ccc337..4626a43f172d 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/metadata.xml
@@ -5,7 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>drobbins@funtoo.org</email>
 		<name>Daniel Robbins</name>
 		<description>Upstream contact, please CC on bugs</description>
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index efa7e333ae37..b1e15b580970 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,8 +1,5 @@
 AUX lksctp-tools-1.0.18-autoconf-2.70.patch 2049 BLAKE2B 083525c312ec0ab05fb0bafc7c857ce4478e19aeb6ed2954ebdbf0bb28540fb5a71d20d651c7b3bed3135ec695f10e61070cd6449fb6a7eed777f5d5432587b9 SHA512 07342f740afaa09e61c8d756c318731e84402a3a92a6e5fc5011320a4f3b80bbcb4ff4ddeffe42bc2cf5f6b37ad741ede8fb7a6833c3f4de55ea2bc99f267673
 AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e0814bcc6e7748fb4b1ffa97e8832e9fdac8dd62fd4ea5d60b2e385d5b8be0eaaa6e60b32f6ebc2f3962b43f6d6a39b14bc14eae7e08 SHA512 042611f2c2e7605e96552dc5bee79e014b9ba2db4e08fa7a5c5c821a86d22d970bfba40a477249aa6e9149a997aab1d48b133b97ec353d4ab22ed9e2de6f9096
-AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46215fcd8bb4f1b7cf9e860f9574c14d4f96f5f535f969aa827296e38017f3c56831ce820a2c5469ff9ef6b0afa39b553f SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5
-DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
-EBUILD lksctp-tools-1.0.17.ebuild 1255 BLAKE2B de959f74224dc3fff1d5f30529ab4d84152aada29f766ab989056e6a789a4d6b093e558eee57a267f4ef9362ae73c5ec023d24108aadfd776f3f9402447f6284 SHA512 36c7ad56089b6d7b8f350e99a642603c7d183396f8654e35eaf9057c153f5f7af71afa9d7b81cc65f42f184a9048592a14c2a2b8f6df65ba0872b6b896fb0233
 EBUILD lksctp-tools-1.0.18-r1.ebuild 1383 BLAKE2B d87142cfa3eb95433cbb9e8fe79911d7d9587a3ddc1df43fbbed3d3a29b9d8bee73d3449e6dbb618cc5c2dd6a57f4507f44d7991e539c930411bdfb44930a3a4 SHA512 7f1de6c8041c8bb12ad28efaa5cd885d079412365c3f87761bcf57d3a517da788f2ca98192d6b3b3546e6529f13f8792a4d18f833e79113577b2a12e4f883e8e
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch
deleted file mode 100644
index 6e5808468d50..000000000000
--- a/net-misc/lksctp-tools/files/lksctp-tools-1.0.8-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-default @bindir@ expands to ${exec_prefix}/bin and default @exec_prefix@
-expands to ${prefix}
-
---- src/withsctp/withsctp.in
-+++ src/withsctp/withsctp.in
-@@ -1,5 +1,7 @@
- #!/bin/sh
- # -*- sh -*-
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
- LIBDIR=@libdir@/@PACKAGE@
- BINDIR=@bindir@
- export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.6
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
deleted file mode 100644
index a6b2e1760bda..000000000000
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib flag-o-matic autotools autotools-utils linux-info
-
-DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
-HOMEPAGE="http://lksctp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86"
-IUSE="kernel_linux static-libs"
-
-# This is only supposed to work with Linux to begin with.
-DEPEND=">=sys-kernel/linux-headers-2.6"
-RDEPEND=""
-
-REQUIRED_USE="kernel_linux"
-
-CONFIG_CHECK="~IP_SCTP"
-WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	autotools-utils_src_configure
-}
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
-
-src_install() {
-	autotools-utils_src_install
-
-	dodoc doc/*txt
-	newdoc src/withsctp/README README.withsctp
-
-	# Don't install static library or libtool file, since this is used
-	# only as preloadable library.
-	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
-}
diff --git a/net-misc/metadata.xml b/net-misc/metadata.xml
index 0848d7ad90c9..d7883a71bfac 100644
--- a/net-misc/metadata.xml
+++ b/net-misc/metadata.xml
@@ -34,4 +34,3 @@
 		Kategoria net-misc zawiera różne dodatkowe narzędzia i programy sieciowe.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 9baf0e6ff9cc..625b0e6e9e28 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,5 @@
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
 DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
 EBUILD mobile-broadband-provider-info-20190618.ebuild 471 BLAKE2B 3dd2b83a80549cac5a0249633c04de1c397d6995dbf7621655fe10dd993db3420b4e7ed30a89efb2bc0cbcebe32d7d687b92c3635da6e18880729fbf006dbfa4 SHA512 bd040faa3a25d10b21d38e558a2a3c2fd2ed95eb0f3e886c2dfb24682f18bb260b9a282bb7d8bb2d8d3f3de37053418e30a2efa43479b620bb0c80a886801f55
-EBUILD mobile-broadband-provider-info-20201225.ebuild 478 BLAKE2B 95128a4b1f11c25446b95a448dc66b14317599610102775a92774770cba6fbd1bb356ea3de3738671b2a02d4f077e8d998a83d4a165ebf737918859568e05bbd SHA512 1bdfae3b170831d67042e0c57f6435c4b6c2e7f24c0d23132bada85b1a628515e6b12b16ecbc5f57a8230f74c6e3079193283ea0dd2060a43f7083c7ac514edb
+EBUILD mobile-broadband-provider-info-20201225.ebuild 477 BLAKE2B 381d683d7a1a0fc9e4ad858bdeafbc8c082c233811d4c4b08d0ba395a1b918a61362acdba2f6a79b26b4912404eec692dc91fa9e77d11eee13c9ac86644c09fb SHA512 9d8cccd2c9f22d545e61fba035f8bbf7b8dd044a36086d5861f975643b842fe67bb95d036751a819dddac24ffc962544d9cd3babc2744247cd743f6d13e2cd15
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
index b064a2911136..706d0a27443b 100644
--- 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 0490a8b9b73a..950d630de215 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,8 +1,10 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
+AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
 DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.14.8.tar.xz 2255964 BLAKE2B 8f0e4e4747b3603795b533c41949ef7180922e92b7b26348145e18ffaa38f23cccbcb6662ac912216d33b4aef805c5f7ad10aef8029ffd16eb30b331fc2ca88e SHA512 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
 EBUILD modemmanager-1.10.0.ebuild 3702 BLAKE2B 7b1d1e5ec167f1cc45d72e85e7a65919ff502f3e54a0a74d0227af24970f52b0bb51ffc571b458ff6e1d51cef4e5f9f0d3996c1e2864b8ded06cca6692a018e3 SHA512 283613155d8d8c791c315564482d083c9b0f60c8461c558a3192baecca36cef67f6b2de3b444d4593664f452248026422d77cbc097dfa90b5b0bfce77e0b9f0d
+EBUILD modemmanager-1.14.8-r1.ebuild 3728 BLAKE2B 6fbeb336da165e87b497573d681ccbc4ae77576af94b5c3f1f47e3206d814246ce1c9f40112224fe7811653b42e269f9626c7efb7c35907a1cf2461862596467 SHA512 d749f2f2e568436a132e183adafd215bb4c74932d8618f82ea72ba041c110aef6e61fefb739cca1c94c17c49c4400a5cada03eae677766bac1d35899b88711f8
 EBUILD modemmanager-1.14.8.ebuild 3668 BLAKE2B 65dac0b989a5a1349222d59b7a42a94b545a58e158b6db4f53ba5056303e9918bf7316af02b8027d5367c2ecdb0fb9059826abe3a2b277141e9a2d9927743e05 SHA512 55b8e814d986b08b56fee65dea7afee38b9c6106240e3d72c52c8b6cb50d4335a4b58d3e3dacdf05495a1f29a99d91469f0dfbb9c636c19d96b4747fcca1a4b3
 EBUILD modemmanager-1.8.2-r1.ebuild 3702 BLAKE2B 6b166143bca2c72892dbc38147538f9cc9da01a5a677d18438597ed80115d46021c130c0d8c228cd007ace5fbbcca570fd76f26bc95e6600b9aa5096be4aadcf SHA512 f5ccf0d43cc548bfcc024b46f33b78d337910670c7eed1c5a882d47b43ca9341dce00d4f72dfdbc0bec5bd989b56d845e4269a0403ba0e9d21cbf286b7fb3c4b
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/files/modemmanager.initd b/net-misc/modemmanager/files/modemmanager.initd
new file mode 100644
index 000000000000..39c94591e5c1
--- /dev/null
+++ b/net-misc/modemmanager/files/modemmanager.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/sbin/ModemManager
+command_background=true
+pidfile=/run/modemmanager.pid
+
+depend() {
+	need dbus
+}
diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
new file mode 100644
index 000000000000..98c1d10adb11
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
@@ -0,0 +1,132 @@
+# 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.26.0:= )
+	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-suspend-resume)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			--with-systemd-suspend-resume
+			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
+		)
+	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/mrouted/Manifest b/net-misc/mrouted/Manifest
index aef31052c7ef..1a05f530cee7 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,6 +1,4 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
-DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4
 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
-EBUILD mrouted-3.9.8.ebuild 1081 BLAKE2B f6f973db6a7eb7e1a93998b58c2b8d9948a14682f9f6435fb25efe3f2dbcf44d3bfeb0e48332d3d9d66475f566dde4eaf27b4a5fe6395813a56cf2729a830798 SHA512 cdba5ee8434981a69ffe2b586b6f99febaf5f5ab948e995a458ac828f906e0af41ca5fc9e81268c2a5c312289c579152cf6799da673b73abd477692cd01b5865
 EBUILD mrouted-4.2.ebuild 739 BLAKE2B 0600285e2c195f010ce90cff56552869a018ee311c238aacd22f4e13ae50dd80c794fa1925922aca99e087b4163b1328115ad85bbd4b4e9b33b54031a1f2453a SHA512 ce61708bdaadeec297a442fd5d9059af362786b47f6e7539f2ced24a86200633f5d206da7e031ffa1e3263bfcc7471d4efe2d971c7b7ed7d1d1f46a7be1b72ca
 MISC metadata.xml 350 BLAKE2B c177ffe2f3f3c6192b293561683d2bfea170030dbe31004c6d3a253440ba17a82dcdfc4426a0e5fedddbcd56bbd95a6bee3b24431efba133c1b1c0c0db821917 SHA512 19085d3b736466a73795c3f1ecf39b039453702c220a58ffcdbdd6425c94b9a6c4aa8339a7447a7430c158e06f9030c138417362b3de43b01dedd95401a16099
diff --git a/net-misc/mrouted/mrouted-3.9.8.ebuild b/net-misc/mrouted/mrouted-3.9.8.ebuild
deleted file mode 100644
index 0e9bfcd0649a..000000000000
--- a/net-misc/mrouted/mrouted-3.9.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="IP multicast routing daemon"
-HOMEPAGE="https://troglobit.com/projects/mrouted/"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.bz2"
-LICENSE="Stanford GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="rsrr"
-RESTRICT="test"
-
-DEPEND="|| ( dev-util/yacc sys-devel/bison )"
-
-src_prepare() {
-	# Respect user CFLAGS, remove upstream optimisation and -Werror, do not
-	# print command summaries, do print commands
-	sed -i \
-		-e '/^CFLAGS/{s|[[:space:]]=| +=|g;s|-O2||g;s|-Werror||g}' \
-		-e '/@printf/d' \
-		-e 's|^\t-@|\t-|g' \
-		-e 's|^\t@|\t|g' \
-		Makefile || die
-	default
-}
-
-src_configure() {
-	sh configure $(usex rsrr --enable-rsrr '')
-	tc-export CC CXX
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
-}
-
-src_install() {
-	dobin mrouted
-	dosbin mtrace mrinfo map-mbone
-	doman mrouted.8 mtrace.8 mrinfo.8 map-mbone.8
-
-	insinto /etc
-	doins mrouted.conf
-	newinitd "${FILESDIR}"/mrouted.rc mrouted
-}
diff --git a/net-misc/mstpd/Manifest b/net-misc/mstpd/Manifest
index 884eaad17630..cf123801c4f2 100644
--- a/net-misc/mstpd/Manifest
+++ b/net-misc/mstpd/Manifest
@@ -1,3 +1,3 @@
 DIST mstpd-0.0.9.tar.gz 113711 BLAKE2B 93ff0213a634fcbbb613c79227d737c3961f4de669e0ac2c7351fa1c22842669edc652ba0deb24917a44df5a465a4e905a98e46ab7ccc7e4ebfd13039e6acfe0 SHA512 1d4a926d8437b7c41c69d2a047718181ca6245f3150e4aeb631f437edaaafe0c40b29802a6c9ea38c9f1dfb1b94149934b473f550358be10bb796295fa632e1e
 EBUILD mstpd-0.0.9.ebuild 729 BLAKE2B cca9badbe108e0d74a10fb149717062f0fb1b60ae50f8fab487fae0f5b6950226a370e826698c1cc5670f1a50fe0cfa5d81f14765011fb886d7a916b24ec1470 SHA512 a428af51cd76eb9a7a498839a6a006c23fc27f02edbb9e7e95d7c280be33394a115eef6b8493f4dad66c3420e7ab706ec980374b8d583fa282dba4bc1d94d5e9
-MISC metadata.xml 444 BLAKE2B 6bbeee7e910599d9bbd586074b2b38f9a84b08d4b6a29961e4d0a9349a4d2a58d672125210eb7e3604a930983a86befe4ba855a75147fc4f507b8a98777785af SHA512 32ca1da084fde5cbcc37b8c474320f7d73db0a33f191c3f3e5d99b8cfd84bc71c6168238d402c0fd2ab00cb9b79faaa62e1ec6a88da75a3a2b2c499b999189c4
+MISC metadata.xml 474 BLAKE2B c41a26753e9934342a3d6050c9496adbbc1064fda59f17dc4846af609ac3a65630902bfd96d6e33e24105732af17f14e5cf2fab15bc0bab1c37f26c9a7d7a15c SHA512 8fdeee7e56e7254541b3000c238ac2290c548ac568f3e5588c2a7c0690632c8e1ee03992c4ab0e94230985f669fcc323b9aa3f84b421b45e6c4aebd6b1f2e656
diff --git a/net-misc/mstpd/metadata.xml b/net-misc/mstpd/metadata.xml
index 359cbebb4676..e64fa059088e 100644
--- a/net-misc/mstpd/metadata.xml
+++ b/net-misc/mstpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest
index 43ce037ab669..96b20dc8579b 100644
--- a/net-misc/ncp/Manifest
+++ b/net-misc/ncp/Manifest
@@ -1,4 +1,4 @@
 AUX ncp-1.2.4-fix-makefile.patch 424 BLAKE2B d8687f2186a762872cac04df49e26013b844884b3d1537ac53cdbd4e1fd397d04fe7c6069c218ecd919c3c68b3e1998cc2cf699ec162ffbe0c9d5d356c77b72b SHA512 fd8fb4bffe36fb8fde955b963f4ba1d00e64e7480372e465fbb8c0750c0c02bd0a6dfb032af101a7599db3446f623a05f604cf3ab57469ef691f424db6520e41
 DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8
 EBUILD ncp-1.2.4-r2.ebuild 767 BLAKE2B 94a45adf6aabcc5fda72de6804c341aece92ea22d2b3c1d9308e0a0b6a8cacbcd0b50098d74d337f41a5cf761c7863042135249cfc3b63377adc120b7ac4e29e SHA512 67e9c79f7c1b379936325503a2af35cc9a210f35ba9bbc49e576e2c21c4ac6faeebe1bc952c8a82d3e0284211f3db4586394c6050a6bfb84c57cab870ffc3f50
-MISC metadata.xml 614 BLAKE2B bb945ccb5995827fd325fb351f0426852a9750c8942452c195800006b8dc8c647b5423fe70fda692091dcb7b814bd6f984b14d4be340e4d7c4abb466712f0c0e SHA512 e0a56910b48f3105c8ec1a414bf65966e411657d1a2f95afde2460b8c203acac1db96df725a9352e9fb9c41f818c8464caaeb1523d5ce348dff628ec314e3c34
+MISC metadata.xml 644 BLAKE2B b74efc66ed0128adacb141a21a1c064a3df173843743d9db7a96beffe40e01e262d002b2632dbc08c6005bf6958b1de66f42782d3d6bb54725cbb3c419e64e75 SHA512 8dc2f56998e2dc3ae39714bc353560a1f5ac9f55f9872c1b2aa47a17f0fd36b7f2c6ca62257f6edd686bea52a9171b5752e4b9dcbffb55acdc4cf03798452080
diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index 17fb58cb0b1f..c301e49db459 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index bc9184e8354e..2e70049d1ba2 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -1,4 +1,4 @@
 AUX nemesis-1.7-fno-common.patch 2057 BLAKE2B c40c2b9549237432168f22d8d4f1903f4b6772b02466616df6b0951a7c6451ccd2adeb103a1931bfb82c7b1df78ff320de137ae0d522806e203ae9a7f7587377 SHA512 0d62b46676c3ebbe2e2bc8636a4d14de52ab9f94f8b67e86b7bcf3546a62b59503f4e1f23a18f25358bf0315983474f5ae602d87281802c30de00645ee56e700
 DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b
 EBUILD nemesis-1.7-r1.ebuild 621 BLAKE2B e8f84d0a6a5dd4efffeeb7ceea943a3d878df025f35ccd3ad502d684ffb3ebc53973cdda9b5b0ae3ed20acacf65ed348450a8e9a9251ecb658b80c53c2968ba9 SHA512 b7662484bcf4972674959f532e5468ecef8e025c5e7ab19fef91e323a4c20532689113087e00a4dda28722751eacb1e482397a092591c501b4514684a5f091fd
-MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
+MISC metadata.xml 291 BLAKE2B 01bbe5df94f7e8a2ac2f43fb03cc062cb9f692983b7eb89cd3e518cddc20c62116222bdbc05018c8ad5ee0d84f8eda2ee42351be8d96678d8224f2741d10e4b6 SHA512 372d8e837f76ac4edde66e68243f20746d3fbaf6ab79fcbb3357658b21e168736cf10b146c7de28e782ed316a30a9541a635a6bdb56db05d6657eeaa6fc2dabb
diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
index f4cbcdfdbb21..f7d95b506b26 100644
--- a/net-misc/nemesis/metadata.xml
+++ b/net-misc/nemesis/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
+<maintainer type="project">
 <email>netmon@gentoo.org</email>
 </maintainer>
 	<upstream>
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index a3d9f3761e4e..24b00d506906 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -4,4 +4,4 @@ AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d45
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
 EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 9f1a59804a601e3243d4b3242d67165060410af13778d3102c36e3e347bff0effb6a6a32856be7b46cf94d2cc38b2bab715c51545cdd8c433aa585d67957229c SHA512 d37d14cf41e7acdf789ff49e1d52b51c09e3a35bff8b01ca588a7656e4d2680d1c4163771ea2b71abbe8b13a2d7b0b9b559fe8c332a62cc9499c47f759031e2e
-MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2
+MISC metadata.xml 492 BLAKE2B 2e0f6ba42b61e932b9f7291bc2af7667e28bfc50ea7bff6581b8f01f5e0ff10112556e21c2e94840653052f91717566e3e52c0aff9119ea1032826da259a6edb SHA512 ca8b8f595efbbf0ccf7ffb627bd12a4ba62ee2147dde317793649f0b5e4786b4b4ea6aca22ba0bdd17d588f15098dedd3e2749999a298e7e28a3ba2a81ae55f3
diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml
index bd198f872437..63ea838ab31c 100644
--- a/net-misc/netkit-telnetd/metadata.xml
+++ b/net-misc/netkit-telnetd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paolo.pedroni@iol.it</email>
 		<name>Paolo Pedroni</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 089550f99e31..1509168a5d9c 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,12 +5,15 @@ AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31e
 AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 179dfdcdb97bfc66adbeb58ca0e0b8f95f6d1cc0687fef338bc25ac59b4dc83e20e547d419ef8cea482c6302a05bbce8279c868f00c0cb173f42ebdc6a4bdcae SHA512 ab3e96bbd88b4a5c0aac59dc8de437be78f2e77762d6bc9c99e3b1ff1d7db39a054c4fd9ba9e2f6f9907da1ef66c8af310562addaa79ecd9e9812564f609a273
 AUX networkmanager-1.26.4-iwd-fixes-pr640.patch 5730 BLAKE2B e22539fef2e4582ab156decbe26667724de181eb2349f7dcb29c41eaf9f918addb4a6e25a43e8b743e118cab56e3f69cc83e0e8ee777560c227165fad67664b9 SHA512 690d128ac153b2147f13f8596858be6e6120c0a744da1cb5e2dad5ce6ae9518565ab15a9a00612771d153ed5e13d60a42f93fae6b7ba177513c9d1bf0a4d701a
 AUX networkmanager-1.28.0-dhcpcd9.patch 10608 BLAKE2B fb5512d4b290ae668b41b2d1f387643e8d7c1c235ec255c292e419551c3a67a06463f43293ea75f8dd9700bde2d045e86eafe313384c22609cb8422117ac092f SHA512 7f9a2a3b7f861cc2c8e4b066449e6574ac74227b7a45ae8e9ca79c81a232d292a62216edff0620042f9556193e3841aa8cf5e8ecdbc2edfc9df0751e2d1f5303
+AUX networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch 2215 BLAKE2B c6165a5e6a1c892aed98bcb14369fc1282aa5179370b3194d879fe3866e184ce99687e88b5f1dbfdaa82313b7c1b59d0949442cc539d5355c114c539a2017598 SHA512 6844e58aa7d7be3030d046b8c330ad0615152a762c689e7dda07ee46466030a078ddf81f3ce8be8c1880191ec22aedde9325dde782ec0cfb95726935fe9086e3
 DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
 DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328
 DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64
 DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a77844b4f60a9815be4b6780fbefecfeffb644fd67ea65373a1895fd2102f2beec9ad141b6e9a92a1a32de646d64acd4250b62 SHA512 ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06
+DIST NetworkManager-1.30.2.tar.xz 5302032 BLAKE2B 2fd30a09b479a4202c905ef29905d0672c0f4e07af15b0b124a626f160d150348e3d4b256386db43b91c4ac27c897f82269ede6e0f35f4b82905920494d070f2 SHA512 08482ac18814fd94bc99f0aa32de7d38c39d29c914a3080fb6df7ec2437b30f1aea1b5207edeae74ff63b9a181a4823cfa11e8884bc22ae80cb0b95f8cc3514e
 EBUILD networkmanager-1.22.10-r12.ebuild 8548 BLAKE2B 5da579ca289ff404eb75807972ccb0e1f9cd04d219e766f4942ca6dd5e83da047bcd94c27e17aefb14b194d3e759a858e1590746ee61ae87bf176d322330f4bc SHA512 f6a6f6885e2c56428c60f6b717a5f5cafe15264280a66b946756da2332f64cffca24ce4d8defc583f07880829a54d098f5435a4b86b912c67bbb17560b910405
 EBUILD networkmanager-1.26.4.ebuild 11351 BLAKE2B 0319b3fe3b67c57f48c960a777f272f8ed89cf1f43f454a3303a69214f641e102168f653fb2af88c539df7fd3f591d4fdd87230d9334460fe270d4e741e9c601 SHA512 21cdaf6a2ba186939a201a3f4ccb59d52c4b1d636eb74517b5f57748582ab448844a7edc88242f591c60403d1721b8294a9001b0a9b0f8be89c38a72c0ea58bc
 EBUILD networkmanager-1.26.6.ebuild 11357 BLAKE2B 9f862a2953a1244c45165be72fc3eb842e30a555048ebbdd0487c5cc7c82c69ff0014a9f760be9c046c5bda37935b8afd9e9c977c0f920b8a15e598b15cd315a SHA512 b5fadbc8153556e16020ea3e4887571ae7c2392f4f243bd3110f8232022b87bb6f1a2c8852d7a9305e0d7d7fcfe5a1ff9573d93d80387a25296a20fb2b69c44f
 EBUILD networkmanager-1.28.0-r1.ebuild 11254 BLAKE2B 1bda0067cf5074cea89c0a7ab0f007aea189531407c5f72c7da930140cab4cb54c0528dcf7c0ec2157021db1a459d9b4de957e5140310a8c7582980ce7398a6b SHA512 e173def62fbb02e654649eeeedf7c573e40e9d9fa0a6d51c907df918e4a3ed2cb55c2ca66cdac07686367f7cec316ad91bd4e9366bec1d39881b19568607e302
+EBUILD networkmanager-1.30.2.ebuild 11277 BLAKE2B 4fe920d0219755d1a6f15ba31cff95f9edb9a839b7ed61ddd1c5553d4458daa5e5951731fa40edae2a54dc9f30b60c2b32dc767ef0874bebf90bc28071c5a365 SHA512 16bb51e39b73fe99e0406d500ced0d4ad844cc5f12d4991bb7aac243e2ff9ffde7706e7e611100829f9dd320f6e6e581049dd2fdf3102528abcc34ce52003f35
 MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch b/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch
new file mode 100644
index 000000000000..0e60ccdcb894
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch
@@ -0,0 +1,58 @@
+From 4409900f1d05bf60647492a75e478590647b997a Mon Sep 17 00:00:00 2001
+From: Andrew Zaborowski <andrew.zaborowski@intel.com>
+Date: Thu, 18 Mar 2021 00:21:31 +0100
+Subject: [PATCH] iwd: Don't call IWD methods when device unmanaged
+
+When using IWD-side autoconnect mode (current default), in .deactivate()
+and .deactivate_async() refrain from commanding IWD to actually
+disconnect until the device is managed.  Likely the device is already
+disconnected but in any case it's up to IWD to decide in this mode.
+
+Calling IWD device's .Disconnect() D-Bus method has the side effect of
+disabling autoconnect and doing this while NM is still in platform-init
+was unexpectedly leaving the device without autoconnect after
+platform-init was done, according to user reports.
+
+Fixes: dc0e31fb7014d8a97aca96bf97a8f86f8236300c
+---
+ src/core/devices/wifi/nm-device-iwd.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
+index 95ade44b58..01f2a30396 100644
+--- a/src/core/devices/wifi/nm-device-iwd.c
++++ b/src/core/devices/wifi/nm-device-iwd.c
+@@ -588,10 +588,16 @@ deactivate(NMDevice *device)
+             return;
+     }
+ 
+-    cleanup_association_attempt(self, TRUE);
++    cleanup_association_attempt(self, FALSE);
+     priv->act_mode_switch = FALSE;
+ 
+-    if (!priv->dbus_station_proxy)
++    /* Don't trigger any actions on the IWD side until the device is managed */
++    if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED)
++        return;
++
++    if (priv->dbus_station_proxy)
++        send_disconnect(self);
++    else
+         reset_mode(self, NULL, NULL, NULL);
+ }
+ 
+@@ -647,6 +653,11 @@ deactivate_async(NMDevice *                 device,
+     cleanup_association_attempt(self, FALSE);
+     priv->act_mode_switch = FALSE;
+ 
++    if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED) {
++        nm_utils_invoke_on_idle(cancellable, disconnect_cb_on_idle, user_data);
++        return;
++    }
++
+     if (priv->dbus_station_proxy) {
+         g_dbus_proxy_call(priv->dbus_station_proxy,
+                           "Disconnect",
+-- 
+GitLab
+
diff --git a/net-misc/networkmanager/networkmanager-1.30.2.ebuild b/net-misc/networkmanager/networkmanager-1.30.2.ebuild
new file mode 100644
index 000000000000..5dfe828e9e78
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.30.2.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-iwd-autoconnect-fix-pr785.patch
+)
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index a40aa12881db..5d557c905d2b 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -8,4 +8,4 @@ EBUILD nextcloud-client-3.1.1-r1.ebuild 2040 BLAKE2B 2d84e53fda3603204bd8fd87dfd
 EBUILD nextcloud-client-3.1.1.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
 EBUILD nextcloud-client-3.1.2.ebuild 2041 BLAKE2B de96cbe1822decdecfbf053e2931d69dcc471009dd11f3115d1553bbe14595bb90b649700bdbe71cab8f857123c3f35f2aacc4d66326d830904b46bf8844e9fa SHA512 e798d0b179a98f9dda74b4f2d47c2a75517591c6d73597a4826d4b0f12926abcb6aa6e16d041e90ee49f85c744ddac36771cc3e9cbf2b3b17244b7fbe0f41b1b
 EBUILD nextcloud-client-3.1.3.ebuild 2041 BLAKE2B de96cbe1822decdecfbf053e2931d69dcc471009dd11f3115d1553bbe14595bb90b649700bdbe71cab8f857123c3f35f2aacc4d66326d830904b46bf8844e9fa SHA512 e798d0b179a98f9dda74b4f2d47c2a75517591c6d73597a4826d4b0f12926abcb6aa6e16d041e90ee49f85c744ddac36771cc3e9cbf2b3b17244b7fbe0f41b1b
-MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb
+MISC metadata.xml 513 BLAKE2B b63b5116dcf22fc8b7608cf7a13b5749668a139f8e670419733cbcbd44284bb45227d16b9a3d5d50d505440e2d50fff77b98cfe4321afc78b20fd22ab3a495c9 SHA512 491340b64cb8bbeb0efc5cba4de9878aca75231bbfc19b8fdd2de895ed0cacaf154add48cec8964412a68e496f348dc539262afa74b08e38d2d7a27ed220ff5f
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index dfcd23fb500c..ea54627aff84 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 741d29d8cfe4..ad4b036204a4 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -3,4 +3,4 @@ AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67
 AUX oidentd-2.5.0-respect-ar.patch 250 BLAKE2B e756da25bca3a2e98be1a625c99f33b20ebb237cd7a3fe8f6e01664db328636451bd7af70cc16e08e45344511660787836358f92c2fa1806998dcf35f73fdc10 SHA512 6ddb24e88e864359faf8f6aa6a28de01067b0cc20c349e8c9f6ec4dafde26636e7cce3e11e137c12cd868f0de85546462be599333966ad8bf850cea5afc9b62c
 DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
 EBUILD oidentd-2.5.0.ebuild 1254 BLAKE2B 928c432bef758266ecd842a3aaea3a4fe55468598a4867d1502eec42a73e540b62591f277f96f4874f38c1e9069f3ccdc6a32a8390c0fc619aa8d9a643511bb6 SHA512 0ea39fead9d40f11229831e53551430788baf885b25efa476b7695057a182279b187b142b50113530a3b2177f577ec5a1f0b60dd88346e23fa807b90055b36f8
-MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
+MISC metadata.xml 569 BLAKE2B ebb1379e780eeeca09af18ca713b55a27c5b3479e66f5571a61de890de3472605a808cdcf950ff7df72de67423d11fc5dc0963bfe8c852b457b606f90094f49c SHA512 154609210a6c893d55d0150e62122a803295d2bea19d61b2e77400083eaa2172b2a427566a7350e944c9a27cdf84f3babdde87f320f4fd05ebeae0712c313de7
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index ed7fbe111de7..818a2bd12b43 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 446e5b30e2c4..e00906b55e09 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -7,4 +7,4 @@ DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c
 EBUILD openntpd-6.2_p3-r2.ebuild 1876 BLAKE2B 19b8f6bfaed7a095ff3401fc487877ca0badaa069b37482805e8b50053b701fa1c747894d9fb4c0b6984241f430e6aca442cbf77a2f91ca8b1ff5b7be66ec36b SHA512 8aa659e9a7ebfbd917a7facf394afb552a4eef2c7ab1f248109cfad92d4931a91bc7c38b440721751c013ea5e391b5400464d519cdd16e57eff8bb65b87eafe7
 EBUILD openntpd-6.8_p1-r1.ebuild 1763 BLAKE2B 9225ea51bb5ebaf34d3456b474d61fc29ebcaff153d3ef8d0f1945391580b312cd260aed404cc23f0b17a5c5509d0068c335dcfb08e9a6ce6e315bec7b09db6a SHA512 8bc095b4a4ba25ed0c4cde951f4d8c47693e61a0fe982627d9db8b8d865bc1a0ec660ee0c1ea99ff2d6bbc217951538a1b06e2daf8624590163ad4ca1c8115ef
 EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
-MISC metadata.xml 828 BLAKE2B 252026b498239d4105cf5a36f898f7587f046d6f533089d7b52116af656c85d340802f8d6e3b95ccb5263f7795e84248e1fbf2f644213c0fb54b7fdab33df79a SHA512 83fe295d82756146bc8b705e02564553079e0292601b2ef38ba46f05a2388bc77d13a0576de6b30937814a708570247c657f4605767fe93a7ca6c49e0c96cabe
+MISC metadata.xml 858 BLAKE2B 230d4a788c80e5fb8b0708563dfaa867965667958eaa71e83f8ead831cab11869967fee05a81f9584b3b8f095fe8e22743e25f3ba6f6fb059a2ae654a29f19de SHA512 3257f9e2f2636ce09307052c8aca002d87b771ec4981fc111128e9a04a54e74e79b306a2dfdb52cdb9a6c3278fc820be16ae62478def533288df05600496c145
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 20734983a2d0..8cf4c9d357c8 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index c6b6f587e555..08b819515364 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -13,10 +13,14 @@ AUX openssh-8.4_p1-hpn-14.22-glue.patch 3335 BLAKE2B f5b179aaa82c17f820cdc057de4
 AUX openssh-8.4_p1-hpn-14.22-libressl.patch 794 BLAKE2B d204e6030a5cef333065d1c76a75a1e9d2a1a621b910fa6a2d85dc69d236abfa4448030cfb25c3965bf8851609af8f6d5217d04515c4d0ac699a6ce7be6395b6 SHA512 afeabef3df3d4a0f5dd0370477a9eff5e04abad3053e81bd88396956857669fac438474ebacb31dd41da4bb68aeff70dc9ca69f20cdb95c87ecb98d4e5fa2c37
 AUX openssh-8.4_p1-hpn-14.22-sctp-glue.patch 733 BLAKE2B 3262f5293611579202b31540eb4ff6bf24be5bd09a93d10f693b173b61eff371cce0be4ecea2ba873c7d5b250a73c032684345b53a41c369f2a5663ad15ecd41 SHA512 b39a5d76558af51db0e9b1daeaaab3d906a4c941886f8016fb7e5e89177fcd5c81904cb5b3c4d0d5935240bee43d4433ad42495f1aa21771e90013ab7726b6fe
 AUX openssh-8.5_p1-GSSAPI-dns.patch 11631 BLAKE2B 9ed39b04f320612f166b091979a21e7765d19afc3947a95dd3019da25eefcad32fcf2a3f17813441fce87cc03a28e0a52ac1aad3ac4b5b7ecdf3f4f8c391ba4a SHA512 d28f7df54af4cc998e1978a6c0fcb28f88affaad4a347084e429549bc0f74347dd8ad79c0ced0ca5a739e2c3cc19f6516aeb678f3a9709c40f1d0fa16d93b9e4
+AUX openssh-8.5_p1-X509-glue-13.0.1.patch 2714 BLAKE2B 03a00a1b9c62d75688706e3f4950510bafea6ae524a3bdbd08a7f059663eae3ff386ffa1ea1edfbf3349231a53b314625778043f39bb52395ffe9ef2a45a8400 SHA512 1ddf7c62ff3e73278a88f9afe5085c4101ef2cae4383cfa7bddc90403db5ea2c9c0fc630d31dc72072c4c008034f02b30cfea149aeb95e70c74292f3b978471b
 AUX openssh-8.5_p1-X509-glue-13.0.patch 2773 BLAKE2B f6bfe7a9986a0804eacb83bd61718b2fb5c52b26740441878cadadcd4773abb7a9f441f9263a704c13de5e25c614d989010b6806bde43b767ae892e68733087d SHA512 27894c3a76ce7483585975b41e7b3a64b8e896daaaf958738f8cd4081d4ff0884d945beb11f9e2ae12b87532d9a30bd642e4442db3ced2cf8747c60459752aec
 AUX openssh-8.5_p1-hpn-15.1-X509-glue.patch 11216 BLAKE2B 88060a94be8eba6b9b01296f1109f930df38d8596dc3500a8ab40f660a159884783a4ea0be362fb52a86eac1e88e903a7eae4cd6fd293922d73acc9a75eee150 SHA512 7e9799c7ab5cf97e791cb1c2aa0370199e91eeaa01e685c0d164f47fcddbf0fc7f55a9fd7ccba79ee861259d0ebd56d083b77cd0b65472fe9bcc83ceb4f2ad0e
 AUX openssh-8.5_p1-hpn-15.1-glue.patch 8744 BLAKE2B 90358656ee0e9ea1dfc7117dc585b296e125b5567fb8e9b12b7da2f00d02a1aa40da4a8fb64158f5ebb0abbd9ed54310f974d389a0ec3e9cface8dd9e1ae9d03 SHA512 8167b35e5daccc6f48af48c17bf01eae54dbff0aa651333e745fda044131746f313cec324275bf5e83592eea53726207763eaccbfb9bbb00fae3247a94eb8322
 AUX openssh-8.5_p1-hpn-15.1-sctp-glue.patch 728 BLAKE2B a9e6000b45fd228fa3623ca9abe6f99efc8e50020cd9584ea8b23e5491eb78253f65adf4ec990cae177874a89d785fa45fec05accae8a97921f804f7581a5ba4 SHA512 a6913dc0cffc5184b38d12f5146085ac6f592350f427bd994ddfa93c0eea041c674e47a80b84cffca9fe72ff5efa7b6797d1eb39addf6b842a6cfc21de4fc3ad
+AUX openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch 11238 BLAKE2B 3d16907f7330b3e30705610c10f5b5037837442df6840231073ae8d0202543b006bf9b9597df50a3173bbb823050e9c2cb5a391ed5f96c4ac2194fb1e97316a9 SHA512 d1fea164d8431282c150a513886c428f7225eb11980bd7c9cae88754d1165ec799e1ef30b17ffa38990b6c58d9626a412abd550909e34f623f311444e097baaa
+AUX openssh-8.5_p1-hpn-15.2-glue.patch 3856 BLAKE2B 1661bb20e523141aae3f988f5dac664ec6f3d6517512596183c9c26d051a75b8d013e0d6e7c21aabb597b5c1a7e768c429bdef70bbfe59071f6e4cbb0956960d SHA512 0439ad0f0ab6dc21dd4279c6d252884e3c2ddaba76a207b3b26c88d8a6b8d873cc08345a1a90b8046ec79d33f47395d87e52d5b44b155a186a8aa16d316b82a9
+AUX openssh-8.5_p1-hpn-15.2-sctp-glue.patch 727 BLAKE2B fafb6bc3ec680327abf01a7a2f673d4be601094d518d74f5afd0c596c1d60ddfc6f31add6b5533f85bc09cf2122b9e3f7243d5d26a2d6923c88c2f6a811ea2b8 SHA512 eda1c1613e94a7b10df9cc08c87ed8a39edb3f8a160600a74780877772bbd76cc9842d5d5d68ed6a9554e1e310675a1e461d894144d514b8e482d4a1affbc9bd
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
@@ -26,6 +30,7 @@ AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03
 DIST openssh-8.4p1+x509-12.6.diff.gz 857479 BLAKE2B ac8c3e8c1087ca571e5459c9826903410ff2d45de60151d9bd8e59da15805b75752f8f3ffc231c9f8aaa8f2b2c07a97a8296684f885e0d14b54ff5d7bc585588 SHA512 e56516b376ecc3e5464895744ce0616cf4446a891fbd3cbcb090d5f61ebc349d74f9c01e855ccd22e574dbfeec0cb2ba7daf582983010ff991243a6371cc5fe3
 DIST openssh-8.4p1-sctp-1.2.patch.xz 7668 BLAKE2B 2e22d2a90723cea9ef958bd989b8c431fcb08b4dc5bfd3ebbf463ca9546dc37acdc185c35ddf3adbb90bde9b3902bf36524a456061a9bcbdef7a76ece79e2ff4 SHA512 90da34b7b86e52df9e0191c99c9d645a4d4671958adebeed46e1149102d4ba8c729eadb79d84fad9feac64aafa0541d2f1f4db8cdfe0af5ba893aac072ef2380
 DIST openssh-8.4p1.tar.gz 1742201 BLAKE2B 4b1e60d4962095df045c3a31bbf8af725b1c07324c4aa1f6b9a3ddb7e695c98e9aa01655b268f6fd6a400f511b23be91f6b89d07b14a6a2d92f873efb4d9c146 SHA512 d65275b082c46c5efe7cf3264fa6794d6e99a36d4a54b50554fc56979d6c0837381587fd5399195e1db680d2a5ad1ef0b99a180eac2b4de5637906cb7a89e9ce
+DIST openssh-8.5p1+x509-13.0.1.diff.gz 997005 BLAKE2B b6cdc9ba12dc642c7073463fb8b153a32019e8bc4c1778c2371d89cdc8d9b43e86523d0c03ebeeafa7004a16ad46dfbc18b338bf95f46101d8865709d45aa6b0 SHA512 b0247885d3a0718eb4df123c552f9e95ad9ffd55f96189aca35006c23d76ec76b28420cac4d7b2167c07f2e0a0652edfa20c2ce60aea3f7607a1e747f836ff91
 DIST openssh-8.5p1+x509-13.0.diff.gz 996872 BLAKE2B 136937e4e65e5e73d1d1b596ae6188f359daa8e95aafd57fab8cf947b59fde573ff4e6259781d1a0fd89718d14469ca4aed01bae6f37cc16df109c673fa2c73c SHA512 2276b0ac577162f7f6a56115637636a6eaaa8b3cc06e5ef053ec06e00a7c3459efe8de8dbc5f55c9f6a192534e2f7c8c7064fcdbf56d28b628bb301c5072802c
 DIST openssh-8.5p1-sctp-1.2.patch.xz 7692 BLAKE2B 298bf5e2004fd864bdbb6d6f354d1fbcb7052a9caaf8e39863b840a7af8e31f87790f6aa10ae84df177d450bb34a43c4a3aa87d7472e2505d727757c016ce92b SHA512 84990f95e22c90dbc4d04d47ea88b761ff1d0101018661ff2376ac2a726b5fca43f1b5f5d926ccbe1c8d0143ac36b104616bd1a6b5dcdba4addf48a5dd196e2b
 DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c804b003c74cc26f9dffae28f1b4006fc618580f0dc9c45f0b7361c24728c23688b45f41cb8a15cf6206c3f15c3 SHA512 af9c34d89170a30fc92a63973e32c766ed4a6d254bb210e317c000d46913e78d0c60c7befe62d993d659be000b828b9d4d3832fc40df1c3d33850aaa6293846f
@@ -35,6 +40,10 @@ DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f4
 DIST openssh-8_4_P1-hpn-AES-CTR-15.1.diff 29966 BLAKE2B 79dea4e16ffdda329131eb48a3c3dd40e167e5c6fa4dd2beb6c67e7e4f17a45c6645e84dcdc97baae90215a802cd1d723dfd88c981b1db826f61fca0a4e92ae1 SHA512 cdb7aa5737a1527d83ffa747d17ae997a64b7bc16e198d0721b690e5932446d30ba4129c122be2a457f261be7a11d944ef49ba2450ce90f552daab508b0c980b
 DIST openssh-8_4_P1-hpn-DynWinNoneSwitch-15.1.diff 51327 BLAKE2B 6879df5bfb4c07c44b41620bd49433591711edb08ad6b5c09af8a5f754ca09f3ff6a066ffac3210fdad6dee47710221dca0a3dc47b919498ec6939b42a073418 SHA512 1e6471e88783acf764186577a767ea7c2071bcab1b803c18288f70166d87471703b332dae3bdcaf4318039089caebfba46e5b6da218912eff1103bd03d736a60
 DIST openssh-8_4_P1-hpn-PeakTput-15.1.diff 2429 BLAKE2B fc2140f4036ef57b7093696680b6e157c78bb431af9bc9e75f223c2b13693f0ec2ad214fbf6b2ba0059cbf3690a93235559f07b46dabd056d65ae1fc9d7418f0 SHA512 99801a743da8f108dcf883bc216f2abd3fc3071617566b83eb07b6627ed657cccf0ea93ea2a70eff1050a34a0e635e732665c5583e8aa35968fdeb839f837b63
+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.4_p1-r3.ebuild 17822 BLAKE2B 33429fc7138dafc13940b6956af610fc15e4d16efd2cc8b318e510365c86c96b73de3961d8506e072ca2972a0e97fa7155af457e310c307d339f451657affbec SHA512 0d37ad65c202611424972d3cb2d5cd43bc57ef2cbf96165fae3a053c45c512c59d060430155292148702df079a60f569e508fdfdccfafc2dbb8fc4c3f2aacb86
+EBUILD openssh-8.5_p1-r1.ebuild 17658 BLAKE2B f5f2bf7ecf36afcbc5a0bdcf61a85caefa03167ab15c5c7cd2096419a11a9fdb3c4c95301554ef9549af489b189d7d1dc4ea2eee131d5cd4f6bf3c751b0a0e8c SHA512 be6c52ae3057bc0961153d3d5bbe970dfa91006ca6e287f5715c0b63b6b879967d291e3386fd12f3a57e6b8e24a09d87ae5e5712a7f9aaa5421cb2b15e2ec6c7
 EBUILD openssh-8.5_p1.ebuild 17663 BLAKE2B 1657a68574452acc6e818ac81bc8590cf6575815b3bf66c5b7c0e0ef7b805300054f937b343dc7e070ebb9b7ac0f9710b9170877f307c993a6acf1fd88cde9a4 SHA512 b0cbd250227fef206edad297ba1ec103f74a65d41499798e69d3c8e38348fe072999f70f3763bf5a5f4c6c3444daea394198d78130206e8742e6e40ff8a0fcdb
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch b/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch
new file mode 100644
index 000000000000..c7812c622c26
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch
@@ -0,0 +1,72 @@
+--- a/openssh-8.5p1+x509-13.0.1.diff	2021-03-15 14:05:14.876485231 -0700
++++ b/openssh-8.5p1+x509-13.0.1.diff	2021-03-15 14:06:05.389154451 -0700
+@@ -46675,12 +46675,11 @@
+  
+  install-files:
+  	$(MKDIR_P) $(DESTDIR)$(bindir)
+-@@ -380,6 +364,8 @@
++@@ -380,6 +364,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)
+@@ -63967,7 +63966,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do
+  	verbose "$tid: cipher $c"
+@@ -63982,7 +63981,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do
+  	verbose "$tid: kex $k"
+@@ -63997,7 +63996,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  if [ "`${SSH} -Q compression`" = "none" ]; then
+  	comp="0"
+@@ -64129,9 +64128,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
+@@ -122247,16 +122246,6 @@
+ +int	 asnmprintf(char **, size_t, int *, const char *, ...)
+  	     __attribute__((format(printf, 4, 5)));
+  void	 msetlocale(void);
+-diff -ruN openssh-8.5p1/version.h openssh-8.5p1+x509-13.0.1/version.h
+---- openssh-8.5p1/version.h	2021-03-02 12:31:47.000000000 +0200
+-+++ openssh-8.5p1+x509-13.0.1/version.h	2021-03-15 20:07:00.000000000 +0200
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_8.5"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.5p1/version.m4 openssh-8.5p1+x509-13.0.1/version.m4
+ --- openssh-8.5p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.5p1+x509-13.0.1/version.m4	2021-03-15 20:07:00.000000000 +0200
diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch
new file mode 100644
index 000000000000..413cc8b9c3dc
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch
@@ -0,0 +1,328 @@
+diff -u a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff
+--- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2021-03-15 17:45:28.550606801 -0700
++++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2021-03-15 17:56:36.240309581 -0700
+@@ -3,9 +3,9 @@
+ --- a/Makefile.in
+ +++ b/Makefile.in
+ @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@
+- CFLAGS_NOPIE=@CFLAGS_NOPIE@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+- PICFLAG=@PICFLAG@
++ LD=@LD@
++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -803,8 +803,8 @@
+  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
+  {
+  	struct session_state *state;
+--	const struct sshcipher *none = cipher_by_name("none");
+-+	struct sshcipher *none = cipher_by_name("none");
++-	const struct sshcipher *none = cipher_none();
+++	struct sshcipher *none = cipher_none();
+  	int r;
+  
+  	if (none == NULL) {
+@@ -898,20 +898,20 @@
+  	options->fingerprint_hash = -1;
+  	options->update_hostkeys = -1;
+ +	options->disable_multithreaded = -1;
+- 	options->hostbased_accepted_algos = NULL;
+- 	options->pubkey_accepted_algos = NULL;
+- 	options->known_hosts_command = NULL;
++ }
++ 
++ /*
+ @@ -2467,6 +2474,10 @@ fill_default_options(Options * options)
++ 		options->update_hostkeys = 0;
+  	if (options->sk_provider == NULL)
+  		options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
+- #endif
+ +	if (options->update_hostkeys == -1)
+ +		options->update_hostkeys = 0;
+ +	if (options->disable_multithreaded == -1)
+ +		options->disable_multithreaded = 0;
+  
+- 	/* Expand KEX name lists */
+- 	all_cipher = cipher_alg_list(',', 0);
++ 	/* expand KEX and etc. name lists */
++ {	char *all;
+ diff --git a/readconf.h b/readconf.h
+ index 2fba866e..7f8f0227 100644
+ --- a/readconf.h
+@@ -950,9 +950,9 @@
+  	/* Portable-specific options */
+  	sUsePAM,
+ +	sDisableMTAES,
+- 	/* Standard Options */
+- 	sPort, sHostKeyFile, sLoginGraceTime,
+- 	sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose,
++ 	/* X.509 Standard Options */
++ 	sHostbasedAlgorithms,
++ 	sPubkeyAlgorithms,
+ @@ -662,6 +666,7 @@ static struct {
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
+diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
+--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:29:42.953733894 -0700
++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:47:54.198893025 -0700
+@@ -157,6 +157,36 @@
+ +	 Allan Jude provided the code for the NoneMac and buffer normalization.
+ +         This work was financed, in part, by Cisco System, Inc., the National
+ +         Library of Medicine, and the National Science Foundation.
++diff --git a/auth2.c b/auth2.c
++--- a/auth2.c	2021-03-15 19:30:45.404060786 -0700
+++++ b/auth2.c	2021-03-15 19:37:22.078476597 -0700
++@@ -229,16 +229,17 @@
++ 	double delay;
++ 
++ 	digest_alg = ssh_digest_maxbytes();
++-	len = ssh_digest_bytes(digest_alg);
++-	hash = xmalloc(len);
+++	if (len = ssh_digest_bytes(digest_alg) > 0) {
+++		hash = xmalloc(len);
++ 
++-	(void)snprintf(b, sizeof b, "%llu%s",
++-	     (unsigned long long)options.timing_secret, user);
++-	if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
++-		fatal_f("ssh_digest_memory");
++-	/* 0-4.2 ms of delay */
++-	delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
++-	freezero(hash, len);
+++		(void)snprintf(b, sizeof b, "%llu%s",
+++			 (unsigned long long)options.timing_secret, user);
+++		if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
+++			fatal_f("ssh_digest_memory");
+++		/* 0-4.2 ms of delay */
+++		delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
+++		freezero(hash, len);
+++	}
++ 	debug3_f("user specific delay %0.3lfms", delay/1000);
++ 	return MIN_FAIL_DELAY_SECONDS + delay;
++ }
+ diff --git a/channels.c b/channels.c
+ index b60d56c4..0e363c15 100644
+ --- a/channels.c
+@@ -209,14 +239,14 @@
+  static void
+  channel_pre_open(struct ssh *ssh, Channel *c,
+      fd_set *readset, fd_set *writeset)
+-@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c)
++@@ -2164,21 +2164,31 @@ channel_check_window(struct ssh *ssh, Channel *c)
+  
+  	if (c->type == SSH_CHANNEL_OPEN &&
+  	    !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) &&
+ -	    ((c->local_window_max - c->local_window >
+ -	    c->local_maxpacket*3) ||
+-+            ((ssh_packet_is_interactive(ssh) &&
+-+            c->local_window_max - c->local_window > c->local_maxpacket*3) ||
+++	    ((ssh_packet_is_interactive(ssh) &&
+++	    c->local_window_max - c->local_window > c->local_maxpacket*3) ||
+  	    c->local_window < c->local_window_max/2) &&
+  	    c->local_consumed > 0) {
+ +		u_int addition = 0;
+@@ -235,9 +265,8 @@
+  		    (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 ||
+ -		    (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 ||
+ +		    (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 ||
+- 		    (r = sshpkt_send(ssh)) != 0) {
+- 			fatal_fr(r, "channel %i", c->self);
+- 		}
++ 		    (r = sshpkt_send(ssh)) != 0)
++ 			fatal_fr(r, "channel %d", c->self);
+ -		debug2("channel %d: window %d sent adjust %d", c->self,
+ -		    c->local_window, c->local_consumed);
+ -		c->local_window += c->local_consumed;
+@@ -386,21 +415,45 @@
+ index 69befa96..90b5f338 100644
+ --- a/compat.c
+ +++ b/compat.c
+-@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version)
+- 			debug_f("match: %s pat %s compat 0x%08x",
++@@ -43,7 +43,7 @@ compat_datafellows(const char *version)
++ static u_int
++ compat_datafellows(const char *version)
++ {
++-	int i;
+++	int i, bugs = 0;
++ 	static struct {
++ 		char	*pat;
++ 		int	bugs;
++@@ -147,11 +147,26 @@
++ 		if (match_pattern_list(version, check[i].pat, 0) == 1) {
++ 			debug("match: %s pat %s compat 0x%08x",
+  			    version, check[i].pat, check[i].bugs);
+- 			ssh->compat = check[i].bugs;
+ +			/* Check to see if the remote side is OpenSSH and not HPN */
+-+			/* TODO: need to use new method to test for this */
+ +			if (strstr(version, "OpenSSH") != NULL) {
+ +				if (strstr(version, "hpn") == NULL) {
+-+					ssh->compat |= SSH_BUG_LARGEWINDOW;
+++					bugs |= SSH_BUG_LARGEWINDOW;
+ +					debug("Remote is NON-HPN aware");
+ +				}
+ +			}
+- 			return;
++-			return check[i].bugs;
+++			bugs |= check[i].bugs;
+  		}
+  	}
++-	debug("no match: %s", version);
++-	return 0;
+++	/* Check to see if the remote side is OpenSSH and not HPN */
+++	if (strstr(version, "OpenSSH") != NULL) {
+++		if (strstr(version, "hpn") == NULL) {
+++			bugs |= SSH_BUG_LARGEWINDOW;
+++			debug("Remote is NON-HPN aware");
+++		}
+++	}
+++	if (bugs == 0)
+++		debug("no match: %s", version);
+++	return bugs;
++ }
++ 
++ char *
+ diff --git a/compat.h b/compat.h
+ index c197fafc..ea2e17a7 100644
+ --- a/compat.h
+@@ -459,7 +512,7 @@
+ @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh)
+  	int nenc, nmac, ncomp;
+  	u_int mode, ctos, need, dh_need, authlen;
+- 	int r, first_kex_follows;
++ 	int r, first_kex_follows = 0;
+ +	int auth_flag = 0;
+ +
+ +	auth_flag = packet_authentication_state(ssh);
+@@ -1035,19 +1088,6 @@
+  
+  /* File to read commands from */
+  FILE* infile;
+-diff --git a/ssh-keygen.c b/ssh-keygen.c
+-index cfb5f115..36a6e519 100644
+---- a/ssh-keygen.c
+-+++ b/ssh-keygen.c
+-@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device)
+- 			freezero(pin, strlen(pin));
+- 		error_r(r, "Unable to load resident keys");
+- 		return -1;
+--	}
+-+ 	}
+- 	if (nkeys == 0)
+- 		logit("No keys to download");
+- 	if (pin != NULL)
+ diff --git a/ssh.c b/ssh.c
+ index 53330da5..27b9770e 100644
+ --- a/ssh.c
+@@ -1093,7 +1133,7 @@
+ +	else
+ +		options.hpn_buffer_size = 2 * 1024 * 1024;
+ +
+-+	if (ssh->compat & SSH_BUG_LARGEWINDOW) {
+++	if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) {
+ +		debug("HPN to Non-HPN Connection");
+ +	} else {
+ +		int sock, socksize;
+@@ -1335,6 +1375,28 @@
+  		/* Bind the socket to the desired port. */
+  		if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) {
+  			error("Bind to port %s on %s failed: %.200s.",
++@@ -1625,13 +1625,14 @@
++ 		if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg),
++ 		    sshbuf_len(server_cfg)) != 0)
++ 			fatal_f("ssh_digest_update");
++-		len = ssh_digest_bytes(digest_alg);
++-		hash = xmalloc(len);
++-		if (ssh_digest_final(ctx, hash, len) != 0)
++-			fatal_f("ssh_digest_final");
++-		options.timing_secret = PEEK_U64(hash);
++-		freezero(hash, len);
++-		ssh_digest_free(ctx);
+++		if ((len = ssh_digest_bytes(digest_alg)) > 0) {
+++			hash = xmalloc(len);
+++			if (ssh_digest_final(ctx, hash, len) != 0)
+++				fatal_f("ssh_digest_final");
+++			options.timing_secret = PEEK_U64(hash);
+++			freezero(hash, len);
+++			ssh_digest_free(ctx);
+++		}
++ 		ctx = NULL;
++ 		return;
++ 	}
+ @@ -1727,6 +1734,19 @@ main(int ac, char **av)
+  	/* Fill in default values for those options not explicitly set. */
+  	fill_default_server_options(&options);
+@@ -1405,14 +1467,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b4fa372..332fb486 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_8.5"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn15v2"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+diff -u a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff
+--- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2021-03-15 17:45:28.550606801 -0700
++++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2021-03-15 18:39:10.262087944 -0700
+@@ -12,9 +12,9 @@
+  static long stalled;		/* how long we have been stalled */
+  static int bytes_per_second;	/* current speed in bytes per second */
+ @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
++ 	off_t bytes_left;
+  	int cur_speed;
+- 	int hours, minutes, seconds;
+- 	int file_len;
++ 	int len;
+ +	off_t delta_pos;
+  
+  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
+@@ -30,15 +30,17 @@
+  	if (bytes_left > 0)
+  		elapsed = now - last_update;
+  	else {
+-@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
+- 
++@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update)
++ 	buf[1] = '\0';
++
+  	/* filename */
+- 	buf[0] = '\0';
+--	file_len = win_size - 36;
+-+	file_len = win_size - 45;
+- 	if (file_len > 0) {
+- 		buf[0] = '\r';
+- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
++-	if (win_size > 36) {
+++	if (win_size > 45) {
++-		int file_len = win_size - 36;
+++		int file_len = win_size - 45;
++ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
++ 		    file_len, file);
++ 	}
+ @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
+  	    (off_t)bytes_per_second);
+  	strlcat(buf, "/s ", win_size);
+@@ -63,15 +65,3 @@
+  }
+  
+  /*ARGSUSED*/
+-diff --git a/ssh-keygen.c b/ssh-keygen.c
+-index cfb5f115..986ff59b 100644
+---- a/ssh-keygen.c
+-+++ b/ssh-keygen.c
+-@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device)
+- 
+- 	if (skprovider == NULL)
+- 		fatal("Cannot download keys without provider");
+--
+- 	pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN);
+- 	if (!quiet) {
+- 		printf("You may need to touch your authenticator "
diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch
new file mode 100644
index 000000000000..8827fe88d7aa
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch
@@ -0,0 +1,104 @@
+diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
+--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-15 15:10:45.680967455 -0700
++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:25:14.710431930 -0700
+@@ -536,18 +536,10 @@
+  	if (state->rekey_limit)
+  		*max_blocks = MINIMUM(*max_blocks,
+  		    state->rekey_limit / enc->block_size);
+-@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -561,20 +553,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
+  	struct session_state *state = ssh->state;
+  	int len, r, ms_remain;
+@@ -598,12 +576,11 @@
+  };
+  
+  typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *,
+-@@ -155,6 +158,10 @@ int	 ssh_packet_inc_alive_timeouts(struct ssh *);
++@@ -155,6 +158,9 @@ int	 ssh_packet_inc_alive_timeouts(struct ssh *);
+  int	 ssh_packet_set_maxsize(struct ssh *, u_int);
+  u_int	 ssh_packet_get_maxsize(struct ssh *);
+  
+ +/* for forced packet rekeying post auth */
+-+void	 packet_request_rekeying(void);
+ +int	 packet_authentication_state(const struct ssh *);
+ +
+  int	 ssh_packet_get_state(struct ssh *, struct sshbuf *);
+@@ -627,9 +604,9 @@
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneMacEnabled, oNoneSwitch,
++ 	oDisableMTAES,
+  	oVisualHostKey,
+  	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
+- 	oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
+ @@ -297,6 +300,9 @@ static struct {
+  	{ "kexalgorithms", oKexAlgorithms },
+  	{ "ipqos", oIPQoS },
+@@ -778,9 +755,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -120,7 +124,11 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none cipher to be used */
+ +  	int     nonemac_enabled;   /* Allow none MAC to be used */
+@@ -842,9 +819,9 @@
+  	/* Portable-specific options */
+  	if (options->use_pam == -1)
+ @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options)
+- 	}
+- 	if (options->permit_tun == -1)
+  		options->permit_tun = SSH_TUNMODE_NO;
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+ +	if (options->none_enabled == -1)
+ +		options->none_enabled = 0;
+ +	if (options->nonemac_enabled == -1)
+@@ -1330,9 +1307,9 @@
+ +		}
+ +	}
+ +
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+  
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
+ diff --git a/sshd.c b/sshd.c
+ index 6277e6d6..d66fa41a 100644
+ --- a/sshd.c
diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
new file mode 100644
index 000000000000..7199227589c6
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
@@ -0,0 +1,18 @@
+diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
+--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:06:45.020527770 -0700
++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-03-16 10:07:01.294423665 -0700
+@@ -1414,14 +1414,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b4fa372..332fb486 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_8.5"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn15v2"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
new file mode 100644
index 000000000000..6ed670ff5e99
--- /dev/null
+++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
@@ -0,0 +1,514 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic multilib 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_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.0.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 bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp !security-key ssl !xmss )
+	xmss? ( || ( ssl libressl ) )
+	test? ( ssl )
+"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( 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? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl: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 )
+	userland_GNU? ( !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 "booooo"
+	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.5_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
+
+	# workaround for https://bugs.gentoo.org/734984
+	use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.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.5_p1-hpn-${HPN_VER}-X509-${X509_VER}-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.0_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
+		# stackprotect is broken on musl x86 and ppc
+		if use x86 || use ppc; then
+			myconf+=( --without-stackprotect )
+		fi
+
+		# 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/packETH/Manifest b/net-misc/packETH/Manifest
index 8892b530d409..ba58e58f1d1b 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -2,4 +2,4 @@ AUX packETH-1.8.1-libs-and-flags.patch 249 BLAKE2B 039c2c8329ad4ba7dde845c34c1de
 AUX packETH-2.1-fno-common.patch 1050 BLAKE2B 37b96926309c9ee1fa9654941f0f18b9edebea98397128e32550601f7e0a75068c5eca6ae7c5498c99601703519016967e5aeb6614b0237251097fad256ee9bd SHA512 1f51f5746e2fb9405b11e6b64e0e30ba426459d892f3f60e62c879f8ff0276167ab37f630e828b3648e04774aeca9e716962bc936ca5b6d497a6b87d0dad4fd9
 DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd7745eac0f16fbd515c6b5f72c7b9f7575fd215a3a1d0b69d6ae1f08427e5d145abbc83b9cbfeb6c6657d28b35 SHA512 55be4a2eb517c1d040664ea1a16d59dab20b06edbbd073cbf709deb4dfcec8d8eb12b88dfbd578f9bdb0ca614036ac4bbb00be6f865b774da2aa62ce8d3d767e
 EBUILD packETH-2.1.ebuild 1056 BLAKE2B 27137a90eae39926a4fe2692047b440e26032fda032ac0f16e1c76a718ca9bdf97c8db38849c4ffcd462846125114d08c8683fa5db8022cb476d01c8beae84a2 SHA512 976cad3aaf4c1bdfc15ac71bb4e6e3e57658c121e547687d40f1cd073eb1484bbdd52b3a64e0948acff9e0f67a0e26409f0fae83506587fdaf86c9585c8de4b2
-MISC metadata.xml 413 BLAKE2B 8d0f984cc4740f606b9dd7633dc126f2dc57a7f07930a8a6f554e254df9f54eee1405179f61b14dec8ecf02bcd13019575c55abeccf404011b97b9aacdd4d7e3 SHA512 5dd67301ca215d9f3d0695d530e137cadec338c90996c0119deea631ac1d3a2219320229556b265fda561e02aba43d9cdf2169725559f95dc40de15951fa6adb
+MISC metadata.xml 413 BLAKE2B b931cb781f54cb61dea3f872bdeabb60d23348d97d75f6f9395ae9c4880e507eb381a8c48f7d7737aae77ba6ee819375926f9f2282cad618df30c8a81326a0b2 SHA512 1ba9ad6f10e5218c973427f48238d573414aaca0c544f5a343e40c0b525b1035636218e6e3f08fae8cfff54c1fd66edb604e75c56e01d43dde05c46efcad6da5
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
index 1dacf90ddd48..53b2071f5d32 100644
--- a/net-misc/packETH/metadata.xml
+++ b/net-misc/packETH/metadata.xml
@@ -6,7 +6,7 @@
 <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <use>
-<flag name='cli'>Build and install packETHcli</flag>
+<flag name="cli">Build and install packETHcli</flag>
 </use>
 <upstream>
 <remote-id type="sourceforge">packeth</remote-id>
diff --git a/net-misc/pingu/Manifest b/net-misc/pingu/Manifest
index c95db5cc216a..bd504c09c7fb 100644
--- a/net-misc/pingu/Manifest
+++ b/net-misc/pingu/Manifest
@@ -6,4 +6,4 @@ AUX pingu.tmpfile 28 BLAKE2B 210f520d7b30a5c33747f481674dfa588c690589ca5cc03d5a4
 DIST pingu-1.5.tar.gz 31565 BLAKE2B 13d1fa075f32d5a32cece55c5292cda08f72e711a8567cc8b25ce0e2bb0325395f1346e9feb96eb266c93d10d04609d87562192f7b7d0c22730fd4a8561c6c1a SHA512 71e5fbe93f831f24d168957cdeaff2817a22f407575316d6515755bec760d10724821070549eaab562924237b96976a1a776ca903d5fe0cd9f9b69a38eadd8c9
 EBUILD pingu-1.5.ebuild 1298 BLAKE2B 00ddb5cffca604bfdcb620ebd450e633e7e2aff732eed954f3d1ed2b8adb47d0a85040a0fb8914d29b2e50a48f304530158882265ee93f15f2d06d779057105d SHA512 96387332ec8643e9b75d1931e1430ce3d0cb0efad3adfa0024ebfc09774f957f952533df2bb47a3e9d633c0e824be920057cc7de7da818b7f7d6af4deb114760
 EBUILD pingu-9999.ebuild 1139 BLAKE2B 4513781ea236033d279d7c5db84d896d37d88275d533b56ce18bab50db81dede0d173d930b86bdaafa86011c379ec0265bcfe9e9c516244bee224245ef65e8c9 SHA512 be1dd4c24a21f51578e92a28ae023e7c51ab26c713e11ab4a12e9db0d118352956c2cbb37806d22e3d7420d2c8315db9a3e38ea78ed03426eae425db8744e7da
-MISC metadata.xml 452 BLAKE2B 159622afeab9202ada42b0dbbe1181c2a26901eb82bf12f515c1a0f0d03e1a660b9cda460cd8f83900ed7e2d8329b9b0c1fdc6ef7993bcf0e7d2ed1f172ca16b SHA512 2a197340c32f4b2c42f183685b9478e007515eb7891a43113964f9f866e5f199d11eafa20dfea37b187e3caf29b2a9ef51df4912bdc684936aee9cf4b6b38673
+MISC metadata.xml 482 BLAKE2B 3cc5b00792effb55cc61b3ef32a966b712e031b18fef383ccf6404e7be7a12870be1f82f62d21e056d0b973cd60aa015999be63e18693cc8746ccfea492f708b SHA512 a5c9f6bcf4e525711381777afc18b2f22247574715323281a9d2bc23ee7cf28548fb9fa150195347b562aa24556cd72e0896e27a34c07a88255281cf53825ad4
diff --git a/net-misc/pingu/metadata.xml b/net-misc/pingu/metadata.xml
index 1e9ae98b8c53..e38d181b5a75 100644
--- a/net-misc/pingu/metadata.xml
+++ b/net-misc/pingu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest
index 23fc802709fd..b7478b86c7d9 100644
--- a/net-misc/ptpd/Manifest
+++ b/net-misc/ptpd/Manifest
@@ -6,4 +6,4 @@ AUX ptpd2.service 228 BLAKE2B 89bb7a7b4352f9905032ca7efc778cc220282df8389f1da4f6
 DIST ptpd-2.3.1.tar.gz 884161 BLAKE2B 029eeff4ff427aec7a24365bd7f62a4f5d6bfe4bc0a003b0fa8ca1f7581b2395cb96c27bfa59c6333b0354ac0fb12fb11fd24319506c2168e0ff4ddfb3df9117 SHA512 25c128ce1920ae2c1469e986bfa5d5b8ebca04ec14b838fb8232b36e0a1ef94646507e1b25034846d11cf0f71d7e2da983b9f6408f8fcfc608904ecfec2a15c4
 EBUILD ptpd-2.3.1-r1.ebuild 1358 BLAKE2B bbd67fb82dabd88f2f0885df34dea7e4a26406a86c5329aa72fa66f93327a842eeb7b0c20aa6f5874157e4acc461ffe1fd1befa37825ed96f7ee331c6985854e SHA512 157ebd631b8066ce73f1d1bc8133e23dea20fcf34585e219c59a792ff90d0b80be4fd74bed2d30e0f256c99e5f24ac2a861fba14f69904ad899330b32dcafc97
 EBUILD ptpd-2.3.1-r2.ebuild 1418 BLAKE2B 03563a0e1e386d9d2a25f54497262adbf12b7abcd9554c23893d0b38a4865ce7a92e209d43d49dfb948fdf4aec284f5afaaa09eb6a5f54d476e8db94c65eb946 SHA512 24f1927b4fd1b526ad503fd92d5c0d87f8dfdbc1838b47f02a341a6b549afbedd025fa936b31e45aa3cc7815a1ef8a07a18afd9feed65380c684da6beb600d4e
-MISC metadata.xml 988 BLAKE2B 25f10292189622b3e50d058fc2faadd46959bab489a65a77f4bf4b4d5b8c98ec86e4b54e987b87dab497d4fd39c2c786b743987166ada6d9c4a61e15a5960a1b SHA512 a96ee23e21b8230c4756022e5678df1f72c61576b0aae1de04c10328417f64535129ed4a10beb7545c7316e36b9fe658e8c5ced5f28177ff84b106caf525ec06
+MISC metadata.xml 1018 BLAKE2B a971e719b88f016a1e56acfc39be13e4ceea521c4deea485c876b9c54c19d507a3ade176e32af4371ac781725197fa5c3d8f8d974f73fd0799cc366af960f589 SHA512 e9dd483692a5de06400c69ca52911b4dc1f8b6a3310b571398b939b7ae3b014a57553c85282f09d10082475bce03448ddfce37962a5bf1e9adb932e7e7bfd0f8
diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml
index 6633371ca920..e17af8c6fcf5 100644
--- a/net-misc/ptpd/metadata.xml
+++ b/net-misc/ptpd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>honza.breuer@gmail.com</email>
 		<name>Jan Breuer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 31087a9c8ff1..7904ce1fa4b3 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,3 +1,3 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
 EBUILD pulseaudio-dlna-9999.ebuild 2019 BLAKE2B 266ac29d3776ff6aa5e9d933eb7d099812899ebb82874453499816195b5ae51ebe4d14842ec0e2a45fdfaec14bc42e205a419af5851b5cea134104461708a7c8 SHA512 db84789f4eab84be3a43a1cf0047f5d09cd4ff57db495c38c57acc94b7f363415925c1e8239c9bb7b9f2410e6e2ee93c1d00627d77a45caf2691ae5787853e90
-MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
+MISC metadata.xml 340 BLAKE2B 0b1e32783a144b886d4728cc395d18cfa3667994f63169c41d7faafa3d9f8fd403601fbfdaa533652c049ea9c3cec19e97a44207c9a83eee6e8d54d859416fd7 SHA512 511176b0db620e0d257b758cc329a143e4e948dcdaf2fef42dcb8bef4a9e72d5d05c2c50cdb2ed834b343caa682a5722a2cb5063a5ff98e13c939dcda8e3d396
diff --git a/net-misc/pulseaudio-dlna/metadata.xml b/net-misc/pulseaudio-dlna/metadata.xml
index 23b50d1eb70d..e5d2d58c2263 100644
--- a/net-misc/pulseaudio-dlna/metadata.xml
+++ b/net-misc/pulseaudio-dlna/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 5e6eb6033533..1f9416e7ff9d 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,6 +1,8 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
+DIST rabbitmq-server-3.8.14.tar.xz 3187648 BLAKE2B 53dc32a4b798e79d4c523f13e3d6edeaeabae251221875c464d4ae53fb5d80883807d615591cf8b7a9aae862b182637a2a0bbe1966025791560b3e8f6dab73f5 SHA512 19326fb7ce42241c22541dadd73a147d0b1e6c01d3c7748486fb1d666d76e2ba7835d2a39c200294808ef1a7af5f885fbbe8c7c2a81e561922bd6f8574e5fb91
 DIST rabbitmq-server-3.8.7.tar.xz 3074228 BLAKE2B 131e79cc97c64fb5ba8d0c4906501da34e8569cb498ec61fe16be05923e2e2787a3d4ae5291f27efa619a0988b3c98ab8109ec2c0bc2c74da48c4ddc2f5e2cd7 SHA512 0d9771576f5b0b3ee68386ad02c7b01aa9939c38ab1aa8a8e2fe5f5b494b5cd855d2a5029a74364c6bf5097e8a70ef95e325ef9a9945576344c1a33ace0998ac
+EBUILD rabbitmq-server-3.8.14.ebuild 2123 BLAKE2B 7905cb8e051f91b74a6e7a0dd632df0827e1f618f57e90f6bd247edb4f6699235d1bfdd619fead56cd486a08d35b7e28fb612d60a0801f862292bd8ce635048f SHA512 1c7cb9378d87a474547514728c65f4466d12be4514ad3a1fad0ae5b1bfa1256959ca1f94bb67651b9528fe320fc361d62581a47fa172b7892da8d46f99e830ee
 EBUILD rabbitmq-server-3.8.7.ebuild 2151 BLAKE2B 3c0f2aa446e78d693618127dad27b09cb26712bf555deb3b7e46c59ac199c504276ac9a9532e728dd2db449a611cadf1d0ba89b5a6d059d9f8e79a979eb62fdd SHA512 47ccea4708d114f79838f8e8e702a819a88bfd22671a0b731b9c121801becf5f65ba9fec68d21eacad8528cac26fbc6ffcaf6ebc22dd3da19766d7fd31be4e65
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
new file mode 100644
index 000000000000..a8a9e9eb1e3d
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/erlang-22[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
diff --git a/net-misc/realtek-r8152/Manifest b/net-misc/realtek-r8152/Manifest
index 522326c1d606..cc99a71b0ec1 100644
--- a/net-misc/realtek-r8152/Manifest
+++ b/net-misc/realtek-r8152/Manifest
@@ -1,3 +1,3 @@
 DIST realtek-r8152-2.14.0.tar.gz 88356 BLAKE2B c530080cab5e6f7433aa6452e3c5f1f19f14c2ac473751958d85efa5553d2b2889d80cc47c2ad4064ad5673008df97dce197254f445c5fc7ae3905c7833e1641 SHA512 2908e9963b6bec9d638514e6a54ab8bca0b56c4866245f476889e4c8462c36f2bece86abac2e5ece9aee1776f00f7d4a67fd5561d830a67e02e386d79aba07dd
 EBUILD realtek-r8152-2.14.0.ebuild 1608 BLAKE2B d3e3d51c689e73b230936b46dd01ec582fffec9855b377e51e656ea385b171a088d35a004cf76fb2b99af5b10df6479707310db5205e9a91eb6eb95dede29780 SHA512 7fb49e147edd47989c3680bee50c51d76e17bb8c29bcd1d7abae1ef8b16f1ee38e2206b5e43a4d4508587fd2b9a12ae3b331b5c3bf831ec2db02987ca3539a7d
-MISC metadata.xml 252 BLAKE2B a7c6d432616d7b90dd77f1595a17154db8559729a787d0b94cbf6c44b3fc08005bd9ad6cd1eecc5fb8bf9f25789f7eac2efd074e6042125a207567f9af292716 SHA512 67a93db722bbbb0e7ed243cb68e60fbe315114013b2326bdaca5d2dd10ae6629bf207152c1cd95a98f6e638346fde3fdefbd35b3e47005a93eda61fd1aee0cae
+MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/net-misc/realtek-r8152/metadata.xml b/net-misc/realtek-r8152/metadata.xml
index 6c5d3e79d48d..8072ef2372e4 100644
--- a/net-misc/realtek-r8152/metadata.xml
+++ b/net-misc/realtek-r8152/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 1460078f2ef5..a06fc0819411 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,3 +1,3 @@
 DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
 EBUILD s3cmd-2.1.0.ebuild 546 BLAKE2B 83fa55b319aab69d5677b656236fd689c343c034e3fff88a1df8ad7432a82e50e20e3ab8d767608dac4a0c55c2acecb236ea526d59f177a9f4e70b3023060f04 SHA512 577cb0a0b92a78c10dabad767c8574cf41b8fdf1d7d0551e41e736e0ce626ac4a8f35bcd6e0ab7d06df7470f6744a370313aea9824f28c26e8c23e73048582f4
-MISC metadata.xml 684 BLAKE2B a51a67e94176e0c83d810b847abce27229e0769007d984fe4947a474f7d5dbc7a27169efa6caad265405e7e489351f5cc506fc852be88381f282bc7068bd70f4 SHA512 aa2ed58e516488adeb24cca0aac779dcb49c4ed6977a6b411df34f45a0e1b58a42aa34b0ff5faf1206bfb88f85bddf034dad43577512cff67e1aed2292f373e8
+MISC metadata.xml 714 BLAKE2B 2a7000a762de00a18e30b131609496815f2f47405684af84eeb5de35d6a29762eb7be897912ef0d75e1c43d14e01ab4f552cd77cc661553556277f0ca802b12f SHA512 7107fcd23b90ed1b5cf3d454112ab5d673569da5f14cd41f9f430b643ad0837fe6d713f9584a09547c8d33dbe8e5e3352c360b25dca99dfbb8f2eaa84b4007e5
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 8d26ba9964fb..6115812190c8 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>igor@itesten.com</email>
     <name>Igor Testen</name>
   </maintainer>
@@ -13,7 +13,7 @@
     <email>rich0@gentoo.org</email>
     <name>Rich Freeman</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/samplicator/Manifest b/net-misc/samplicator/Manifest
index a46dbf06a77b..701986f9ec78 100644
--- a/net-misc/samplicator/Manifest
+++ b/net-misc/samplicator/Manifest
@@ -5,4 +5,4 @@ DIST samplicator-1.3.6.tar.gz 87901 BLAKE2B 0ee1a7900c941e5c92c722cbc1c7308be802
 DIST samplicator-1.3.8rc1.tar.gz 109870 BLAKE2B 2ff442733216d6489028117936460ba8436af2f92982ac819a1d824ec5e07cf7f43c01e6de9abd9d50005e3bb8d5d91a64570bb805eefafee4bda14fac11d6d0 SHA512 9f688baff07f885a0ad58974374cdf6b66a5aeaeb01fbf38f431ebaaf160b38e37fae7c511f0fe388b10fa91d0bf4505c765556f55a2c6753a57d3df3b8b3306
 EBUILD samplicator-1.3.6.ebuild 1539 BLAKE2B 58293b65d0eb48d8b0238f194f93b5a1d6b3e5e1b47206fdbfd05cd1ad80283b6c3e69a8707f57b901086aa6cd231231190ec2e71c58409e2b6ff53aad252835 SHA512 a81f6ca6783aaf2b77edde24c8fdbdb459371f3894cbdfee720a83aaf46741f9d646847cc9d7bcf759cec5bfc46cd5b80594e09b71c5e541acf21371485215af
 EBUILD samplicator-1.3.8_rc1.ebuild 1604 BLAKE2B 208ef2cc6f5b73989dbb526a2e8d35e00656628fc914add727f12367d054e593fff811529c4312b1696d1624babe22058a5aee0db2e6306ff9126277f3a9b073 SHA512 7177a502bcc332632250a6d4be65d7cbdd1a243cc5410a091bf61764c20b615ed280be62f5e8cb6a5edb5ed1ffabc3fd4e5442e3656e2c7f4f3727cfb8f219ae
-MISC metadata.xml 816 BLAKE2B a9153d3127cd86761dd1163f2ca8df8bc7ef2191bbba211a37999004d74f2e7ff32460b9eff3bda68dd6e1b5e96b638ac5a32ae5ffd4f4ecf2cf61342a6c8e88 SHA512 95e2021fe0539b320556156c01810e133a2abf75858cd5f57261704c1b98765cbea51635b6e9cd9b485d60c9d7360456ec03ae9429ed1ae1b91c46e010c50e02
+MISC metadata.xml 846 BLAKE2B 8d9f63a96c88c7cfd61cb710d633a53fd45dcc08e6c2399f45b11293a68ad23cbf729727c65bbb84de789a40b35f79f2d50319679f5909f06b3f95891e7a768c SHA512 52278a43277f8d5b9e42e472ee8db73da0ee8f102356297efd22aac97484e687ca0c3b016fad3c7fe0a80c44b48ee7b3bc44f6d21f55762cba2ec587e83fd26d
diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
index 20ebca25013f..b94b9566c80a 100644
--- a/net-misc/samplicator/metadata.xml
+++ b/net-misc/samplicator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 7c8b41a341de..d9f28efeb0a6 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -4,4 +4,4 @@ AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538
 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b
 EBUILD scponly-4.8-r6.ebuild 6872 BLAKE2B 157742b3ba96711c41389bf038c112438de483145cfc30357499b3e2ddfb3cd9a1d7e5cdfa1c839cd7faaf9a0f82f938adb8f2f135ef7a6ca7ea1ba70728adb3 SHA512 a51fe4efa6d1aaf45aea4ad8c221e02f07533d5dbfff50b0bf34da73252ef5f6be80def1236611375bdbe18862dc60e5dbde24b7af3d56e664981247d34b2aa1
 EBUILD scponly-4.8-r7.ebuild 6938 BLAKE2B 44e7e4de6259a6692b9d5dc22453eea34917eecffdfc2e78da9474b5102c75bba59939496b6c80121c009966f51b99668a70853a1cf0a25c55aa425885994b88 SHA512 9ba63e00d60988b9250dbc1521d8a08323f9ccdead86025b6a85082472f2e6ec9fcf860591734c3ef47fdc58d2b5b171c35a60a0866636be8a59785560c7061f
-MISC metadata.xml 1730 BLAKE2B b6663a37fe260a5e1552d5bf173d96021cf5588a917a54e3e892eddf7be9618e8b2244328ca6bf87fe8dda4777349fb703f09075975b754026403742a590238a SHA512 86aedd96e8b14fa8b86a2f69a253191777e9292e4547dd8e4e07e11b22068bf1a7b6404a7a0ee4108b7ecc4d99a952c81999482aa9488d45b92ae9c4ba451938
+MISC metadata.xml 1760 BLAKE2B 0e8926cd16ce210ce1545243103305d7c2943fbb0dd41b09d819225aa67995c7c0a3e5d7cc892422480e237d8f9b89b4b95f137abf9a8ed3287c953517e296be SHA512 0a25c9484e1f10839f62d09f2eabd6cee41c70045a6d6e0e321bf6f19b414923369bc4d4aead8828835f81094459ed7230c2ddcec496677a94c276be255381e9
diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml
index 38864027ac19..66feb21e49e3 100644
--- a/net-misc/scponly/metadata.xml
+++ b/net-misc/scponly/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index efea8ec30701..b0c21931e1a0 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,10 +1,6 @@
 AUX seafile-client-7.0.9-libressl.patch 558 BLAKE2B 92ab8e75e83a3693861e3b1c4f390fe5287140520867940b2bfa0615f65294cfc0328fd0a285c6e66941e040dc09b8164fb58ab092f5645628811227a30993fc SHA512 67cbcddb7d8610d29fcb308ebd0bc648ad0526101a2540e743232500880f276b0c07f50f20bcdf31d49f422057f99e310a84384ef47f52abe90be8ef0b8b6e6f
 AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-7.0.10.tar.gz 2368056 BLAKE2B 8b446a818cc3a238bd92831843f1991632e9417ba92d043065aaf43e2a4d74aa00d331e32136a195558dc780ae124c8b1e7b2b2969f3cff8169635df7470f876 SHA512 cab11292ab1957b1682e0d3ee1ddd8e794c52bba7cf08ed39e8f598d3549247c20214d907d1e3792c06a36d8bea55c0bd25ce9aa3a802c262f9af785da7cb340
-DIST seafile-client-7.0.9.tar.gz 2367747 BLAKE2B 60a488a22e094d4783c7da50e8852d7204e16791613d113f729bacc21a40883edc25469f8ce1a8dab52b4ed0ea73b691a831fb0c01a885aeeae7bd276e2781ff SHA512 665a252a321744cd84b96230f5318528aad23a0a089e5049913c34a6c254356c7cc996e45e2a50d432d114f13b089b8d12062b3a1a4d1a0b6f1cbf9688ad32b6
 DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719
-EBUILD seafile-client-7.0.10.ebuild 1209 BLAKE2B 2543c25fe156d1b337ba19bbbe5250a46a42e84a58384a1e0e02c23253da75fa98adab3d155089ef9b8edbee01e3a878e3646a2538c38758267d0a81df6608a2 SHA512 67ed286ace247497a574cac503617d20e18b01d3eb848f02dd78fecbaa7112456d0d2b2c2ab475a4ed26586d2f9b77a96c122262e8ef67d70a78c3e9d4fa76be
-EBUILD seafile-client-7.0.9-r1.ebuild 1195 BLAKE2B 4e5370331f2bfdc0007b62203fa167f7cfb3f35369d491fe0eac51375fe01b2714814e7b8a154f0110ea980da0bc487c8efbde77c45b75240a75002c5393bd33 SHA512 457f1bd1be04819ae66a0b097c3df4532497d84bf1ea7a3b903d830ba4e754f8a26959607a0717c0cc98cfed106b58a3905a21b03b91f32e9d7d6b7f94c1c840
 EBUILD seafile-client-8.0.1.ebuild 1209 BLAKE2B 8a6849cec8c10a120dc563c2ed582b287775c4ae0974574881d16cace8a94fd222cdb66d0c85fe69c50d21a75bbc37a5337685187123609f85c2a69fe9dfd161 SHA512 1495645504888704558c130ad0de57f6d2223fd3182b6829552f829c374b5e0ed0d8a5c0dcadce828775a388ffab6941f5c37d00b0725dfdf98ee2d6c8a2d995
-MISC metadata.xml 546 BLAKE2B 26e43bd101f64bdfae0d36dad1035e71f5a0ef31ea3bf5c5bc4b82a9208c892cb7241f50133fa969291e390bbdbd3b9473dc346c65f53d13d4483224e07484c8 SHA512 818714efd9851b566058ae6aba37a7860f0971f54e944f3386e14e9cd2053bca1d18d70ad653051a2c705af6807e5eea656d99eab52263055622c073384e9f83
+MISC metadata.xml 576 BLAKE2B 2174b676e97ee6712305427fc4ffa5d11007872d943b3fada1d05d67d3c83a218c385559e4c24cf12b318e4b1eb4192cae79a33c86329c5442caf72af86c932b SHA512 1e0f7a2c1f0ea6011b55ab213d1783677307468ceb44d594ecade76c36ccdfb97ee94feb3ad8d90b451a7349b48f8372a92ff8bd669d257ddbbab77d1a75e4dc
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
index 1c36e673cace..c37a654f03a0 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/seafile-client/seafile-client-7.0.10.ebuild b/net-misc/seafile-client/seafile-client-7.0.10.ebuild
deleted file mode 100644
index e869695c7c6f..000000000000
--- a/net-misc/seafile-client/seafile-client-7.0.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-libressl.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
deleted file mode 100644
index 649db5f1322d..000000000000
--- a/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index dd32cba8caca..ca97eaa60202 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,3 @@
-DIST seafile-7.0.10.tar.gz 707294 BLAKE2B 7f31d09480a7be09c957a79442bc0c952a4b3802fe17d660cb4ae7d157fcb656280751ed5033e399a705fc24c8b0a232e55e5f289792bdb69abec304c85d3473 SHA512 6c5870e75d52f4409fc6f7e3884d3e9208693997b25a6347980a8d164ec6a3348f4b3f5a532f11b9221822aa0ec9125b9d9af8ba7abc4d392cd5b5f602df9289
-DIST seafile-7.0.9.tar.gz 706859 BLAKE2B 2cbd12bfdda9c2cc13d38233a56d0d2f52ad04e03bd14c90c6ff086756fb7ab4f63319906030f9a5f4ec2625dbe23b2892c069f2b5d50c6997b23deaf2cb61d7 SHA512 4c87e7a4a6a4cef631cbfbeb1bde3c8c9e0915d5fe4597d5b3a4b8aa15e9650e97b51ee6a3b0bae4d235ec53149dca01aed7acd704da593c97da0a17e352a75d
 DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c
-EBUILD seafile-7.0.10.ebuild 1220 BLAKE2B bea54ae5efd2458d6e6bc3b14af8124f5f0eb4f4b572304e3370f173dd24eb887c11575b13de169ac11b6964fc80ffa6835ae4520672494a340e1edb69fa1dea SHA512 0b12111ee564f3184aae10dc320c4b29e51bea1dd0f8d271349c4aa8dcd30574beb6e8ed0a0ee957d4965eb852ef6d2a2ab1b74cbbd1d25bb5a0dcf15d0d2219
-EBUILD seafile-7.0.9.ebuild 1147 BLAKE2B 05afbc0c7b12038dfb7a4368210e6ea5e9744ca1ad3317e89d7925163e78f121d2802b22f16c6f922e3656189d27dd31147746eea63b691c2da3f72be6f03781 SHA512 8d2a026d4797df58eae5c825ab16378b4880e099bc8b9584ce299f1af46828c364e3008df32a62a105bbb1b40ddc91843f15aee58e748feed4871f5900fb4f3d
 EBUILD seafile-8.0.1.ebuild 1224 BLAKE2B be07871307b1a3f89c0fc0e239bb8239ae3d3e8f5d41fd314879e080d4252715c834d707284be94b2a6c2222f26a8895e7e2b20c80f8b7463f44268302fa72fe SHA512 7c1944095c297ffb35cfacd55b83c1b3e2d2930233112e3237e4517ef52b20c743e857ed64f769913e3893e308a804270dc1b6b6382f026fd051df99c4c77646
-MISC metadata.xml 447 BLAKE2B c90112a457648a9be79fa0a4858ba7451d86158070a1a4798ac88e3724eb3f39ddef039f904801d460ca607e9143ae7af58bf58a0024d8a6f513055f64fdee43 SHA512 d2af0ed21d876d212283140c20a3192c1d09c88e496c21c455a79962ad20547a9d32688ded73c6951388720e4abb9496afca405aee6ed5ac126f107bea3ee7eb
+MISC metadata.xml 477 BLAKE2B 6491e1ec0cb07251b6bbbeeff7e9b04ece552e19d922f7db44866e323f17b14839a165e5c6ac77ab0327daef328aa701e338f2c9620188bfab8833b9497bd187 SHA512 012355a4c6b2c9fff5f4d1d2202dfc377c718f6b8d96e5474b5650894ef6e5dd0a97a927174b0bd492bfb72af0323a4a8bdca3b9c928f01d664c1f196fb861df
diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml
index 306e8e51c578..98078dddb3e1 100644
--- a/net-misc/seafile/metadata.xml
+++ b/net-misc/seafile/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@retornaz.com</email>
 		<name>Quentin Retornaz</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/seafile/seafile-7.0.10.ebuild b/net-misc/seafile/seafile-7.0.10.ebuild
deleted file mode 100644
index efe304b3e70d..000000000000
--- a/net-misc/seafile/seafile-7.0.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7,8,9})
-
-WANT_AUTOMAKE=1.16
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent
-	dev-libs/jansson
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-libs/zlib
-	net-misc/curl
-	!libressl? ( dev-libs/openssl )
-	libressl? ( dev-libs/libressl )
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-7.0.9.ebuild b/net-misc/seafile/seafile-7.0.9.ebuild
deleted file mode 100644
index a2901735717d..000000000000
--- a/net-misc/seafile/seafile-7.0.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7,8,9})
-
-WANT_AUTOMAKE=1.16
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent
-	dev-libs/jansson
-	sys-libs/zlib
-	net-misc/curl
-	!libressl? ( dev-libs/openssl )
-	libressl? ( dev-libs/libressl )
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 7e7b8c7ddcb9..f4faaf2cece8 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,4 +1,4 @@
 DIST sipcalc-1.1.6.tar.gz 117628 BLAKE2B 6da2a64f63ac9a4a53a588f8d82cfca230ba0f97893d89310ea0d83a8d6cc6b6a4c53fa1dc7ed9ac20b6bd8cc39e479c3b5d35658c58069e561b55d841e3a3ee SHA512 9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e
 EBUILD sipcalc-1.1.6-r1.ebuild 430 BLAKE2B 25591bf6debb2e1789f220aee280e3acd5b7c29bf588a230b1da657a3403cd2eb989095da8d2d8b4ce4ebba306eefa41c3a02f68d569838e018c7557c1ce2997 SHA512 071827ab68fffb2b7077db0446112928e5fd786104cff39b848a0cfc8952d54a023687288d05b8bee6b8ee13a7664e78c0093ed03baf37d78c7a02e904a73602
 EBUILD sipcalc-1.1.6.ebuild 402 BLAKE2B 272048d2c85f633f5dbc0fb312ccd0f9f7ef0849e481037645b442a1fb2abb65197291bc369c9e49f23d95de5731dea30c647216741db71804072ff15b7c36c4 SHA512 3e414711f989835aad58ab3b50ff2be2fdeeba926e6ea7821d9b31efbede7dc64bc26e6936f7581a2fe6ef01cdfe1d48ef9db982123e415f6effbae751cadcec
-MISC metadata.xml 372 BLAKE2B 127c5ab93d8a19412aa11aeeb9616211463c1f29b3b5759fed91f8d60ccbabdbb3e12d3afe90b123375ee9bdab4667e3dacb061595d4df190a199211dbc18022 SHA512 45271bd20d458ce806462b3acc4772c524f8cf43aa2e3f9b7ead0ceeadc9102a68e6f37c884d5adb522e3a1551ff606e1d27c368f2c09c66429c21120fc72340
+MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/net-misc/sipcalc/metadata.xml b/net-misc/sipcalc/metadata.xml
index 78e1c2f9528e..84aeb359eebd 100644
--- a/net-misc/sipcalc/metadata.xml
+++ b/net-misc/sipcalc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
index eb44e0eebcd0..36bcb3641e65 100644
--- a/net-misc/sipp/Manifest
+++ b/net-misc/sipp/Manifest
@@ -3,4 +3,4 @@ DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e
 DIST sipp-3.6.1.tar.gz 744407 BLAKE2B a201ecce624c15c51a66c3cb5ac467522755085419c2980b1f76340e7ffca5996516f34d7e52776a8aa0a2170ca2b7301030ecb50272a1c0a8e86aaf18a6de16 SHA512 58504c56ca0c14363fafc5d0598fd93857ef33cc5856f579a225fd0e38238f7d2c409127a18a368e22355cc3912758d4dba07bac7eaa3e8a0d2943ea5fdec602
 EBUILD sipp-3.6.0.ebuild 960 BLAKE2B aff654d4ba7a2a4bf00b5151242e9fe57f711ac6fe67e2d7e6746955f4d55f2226b6181fc423f61ca115ac95228be64b232326d8d4c4a8950e5c601171cac430 SHA512 1a4585f9b910b5e67f2abf71409c09515af2713b0199456a34be6a23bee89a24fec66f6840790593bd29c980ca02f5fd613c5292c23604e7ae6e921d2fc57728
 EBUILD sipp-3.6.1.ebuild 1103 BLAKE2B f6ab8fea4e1b96626b5e80fcf8f8b8fce2a927d7585e2d12dfdbda47c9910301d9c994c02377e21ec7a489ac5a1802f0189ffc531adacb8460c5f5f045467d16 SHA512 7a6525943a713873a3602a818099255f682bd56193c186ffe2c62d275f406f59c726e07bd199260c5026faa5b68b5582647a9188b831b6ab17ed0c2a23484b6c
-MISC metadata.xml 456 BLAKE2B f7dff8c7cdc43d043f5a84c590e084a0ad39f973738a58a991f9971794c4ea904df0e95d47b7669ab0f76c193586aa8feea6b1414111d374af301dcd44ee055b SHA512 0268164af9c3e0e1558549021c47b9374f5f565996a730335d5ff7c8132f7e8bd2685c36db74dd9ab7be2029ddbb56250519b7b0bf85d54997d247a4bb26365a
+MISC metadata.xml 486 BLAKE2B a588a77cd42abd3dafdc5c55cfb528b7db56287ebc80d92a7d1644692c7eddfdae7ae1ca1e02dfdd053651784aa647c44d61db92f6e86ab41c195ac810565acf SHA512 db368e32b263b8f27a6a0f9c548ab05ee726ebc84b34df493ed58ddeba76985daea4d3fdb3efe8f3af0586aaa618cdd7fdf69e939cfde59a822f407cf99da2d1
diff --git a/net-misc/sipp/metadata.xml b/net-misc/sipp/metadata.xml
index 2308b2753fdf..7b404e91b292 100644
--- a/net-misc/sipp/metadata.xml
+++ b/net-misc/sipp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index a0d37e1eb96d..77019f46ebe0 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -8,4 +8,4 @@ AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
 EBUILD sitecopy-0.16.6-r1.ebuild 1978 BLAKE2B c7a74b61d04be2b0fab0607ff18ae3a3293c5114b0bef3cf6d1fa0500e88eb592b866087f29de2225829fb0ad8f8cb26828265fe9f0e47e647bb4c22b33d1d40 SHA512 6ad9aac3cf9a7352acf8109fbd2309e896e8f0e52adb1e50bcf235f61886e9db1ba770fe8c62c4894b494632b8989fa2a08be482b07743e6d846027bb9682e79
-MISC metadata.xml 612 BLAKE2B a17fd5ea60dc914fe857b32afdfe0782476d638106827e0c2ea22a5b7a365a6edc32eaca49d81089cfb19f5a7a239e63fb51653a7328bf94f2d8299ee8a14722 SHA512 04589e21fc83e206866825876bec4a4717708fff8b1e7192188f31ae08c278892ca286a362040cc21c0feb6041f413657ba9118b854f67cbe1ef3a9f8fd8696e
+MISC metadata.xml 611 BLAKE2B 21cb0b4d0687709cb87a56501499b24f9abebe14aa50699decd294f1e6bc37bc3cd93dec7fad8bc1e6803302a21083bb52c72f3f45fe04cacc800e9063230012 SHA512 107db295be58b2fd2d1a174d70d16f0d84beb1cbc675c32c5511df442764c56ed1c162fa0a86a5d2f37449b3efcfc06ad7d069d445823b2ff078feae7b1015b7
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index 4c6d13fbd699..4a8292d696af 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/metadata.xml
@@ -7,4 +7,3 @@
 		<flag name="webdav">Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index 6ca3ede511cd..9f011d0eddf3 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1,4 +1,3 @@
-AUX sks-1.1.6-unbundle-cryptokit.patch 2051 BLAKE2B 6d9f7e499ab281f3f233fce5e8d7b18fdc05dd5f596a26c0fd2a09a9c3db846db0785c31141948e048853a947b300983757be92a5970b14ae6d3a41a41d084a2 SHA512 35428b0a6052c45e4fe03fce6474c70c8c3b72e3f611fe86ed3b6055018bbc8d90174ad07748ad42bff1f748eb6a334e09d1c64be7cd23722aa76e8e21d546f4
 AUX sks-1.1.6_p20200624-QA-fixups.patch 1907 BLAKE2B ec655c5116f4d51df33ccff21dd7721be01e29e0822c5512ac8c033b215ecf3c92ea97e0f5aeae02343d5efbbba05c87c4ff28b994d0c3b7b8974210d9ca1984 SHA512 8b384f82df6348df31710de1e2c6fabc8979daee2bf6f83a87399f63adbbd4a40f7bb99247caba343b45eb30fdf2e4bbb3d769974003bda264c484f35b6c5974
 AUX sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch 2664 BLAKE2B 72395bae7dc4b6de6659de53ec766e04ba7707ee72fb910aea2ca36874b023920b5ad96391fa2ca6738224b23b334ec48d864d648e960d1ff049cd7c6ffea14c SHA512 6fa55c14a345b6d9d04cce3916d82e27aafe6d2a40d766269349ad952d0c5d07f858f7829656a6759618e38ac7c25e9d32426b86a197b4d8682dd8b371cb6088
 AUX sks-db.initd 520 BLAKE2B aff93d88445deb50506d778ca3e81d65a7376d637ab998f9f4d896060355fb6489990e9fe8ac916582ac18d25b582ea9407b1c9d0783ac799ecc8050de75e85d SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6
@@ -6,8 +5,6 @@ AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cb
 AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fdb79a8e75facbcf256dfdaff8ebf4f4f04885e0d0e52591cc0c3b1c0e0ed84fbd39c2f7ab8cd2bf4d SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c
 AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef
 AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660
-DIST sks-1.1.6.tgz 359499 BLAKE2B 6fb92aab93db8e19536db7df6a05bccc4c13a4859b8df8dba29da1bbfe854d65d5ed1b99d042f9f1509f07187810f25500513f2730a2c8fb579fdd4cd00c820c SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
 DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a
-EBUILD sks-1.1.6-r2.ebuild 3677 BLAKE2B 354a2b89fcab9050ba7551ecff8da54b5ab8011605e936157396cde5cda30855a341042a9654737b26722fba81964036be394b048d3360ad99a075c0b1145a39 SHA512 0b37213e24548699dec3874a7e2bb9185df65d701f67f13ec7584ecde220c32a95aa9b7012fe2dee2fcd8a7972541dd0c785a5b17daaca976c0ced61699e4c59
-EBUILD sks-1.1.6_p20200624.ebuild 3761 BLAKE2B 95d5e7e41d505c0ee5b8cc6fd555e4fe62bbce317c71ea71b44b5cd4ddcff1d9cf1db514a689aac4df42252edead5953eadb39dbc7513281dcbbf0a144e5b922 SHA512 5aeb17f34e1a52649c92565385d40ec892accf05f39e7fd0240c8ffa2f8d3eb6cc116bb5ab52448f3755280e25a86acb9f68c323255baa59c716ef9cda9b7bec
+EBUILD sks-1.1.6_p20200624.ebuild 3760 BLAKE2B 3c4d4c7643a2a946319d5cf0010157d9b8f891813fa0bee0e76d9449fe36f1e2350a103bdb935934022d2e42cdf76eab2eb28d0bebe54dc26f04d65697149e52 SHA512 83a815ef86e5922dd9527709977b0a6eed5641a7ad871c9c098052018de6cf4c09c8ddf51a907ec272f1f1cd01f5ae2b8905d09d6b1f35637a6bd9e37e9f339a
 MISC metadata.xml 335 BLAKE2B ed092594d2ac680f616f62ce0081eee39d6863327bf39b3789662e49c551f59c163734b895cf42fdd8e618fd263a2b631366247ea0785a9ee058c0814df4cde5 SHA512 83db3889b38a7b5f4668c6527ab4a5fdca2bb8ccecef27090bd170a5ae5a44540f7b801133130a3a9c12b9f2f0f8af7731f41326eeb1a68b3115007d243ad0ff
diff --git a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
deleted file mode 100644
index bf3d19010337..000000000000
--- a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Christoph Martin <christoph.martin@uni-mainz.de>
-Date: Fri, 6 May 2016 14:55:01 -0400
-Subject: use system cryptokit
-
-Use the system cryptokit instead of the one shipped in upstream source
----
- Makefile | 31 ++-----------------------------
- 1 file changed, 2 insertions(+), 29 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 15ab3ea..eb56758 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ WARNERR=-warn-error A
- endif
- 
- CAMLP4=-pp $(CAMLP4O)
--CAMLINCLUDE= -I lib -I bdb
-+CAMLINCLUDE= -I lib -I bdb -I +cryptokit
- COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
- OCAMLDEP=ocamldep $(CAMLP4)
- CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
-@@ -109,7 +109,7 @@ ALLOBJS=$(ALLOBJS.bc:.cmo=.cmx)
- 
- EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
- 
--LIBS.bc= lib/cryptokit.cma bdb/bdb.cma
-+LIBS.bc= bdb/bdb.cma
- LIBS=$(LIBS.bc:.cma=.cmxa)
- 
- VERSION := $(shell cat VERSION)
-@@ -280,32 +280,6 @@ prepared:
- 	touch prepared
- 
- 
--CKVER=cryptokit-1.7
--CKDIR=$(CKVER)/src
--
--$(CKVER)/README.txt:
--	tar xmvfz $(CKVER).tar.gz
--	patch -p 0 < $(CKVER)-sks.patch
--	patch -p 0 < $(CKVER)-sks-custom_compare.patch
--
--$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
--	cd $(CKDIR) && $(MAKE) all
--
--$(CKDIR)/cryptokit.cmxa: $(CKVER)/README.txt
--	cd $(CKDIR) && $(MAKE) allopt
--
--lib/cryptokit.cma: $(CKDIR)/cryptokit.cma $(CKDIR)/cryptokit.cmxa prepared
--	cp $(CKDIR)/cryptokit.cmi $(CKDIR)/cryptokit.cma \
--	   $(CKDIR)/cryptokit.mli lib
--	cp $(CKDIR)/libcryptokit.a lib
--	if test -f $(CKDIR)/dllcryptokit.so; then \
--	   cp $(CKDIR)/dllcryptokit.so lib; fi
--	if test -f $(CKDIR)/cryptokit.cmxa; then \
--	   cp $(CKDIR)/cryptokit.cmxa $(CKDIR)/cryptokit.cmx \
--	   $(CKDIR)/cryptokit.a lib; fi
--
--lib/cryptokit.cmxa: lib/cryptokit.cma
--
- ################################
- # old stuff
- ################################
-@@ -404,7 +378,6 @@ clean: mlclean
- 
- cleanall: clean bdbclean
- 	rm -f lib/*
--	rm -rf $(CKVER)
- 
- distclean: cleanall
- 	rm -rf Makefile.local
diff --git a/net-misc/sks/sks-1.1.6-r2.ebuild b/net-misc/sks/sks-1.1.6-r2.ebuild
deleted file mode 100644
index 0f55ebd8306c..000000000000
--- a/net-misc/sks/sks-1.1.6-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib user readme.gentoo-r1 systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="optimize test"
-RESTRICT="!test? ( test )"
-DOC_CONTENTS="To get sks running, first build the database,
-start the database, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-DEPEND=">=dev-lang/ocaml-4.0:=
-	dev-ml/findlib
-	dev-ml/camlp4
-	dev-ml/cryptokit:0/1.10
-	sys-libs/db:5.3"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch"
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
-		-e 's:-Werror-implicit-function-declaration::g' \
-		Makefile bdb/Makefile || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-	eapply_user
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}"/sks-db.service
-	systemd_dounit "${FILESDIR}"/sks-recon.service
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.6_p20200624.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild
index 7c9d13994f7d..bb6bc66f7636 100644
--- a/net-misc/sks/sks-1.1.6_p20200624.ebuild
+++ b/net-misc/sks/sks-1.1.6_p20200624.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-keyserver-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="optimize test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/sshrc/Manifest b/net-misc/sshrc/Manifest
index 86afc95e9567..105cbcbd0128 100644
--- a/net-misc/sshrc/Manifest
+++ b/net-misc/sshrc/Manifest
@@ -2,4 +2,4 @@ DIST sshrc-0.6.1.tar.gz 3701 BLAKE2B 36cdd0d4dcc80ea1884533f71e6090a6cb393dc1131
 DIST sshrc-0.6.2.tar.gz 4410 BLAKE2B 982ae3f0a6d3727699cc3cd7ddc20304ad1330b165f7450047f7d3b236ba7f3b297223d88c6ce8e00d0db97d3193c4547d7a10d51e8feb3bb639b6276865a8e8 SHA512 79dd964c5ed825b38aa775d35df6adc0857817c418fa4ae1971378f062536035bd66e4faa0fb84f66504f09c7e6368355f8c57036bea8d269b4d9084af95ddc4
 EBUILD sshrc-0.6.1.ebuild 508 BLAKE2B 382be296afff6d8c5e4c50d39fc24363afa4d77de0c40e0860d7771b5897a761332f9d6c7e0e1bc0371e3acc5b7c558d3a2212d182d3e80255beac209a82b046 SHA512 76035a2894f49e02366e587ba66e4c0ede86fbffc41a908106eca9b4b2777d1f7786df4e210573d7956d6c7c97b79e14bfb58f4d9b4a3bff571c4d4440c16ce5
 EBUILD sshrc-0.6.2.ebuild 503 BLAKE2B 678fe7cbac5f64e689bc21c83a79b757d38adf98eccbb8289d8c460012b99156d97eda76f4762d24248b37225b7dfd06c1e1f63fa79197a222d49d2aa87e2eef SHA512 aeed92acfc893a0e3fbd86fc616bb52f427c46d912cb58835bdbaa8b9f2e3ccac3b2ae133ea4fa9759ac6879e3d63e06b878a67c3a1a054df0a2c1e1588fa709
-MISC metadata.xml 686 BLAKE2B 1eb7107316b71bdec72f42a5eaa58aa7fbd9b568c1a887adbe7b031ed9b7b5a42bdfb43374a656118d49dc873d1437d49849faee59646d98593bb0efd87487e2 SHA512 00b1ff2c8d66e8beebb34f409782c43350c9fd6709df2e9300f010632324cba282fdf054d6ba32bd822aac0b2cba7364cb33069ba550a89ad09b9a7ad50f2658
+MISC metadata.xml 716 BLAKE2B f0f7b3faca4f541bc30e93a0e9833d719fc12cd7c1e670c7406007606db6f733aa64f39817f0d130216933f9f00c1a71784fcaf0ba1db44838bfbc0f69d5038b SHA512 7681bd1c60566700b72a64092e9059eba124b142b5b6b35bf06e921309364b63041284cd497ee186ad82e308e7b9ce6036ce343b41a6b16c7c2ac506e768de02
diff --git a/net-misc/sshrc/metadata.xml b/net-misc/sshrc/metadata.xml
index f8cee01d76fa..87e36bceb6ba 100644
--- a/net-misc/sshrc/metadata.xml
+++ b/net-misc/sshrc/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- bogus commit to force manifest regeneration #596462 -->
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>otakuto.gentoo@gmail.com</email>
 		<name>Tact Yoshida</name>
 	</maintainer>
@@ -10,7 +10,7 @@
 		<email>alicef@gentoo.org</email>
 		<name>Alice Ferrazzi</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index dc7b75e1d8a5..9c034f33d017 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -23,4 +23,4 @@ AUX rscriptd 453 BLAKE2B fb7d771ad0c29223d8a24196da05c05faf852291530fef644b60bf8
 AUX sgauth 462 BLAKE2B 9aeb1dfe4ce08f7626d6275813e8a3b2f3023ebc11b10841c7a6b01ff9110ed1193e3b2b367c7c1056c473d41f481c93ad25f4252f774fd7df5392af710255bd SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364
 DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75
 EBUILD stargazer-2.408-r1.ebuild 17361 BLAKE2B 57d5aecbe3289c9da5b214664d5cfb1547f04566bb3897cfb9efd08da9db60b0b1da093eaad2705309fad6e5c028ca806d250590c4a5ab047b4bc4735f0486df SHA512 7f68d15263b281b1e1e308d0a49d378532c5446c6f864fd994890913d13157f5cbd0da055a9a0ef24c37cffa96e8ae0e1bff44ad8bfd6ff23e0ab8d8133b6f12
-MISC metadata.xml 4163 BLAKE2B 8b56f499cd2f996cef1d15ff7f01dffaa6f76577ac437b7e040a5b8c49272b2eed8f680d6f2ed8c9e2512326971aa5e5a66b06f408341af7add6caa076c74e9f SHA512 60e4a6fc5304feb38c6ccc5fa3dc69df9c600289a65779d6d957b0252262a371c1cca02ae51f4538c7d4d006d0b03040a18a478011a31656562d2e36fce668fa
+MISC metadata.xml 4193 BLAKE2B db9820d399533519edf9c90f5c8acd3b6627b83ffbdecff58c3691779d940e481cebeff475edd045a924423c0947b00ee68c4725f26154604340c5004d30b0bc SHA512 51e64b32cc492a699a4acad7bf0044b1404be3df14d31ac8f6f239060ce312a908c392df47b86c899baf4e052345c55ac5a940e04f49dbf8dc0ed626bd00058c
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index 5d46368a3e84..1f91c8885843 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index f9171d826210..751678514066 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,12 +1,15 @@
 AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f3565063887d8ef01b8379539fb7bb6a70d00e80809a203dd3a263de6c96012f5357b7e059044f0ca34 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6
 AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4
 AUX stunnel-r1 1462 BLAKE2B 3acccb347c008ce5e8eb1cbd72d9125edd452ce5f607a819cffe72618a77c4a1d9b3702851e6e13cc236532b536144acf564cec3f1811563452dc02be0b8f992 SHA512 b5d33a9beb056bf6c9571296cb2a30e2aaa48b9841adb7ac3e40881f261f7ba999acf95ded81f2185d6a51ff8a21f79bdcbb0f3ab2e635c93279f33fc74f249f
+AUX stunnel-r2 1652 BLAKE2B 7a1ee4d81b51583fcc2138b09999bd8ee66f03305f477ea6929eab43384a153f088c5703818aa99fe6f0cca40f177328ea916d64d410ec37bf68638e443aac90 SHA512 cd4bc2bd38df267cac979587e36cee878d60ce4a7b1c11ba72323b6955d30ce927bacd125b2a9ef329ca1c69d882af68abaae1412cd5c12f727178a8f466e6fc
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa SHA512 278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
 DIST stunnel-5.56.tar.gz 981163 BLAKE2B eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b SHA512 db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877
+DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 EBUILD stunnel-5.50-r1.ebuild 2793 BLAKE2B 87996eed3f6e6fb325a600bc8e7cd34b9ba2cf0f979b9e6d0c91f771965358714ec8d0ba4f8b2cb143f3147f14253b706a16c9c05ece2a4ab0dd01806bad51e7 SHA512 3cb233f32648e69a92db145594597e774435851e71f5f3927351736ff0fc123b9bf0418a21501734e12a2999f518e8ec24bd0176d9bddb884bf5707539b036c5
 EBUILD stunnel-5.55.ebuild 2765 BLAKE2B f8a63ca21c9fff727e3721fd1ea3fc44e23a419aed884a663e2a2b7d3a14581a849d901a262add9db245de5908afe24a5494a018da3b084c63daa898cf9fd120 SHA512 a19a57aa6b5d025b75e01822400ab3db74799dbc1c39d326a2893505212045142ac309314fb98ce735796c021aea67d7676537fa917953dffe231bf396c0d4ea
 EBUILD stunnel-5.56-r1.ebuild 2893 BLAKE2B f4aee0f03135570820eaba95ee982e020448b46cbb4b0e43116c3db8511ebd67d7437f7e007323378ca4f9a785bbb6d46de2af289269cac117fed20020367efb SHA512 d6fadc2ec6e948e84a690587b198a7f66c1987d480261c4dce0cd074d7eeaec353969564ef1001e6ca179171121719b8635eeefb9e0d875db3b14ff00ecdb8c0
+EBUILD stunnel-5.58.ebuild 2934 BLAKE2B 21f16685547deb293812396babf174f67b473f52febb75b2e028d340ca2a49a858ebe357004ffde28b6bd7733a9a0f646ee79ba9866f577de4bccaf373f0ed5c SHA512 f27d3de9167d5aafbd4d57f57b81dace624adec109beebb4c010544ef2a95946edeab6bc463751e5ecd2943a91fb22ca954a2e5734b8a1e31b7eee1e17596d85
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/files/stunnel-r2 b/net-misc/stunnel/files/stunnel-r2
new file mode 100644
index 000000000000..abd42987d2b4
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-r2
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+SERVICENAME=${SVCNAME#*.}
+SERVICENAME=${SERVICENAME:-stunnel}
+STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf}
+
+depend() {
+    need net
+    before logger
+}
+
+get_config() {
+	if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then
+		eerror "You need to create ${STUNNEL_CONFIGFILE} first."
+		return 1
+	fi
+	CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	[ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}"
+	PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid}
+	SETUID=$(grep "^setuid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	SETUID=${SETUID:-stunnel}
+	SETGID=$(grep "^setgid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
+	SETGID=${SETGID:-stunnel}
+}
+
+start() {
+	get_config || return 1
+	checkpath -d -m 0775 -o root:stunnel /run/stunnel
+	if [ "$(dirname ${PIDFILE})" != "/run" ]; then
+		checkpath -d -m 0755 -o ${SETUID}:${SETGID} -q $(dirname ${PIDFILE})
+	fi
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \
+	                  --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS}
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	get_config || return 1
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \
+		--pidfile ${PIDFILE}
+	eend $? "Failed to stop ${SVCNAME}"
+}
+
+reload() {
+	get_config || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile ${PIDFILE} --name stunnel
+	eend $?
+}
diff --git a/net-misc/stunnel/stunnel-5.58.ebuild b/net-misc/stunnel/stunnel-5.58.ebuild
new file mode 100644
index 000000000000..2fcb74bea807
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	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
+
+	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/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 0ea4a6882155..4404e80596d5 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,3 +1,3 @@
 DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7
 EBUILD turbovnc-2.2.6.ebuild 2196 BLAKE2B 281b187822a2f5631891f86caa7c137110cc8747aebae4ef16f925afc19531dc9e877e7503f236b33022ea24744dbb34a0a8f61c1839917d6c8fce9b7feff4f0 SHA512 398a0b53b23d3ea0e136f7cd0ee79c509c58b4502e2e687f045c67b740871aac6c27e418b720efd767986c89c9afe68dd4bcc98b70960172112c0cb0381e1fef
-MISC metadata.xml 753 BLAKE2B 5b335db811d3f4ab42d3da0f98529351319dfa60e6f63058bccd11c8e2d498ef79f2edbb818eedebe51f0164eb937406310fd7fe6eb6084a66e1b237a9aa2598 SHA512 fe815b3a4289a2ddb0122b0a1191fffaaf38a22a6894b2a841a8a6fc7f9f19999fd912b4ed62591d0866921f36603687e36c2a7e43dc74ce538eb7562211eb37
+MISC metadata.xml 783 BLAKE2B 42852d9a5b9ff3d7b706c12c6bcfe9973566f9871b4a244a22c20985059dd66b2d2213a96709d149e521cc83fcefda35048a99f0bc6cab3565c4d054169e6176 SHA512 5da79e990ee61125ef3bbeebbbc514015c2458585ef2839748bd3d99e54f270f1b65f46bfc15e6213c6f68b5e4b56b1403e29894cb42d417b6e71cdf37da7eca
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
index f4404f5503c4..45d3a8df7ed1 100644
--- a/net-misc/turbovnc/metadata.xml
+++ b/net-misc/turbovnc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ceamac.paragon@gmail.com</email>
 		<name>Viorel Munteanu</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 4a450c130208..f791b7de4474 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,4 +1,4 @@
 AUX ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch 1008 BLAKE2B d518f3d2b5fc5fd9c6c15c39f755d05b04738dc8cd443b55019ba14d858a9796d2e73190a4956f1f13896d30e2cf49f203755c37d3ccfeb73b484da3421a37f1 SHA512 d9afe86a35ff50d9455bac90c0a0fbe830816c043c4580bff10e1a556ef3b0de92a697188b3efcf5f87ce8672015320b5795f393a6916e2d96619c465344c80b
 DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60
 EBUILD ubridge-0.9.18.ebuild 1089 BLAKE2B 26e9f3dde16372a76c98da998844c51dc1adb387c8fad068ac412e1ae37285f438f6b6b1e336bf46857bcb5fcd3c8e97bf0d3dfe4aa7fdb93f461c80f9af1e2f SHA512 d86fba30cb6d18dbc74b2da231c2c89df2b72d5614c3b11554d0d2f47db336a4e8d3cbf5223949df55f123b0392d3388935646149a76ff6beaa286e2c3a82dc3
-MISC metadata.xml 736 BLAKE2B d85c09cd99c67395cbfe18605835f109a5b2db0b29982eed9ed78895f6a754d17737aa947c1d07edf804395dd8e6776963424c07797ee77633782a8d78891f60 SHA512 c744f3033a7af7a876bf4b7d2800638d383c4b42ad07477fa52359f4230b7c99d097c8351ce6816010634fdb57a79314305b2133f25662662fdb7cdcc41ff553
+MISC metadata.xml 780 BLAKE2B f560ba09534996d5ac1f457bcb46678e84f27b921a051a02dac4f12c260b0927c55193921a25f75dbbca0f90f33bcbf24844d9edf4af7e5c12a07e5a5890cce4 SHA512 4f6fe0248a09377a40271416b2ff86c5e2f9cc41c45d3f5f270736fec7d7a5feb82a8f50b91a0fc7b6ea1930d1fe2e62b088dea852f302d3a1c21f2329e56735
diff --git a/net-misc/ubridge/metadata.xml b/net-misc/ubridge/metadata.xml
index 8a7b8ca468d1..a83d08fb0653 100644
--- a/net-misc/ubridge/metadata.xml
+++ b/net-misc/ubridge/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mmk@levelnine.at</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>g.djavadyan@gmail.com</email>
 		<name>Garri Djavadyan</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index 052b2e6805f1..f7b7243670fb 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -9,4 +9,4 @@ DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822
 DIST uftp-5.0.tar.gz 239651 BLAKE2B 8fcba8c0fc2db2dac941eaff7ebc7f2b25c53dd2e021985a2c1d93c29ce0afb2bd7da79bb5a20e0d45f703837ebb375d07825456edc217abe32ff51665a6e237 SHA512 f76e86559971facd806141fae88c6c47ec8361440044e429126391c6ac17f5f6ec0c79950816f9329cbb85a6be31d0700d18f599ef0b56f8df3ebe03fad4e27a
 EBUILD uftp-4.10.1.ebuild 1434 BLAKE2B 9f722def7df49faac8b15fd3cca37ff19764fc6c53bb66dfb913cb1711c0a8c5553d0b4436606fcc7d38a0f499fa247f37cd5bc56de604969915b7e276b4e81e SHA512 3e4d228f59647135a0c56654f5d54af7da10a48d69e356c6bb805397434b2bdd51ec62a68596003f6672cfb62aa75ea981cea2c642bb6b9f6aa7f7b862962e81
 EBUILD uftp-5.0.ebuild 1184 BLAKE2B 441fccf9dca907eb63e8fe657b70cb3acc07ebde59700b0858614750ae4ad3636a27bcea88fb73b626a728fcd79af271080e93389fecd2e8864a4c5909b9b72c SHA512 be6161ecb9df30d234ea7a707a61a142a0670cf2cb583b91ba340ee56507b1011e2f516281016eaecb1520ee38c20ea27a020e271dc2cab579e78f0a6a2a9ee0
-MISC metadata.xml 514 BLAKE2B 39860d6c126268a50b05481df28aa9119ac42b6e29e7c985229e4ba7cfb416eafe43e6991e230f716120296ff620e218308bf1412721b5d1c106953422b1e5d6 SHA512 ecdf0ed1d4f620a20a62ad70fd0f6d3ed1bf3313bdc09f1233d589b7e93bac532aef5e84846f4ec5021536f6da6b29b8419dede49acec4ff3b20ea28f6106f9b
+MISC metadata.xml 544 BLAKE2B 0c213c865c1e453b28b6cd7e24fc36948efa124168133a3e4025685a893c23a9b65a5cc7ac5c421075056d313e0f65f7cc90a9af1b4eb87ea6bea6374dc3525b SHA512 de01eb17a92961e95743dadd2a6325d35c02472471f34c2e7f5c4d00888431546e90686572ad069a926fa22c923dcfa94aab7f78eae658c7647e72915a1c3b8a
diff --git a/net-misc/uftp/metadata.xml b/net-misc/uftp/metadata.xml
index 95eaf34a95da..320168de1db6 100644
--- a/net-misc/uftp/metadata.xml
+++ b/net-misc/uftp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>azamat.hackimov@gmail.com</email>
 	<name>Azamat Hackimov</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index cbcc8b4307b0..fa2450f284ce 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,9 +5,9 @@ DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
-DIST unison-2.51.4_rc1.tar.gz 1374314 BLAKE2B 8b0218fa903ed8f1ceb3b489df8fbda5ba9fddfbe4b9440098d16dd298e15666bfc3722d1735069843511b7b39e8b49463c5b26b940ff770c7fcdfbd63eed1c2 SHA512 7b3fe2d09ff35ccdd68306d8fce6edd947489554c54afebe44d096210d2d8e58c6947386c2795c668070f5ba14a28547cee31d947d54ec90ed63927ad766c0bb
+DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
 EBUILD unison-2.48.15_p4-r2.ebuild 2998 BLAKE2B 3477822b9772652c245d6047e29ecdf70522f7668e9fb2e29e9556afdaf26dd96635983bf182ea5b2b56a0cd56b4bdae06ac0f2be399d1dd616d0e936fd346e5 SHA512 a6d3fb96a29e5156e7519f3f62a07622e1333b530afbfa1fa5cbf11524f5e9e8aa7df63af589d949bb904d8ab1fd6840d970fc27496f72033da2e9291d89c6c7
 EBUILD unison-2.51.3_p20201024.ebuild 2772 BLAKE2B 4e1973839a992c1af50332b8f84c6a7d5d03c1962af8f4a9c183551f1247bc1890d85aa7651d71a12f96134e63e367c00f79bd2917322c8cd278afbc852b4daa SHA512 086fd563d0f74661d710ab07ead1c73ea7702b4fe427336a5da39d8c4d3b4e2fcbf2f25fa7c65e0ddb895b13e0fca3dd381825b2fac41da8e32bf20c01569e2d
 EBUILD unison-2.51.3_p20201127.ebuild 2756 BLAKE2B 3699033422041cf1bf5e626637f9ede038f474884564b921269e6bb996d0b725a09c52ffee6f9246a29b11433b7ea16212f6559184f2da21c129f71f5759962e SHA512 8e0ff13147e90eb51a9c49ed3b6020a288838490c8e6ccc11b5f9a2e75511d872d1a5bd84bd4242a1e1a73fb0ed7e633bed149a4ad25e8d94cd0ee46e3f1dc61
-EBUILD unison-2.51.4_rc1.ebuild 2662 BLAKE2B 604940ff64c3da3eba3116f6ce593b50ed249280ad3a85ce6fa469e752277cd976b0e9ce584a7000cd6583f9c6425a666e9b37c627f581ffc2b7e94f483ee19a SHA512 22f11f7a31acef79d3dbe0e663f3178988faabcd23f83e0924a92d65f95ef60efe4a725283cbb819c9ffe0f674f53aff3bad1815148f140553197404d96e13e9
+EBUILD unison-2.51.4_rc2.ebuild 2651 BLAKE2B 15f2abf27b02e733927caa6730f7ab1d5bb5181bd5b43c6bda4adc883b6524b030b64be790578783d057c4c0e2840a5fc6683ee95c53fdb17efe6d217ffe0d58 SHA512 588a30ea2cb26ffcc14c4bc00aadafde4b3df7729518e98bb215c969519d5abb76ed1e0142fd9c9090f485b393cf162d46e7312b080b15d8840d357bdcf33345
 MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502
diff --git a/net-misc/unison/unison-2.51.4_rc1.ebuild b/net-misc/unison/unison-2.51.4_rc2.ebuild
index 7ce1abe5eaba..db9797ada80a 100644
--- a/net-misc/unison/unison-2.51.4_rc1.ebuild
+++ b/net-misc/unison/unison-2.51.4_rc2.ebuild
@@ -28,38 +28,38 @@ RDEPEND="gtk? ( dev-ml/lablgtk:2=
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_prepare() {
+	default
 	# https://github.com/bcpierce00/unison/issues/416
 	sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
 	# https://github.com/bcpierce00/unison/pull/415
 	sed -e "/myName/d" -i doc/docs.ml || die
-	default
 }
 
 src_compile() {
 	local myconf
 
 	if use threads; then
-		myconf="$myconf THREADS=true"
+		myconf+=( THREADS=true )
 	fi
 
 	if use debug; then
-		myconf="$myconf DEBUGGING=true"
+		myconf+=( DEBUGGING=true )
 	fi
 
 	if use gtk; then
-		myconf="$myconf UISTYLE=gtk2"
+		myconf+=( UISTYLE=gtk2 )
 	else
-		myconf="$myconf UISTYLE=text"
+		myconf+=( UISTYLE=text )
 	fi
 
-	use ocamlopt || myconf="$myconf NATIVE=false"
+	use ocamlopt || myconf+=( NATIVE=false )
 
 	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false docs
+		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs
 	fi
 
 	# Discard cflags as it will try to pass them to ocamlc...
-	emake $myconf CFLAGS="" src
+	emake "${myconf[@]}" CFLAGS="" src
 }
 
 src_test() {
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 60da5331c998..a860a8551313 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,11 +1,13 @@
 AUX vde-2.3.2-fix-inline-funcs-r1.patch 698 BLAKE2B 131ede6fed47cc8e9835604df3d34cd3c679ba717c81d67d292c9da17e1ce6a652412244f8e113a295bc17f08a525de22782dcb3b95aa8df05d768ec6765dc49 SHA512 2e7b16a7fd7cccbc79ac8f1c64e5e22399bbf219b37626b8c700d22e7f1d3b3250cb32cbfbd592743065bc68443b1b0443dedeb731f917de59a0e2568db6cbf4
 AUX vde-2.3.2-format-security.patch 547 BLAKE2B 757f0008ed24eea80225c9e194584f2320fda48ee21c2ce49a3a500ce0700b1475ece3c3826d2a2f42c0abfab20194214b73071a7422b9a86c9c47ac098844d2 SHA512 05d4ef0c8e45a30ccdf24ce65e7b1ed268f7e8da095d20d8743193eef1018bc11cf13996bde32231739d153af9e4b1828bd2073d862e06ac21e7e64b6945cbf4
 AUX vde-2.3.2-openssl-1.1.patch 2739 BLAKE2B 57062de9d624875255a4bb9a77408a356e8832163ce70bdee5f15884dfe641dcdd3f697d0d57340384f4380836c0867edb27b155249b3a54e4369639d72ca783 SHA512 fe7f549917267e025ccc6417b76af7409002a72d0a1e8133dcfde84ab44e954b9fef7c725bf102f7cdd3c1328da06dfe2fb0b309ea454e2094abdcf95b9cee3f
+AUX vde-2.3.2-slibtool-support.patch 1583 BLAKE2B 6667d3a5d158a72b43576e813405620b387e1ab3f12b8592411e64524a610a7422caa89c37d92565d4946ae6d629c632bc09324e4a3ee79dcd5bee25905eddc3 SHA512 c734000ee5481fb6297d8df39c573624486aafd91491d2fe9aa6f7e714a4dd76dab503f2218d9b67d90bbb89a6b0b6b0df57c685f01b43a2c7c59272d10dc15b
 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df
 AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r6.ebuild 1491 BLAKE2B 25089bade969f2bcde7f4c16e85cf049d84b21a21ee073bac1fcfcd504889c82cb15dcc17c4ecad53016733231d7a47cc501e3b5a57985d4bcda6798d9ee603f SHA512 66e5797b6da812bcf167f528fe2cb3a5291a86973f1571c5e1a0274327f29eadc0baa4b3086081e071555f9213c15a127043964c20c2bec07e5e72f835157a19
+EBUILD vde-2.3.2_p20191011-r1.ebuild 2253 BLAKE2B 70e765767c62982412cca9661897c475357d46effadafa6a27c98be8c6c00caa69bdb02639828cce31a6d5f95b05a814c43d5dcba8863d5d83522d5f9df36584 SHA512 1c4156310670d3a19c5b1835857bb226735a8f8d24a55a37d9e9d71f46a3cb5aa28ee1ccb90bdc77b197ff928768151cdd77355bf083b5ce5554f317b49dc56f
 EBUILD vde-2.3.2_p20191011.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
 EBUILD vde-9999.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
-MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6
+MISC metadata.xml 985 BLAKE2B 93cbf3b5a644fc2c4ea5e40c8a367ba9763968fc6f769df2f1b7114d07734786570cae38d42195deb628007e3d49b1d5a5b4a943cf7575da10ae10eea59e4e28 SHA512 cdbc3fffa569b4a7f5daf04b3fbdb7dbb57df6dfa100398b61e6373efe61924daa523ba2b75cd21556414e592a91c2813aa396290abad91eb2afa01f7e178a01
diff --git a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
new file mode 100644
index 000000000000..5eeb3a5c9026
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
@@ -0,0 +1,49 @@
+From d11d9dd8b370016a2d10ffd35c450c9f68e578a5 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 17 Mar 2021 15:14:45 -0700
+Subject: [PATCH] build: Only use -module for libraries.
+
+---
+ src/vde_l3/Makefile.am     | 9 +++++++--
+ src/vde_router/Makefile.am | 2 +-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/vde_l3/Makefile.am b/src/vde_l3/Makefile.am
+index 748cb78..855081c 100644
+--- a/src/vde_l3/Makefile.am
++++ b/src/vde_l3/Makefile.am
+@@ -1,7 +1,6 @@
+-
+ moddir = $(pkglibdir)/vde_l3
+ 
+-AM_LDFLAGS = -module -avoid-version -export-dynamic
++AM_LDFLAGS = -avoid-version -export-dynamic
+ AM_LIBTOOLFLAGS = --tag=disable-static
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+@@ -15,6 +14,12 @@ pfifo_la_SOURCES = pfifo.c  vde_buff.h
+ tbf_la_SOURCES = tbf.c  vde_buff.h
+ bfifo_la_SOURCES = bfifo.c  vde_buff.h
+ 
++vde_l3_lib_LDFLAGS = -module
++
++pfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++bfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++tbf_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++
+ pfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+ bfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+ tbf_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+diff --git a/src/vde_router/Makefile.am b/src/vde_router/Makefile.am
+index d872388..d055259 100644
+--- a/src/vde_router/Makefile.am
++++ b/src/vde_router/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ moddir = $(pkglibdir)/vde_router
+ 
+-AM_LDFLAGS = -module -avoid-version -export-dynamic
++AM_LDFLAGS = -avoid-version -export-dynamic
+ AM_LIBTOOLFLAGS = --tag=disable-static
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index f74a15637a8b..34884a027ada 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -5,7 +5,7 @@
     <email>NP-Hardass@gentoo.org</email>
     <name>NP-Hardass</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>mlspamcb@noci.work</email>
     <name>Nico Baggus</name>
   </maintainer>
@@ -13,7 +13,7 @@
     <email>jmbsvicetto@gentoo.org</email>
     <name>Jorge Manuel B. S. Vicetto</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
new file mode 100644
index 000000000000..142f3837ed9b
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
+	KEYWORDS=""
+elif [[ ${PV} = *_p* ]]; then
+	inherit autotools
+	MY_PN="vde-2"
+	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
+	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+	S="${WORKDIR}/${MY_PN}-${COMMIT}"
+else
+	MY_P="${PN}2-${PV}"
+	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
+HOMEPAGE="https://virtualsquare.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+#IUSE="pcap selinux ssl libressl static-libs"
+# upstream switched to wolfssl
+IUSE="pcap selinux static-libs"
+
+COMMON_DEPS="pcap? ( net-libs/libpcap )"
+# upstream switched to wolfssl
+#	ssl? (
+#		!libressl? ( dev-libs/openssl:0= )
+#		libressl? ( dev-libs/libressl:0= )
+#	)"
+DEPEND="${COMMON_DEPS}"
+RDEPEND="${COMMON_DEPS}
+	acct-group/qemu
+	selinux? ( sec-policy/selinux-vde )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-slibtool-support.patch"
+)
+
+# upstream switched to wolfssl
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then
+		eautoreconf
+	fi
+# upstream switched to wolfssl
+#	has_version ">=dev-libs/openssl-1.1.0" && \
+#		eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch"
+}
+
+src_configure() {
+	filter-flags -O0 -Os
+# upstream switched to wolfssl
+#		$(use_enable ssl cryptcab) \
+	econf \
+		--disable-python \
+		--disable-cryptcab \
+		$(use_enable pcap) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# https://github.com/virtualsquare/vde-2/issues/6
+	emake -j1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	newinitd "${FILESDIR}"/vde.init-r1 vde
+	newconfd "${FILESDIR}"/vde.conf-r1 vde
+}
+
+pkg_postinst() {
+	einfo "To start vde automatically add it to the default runlevel:"
+	einfo "# rc-update add vde default"
+	einfo "You need to setup tap0 in /etc/conf.d/net"
+	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
+}
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 157fb024ad35..42d695c18f40 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,10 +1,7 @@
-AUX wput-0.6-gentoo.diff 519 BLAKE2B 0a157c48c2f9764dc91c64783ec0c00e4a73bafccda6dc52be7f0784cd08386991452429202088521527d56a7fd808eca11936f1caae2d5a2ea88f237f2d28f8 SHA512 74a6902283f405649eb358781b8f9373b02ad2825fe5a425233b3e7a3a270bdaa4ac8f8ac76c4ace03c760505aa9eaa089b98706bc669bb9a536dedd5f0c94d7
 AUX wput-0.6-respectldflags.patch 290 BLAKE2B e2880dc839b0eb2052f6f71e32bcb7f37e7ea57b162b661e0a0da216f35cc878f564d05bac1e209a9e0d0851d81f53781002a6237ae8ca2fcf133edd5d79d017 SHA512 48d7f547b5d386f0d80cc3dd96293f112144416b3c59f69ce7827c6f96b303a26cbcd17094b8988ed816113a70e3181846c415de6939034ed5c5c69baab91113
 AUX wput-0.6.2-fno-common.patch 559 BLAKE2B 47937469ca44f74bdbfede40b43fe2900153747ba3fc3735e70b4f6949cb80adb4cb878a7cd9c046d19e05f68921f125b8dd1fdc41459227b5fdd30062e92536 SHA512 4c48dd943e9551d54a70b5c0e289f85af5f4b1518c238a2184e75e62f2fcc1869f681edc48dc40a1249acf98c228c7e79595bc70930b22c1720d82b3e39dc123
 AUX wput-0.6.2-respect-destdir.patch 694 BLAKE2B 4c4466c56b8ecd1e36036c3d33901b76dfe53f918f40f7b3bb34f5e58dc02b701ea7a1969b71d2fdf788b9478d4c5fcaecc7136848fcf2f9e06da09761e58b88 SHA512 a92ef8c35a94b4ff624cb9f1b548cba656151ae88708ed6da889c297e6d09cf161282de9f5324f41ac3d02f2aa0817e86b663637577ff519d780d587cb214c15
 AUX wput-fix-crash.patch 1974 BLAKE2B 229d5afe628682831d28ce1ccad0856883061749d863073dbcf58bd0a0cc435d84434d26068309154154e3c15922a0432ecc3fe01127d18767aea5b8d01a83b2 SHA512 2fa1e6793b9cda2695255196f30a5e615a013883efa5b10983c5bd38debf616bfb36ad2e61675700b32f32c0b4057ef7ec0c33c502fc3ead37e1547ecd944783
-DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
 DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
-EBUILD wput-0.6.1-r1.ebuild 789 BLAKE2B 2406e995700e541b7485b5f020a56bdbb58cedd9b928b1fb19405ac61efd63f5f3b5b190c91f405c90868d933f6d1b17c5c16c6eb39e3655785e2859fed51ef7 SHA512 91d85265dfac282b2c580e02b4a885312aca22eeb5059a204c7add9b658a061a53868937648dc4394bbbb4b9c403cdbb8f0c30568986ae5b2e42560d1aacfe03
 EBUILD wput-0.6.2.ebuild 839 BLAKE2B 117175f94dbde239cfaa0917a02194437e147f5b623204b124bd5e58b51b8dd02539aeb23e4b54bd38e9e3abf6157077bec49b8f477ec13ed7aa943966effcd2 SHA512 b230a872dd44ffc0da8af27fbbfacfe5a946bba1ae60c9acbeaec2f5d6a31233c08d6cf807114da3fe6cd12359615baa703b04f60e5eb389c5385193a02a9514
 MISC metadata.xml 239 BLAKE2B a1e387e39d693cc8b109174934b235238904f96fb78916bc73bd86e4b442443cc3b225409745025fb826de6086eb6356429527338c3aa1b42e92f1d886d7a094 SHA512 8326a50cb35d854df982951d3632c3b36672f9ba75f9644da70a4814a27ffda0c7c435e733c5be15210e2d2eb39ca781500ce55c1d409a1e81844fcecd859a10
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
deleted file mode 100644
index 7ddf0ba3ba19..000000000000
--- a/net-misc/wput/files/wput-0.6-gentoo.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15,8 +15,12 @@
- 
- install: all
- 	cd po && $(MAKE) $(MAKEDEFS) $@
--	install -m0755 wput $(bindir)
--	install -m0644 doc/wput.1.gz $(mandir)
-+
-+	install -d $(DESTDIR)/$(bindir)
-+	install -m0755 wput $(DESTDIR)/$(bindir)
-+	install -d $(DESTDIR)/$(mandir)
-+	install -m0644 doc/wput.1.gz $(DESTDIR)/$(mandir)
-+	
- 	@echo "----------------"
- 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
- 	@echo "Further documentation is located in the doc/USAGE.* files."
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
deleted file mode 100644
index f45089a463ee..000000000000
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tiny program like wget to upload files/whole directories via FTP"
-HOMEPAGE="http://wput.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug nls ssl"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6-gentoo.diff"
-	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
-	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
-)
-
-DOCS=( ChangeLog INSTALL TODO )
-
-src_configure() {
-	local myconf="--enable-g-switch=no"
-	use debug && myconf="--enable-memdbg=yes"
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl) \
-		"${myconf}"
-}
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index 54e69a64a636..2eb70bf3e28b 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.gh.tar.gz 29740 BLAKE2B bf0aadcd4c85351c9deb4908eaeef80536d4ee123b194deef6959ff85f05005666de71c71112cc9c0083a0c5f996cb173a957c52bacade3b23ef0908d341882d SHA512 293c0bc623400d3359a920eca491930daa110685936cfcaf9eea07e439fc29de64413f4df4a18523cd8fdfce44794c55d7e3abafb904e8e90891b22d38f01a2f
 EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 955 BLAKE2B 80889dcc1f3b093adbf72be1943842d9fddfdffeb4c123004b164bd836c78ff6c2f86841bffd76c024b710cf76b90f734fb3f0b7eac9411d10b4989223af94d7 SHA512 126380abdb294d624ae126f8b94efff33a34f462f09adf6c5d53aed53679441e791ff689e2d3f0d51bdfc1c43fe2cbce29ef792c90c63c8116ef38f4fee63f2a
-MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
+MISC metadata.xml 703 BLAKE2B 4e1fd1ec352aa0f3c5c401e01ae97f47c80addb070c30d6f2ae2dceec58dfcce84469c790ea502e8e8ea852e8c63ae4718149f21ce06705583ab88756c5de5be SHA512 051cb93e901f18fde594f768b7f81af5402dd28966c1efe4e6a4ed3e60504815e1a2c9c3cfc88332fdc841068d3944ce4d785e5415714e9760fa7e6cead79f5d
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
index 344661c689f9..b589f7248c5c 100644
--- a/net-misc/x11-ssh-askpass/metadata.xml
+++ b/net-misc/x11-ssh-askpass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 9f48fde64006..1c75b19f239d 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -2,4 +2,4 @@ DIST you-get-0.4.1432.tar.gz 149854 BLAKE2B 227fc950dfdfdbcf899a06db37e0b4e9060e
 DIST you-get-0.4.1500.tar.gz 157365 BLAKE2B 4b55a6950c3134792807eedc6e7ba47cae68e909fd29b34d59c289761828814df07bebb8bfe12f7ff0a42e32d0e6cecd770c152ca79ad199ce19f464bdf66ed9 SHA512 133977bfc24b4bd1abd50fcc252d9d75fe166ebe1c02897d0b6720f479a6f9f6368c84d8e9beba2d0c1dedff7a632c67062ee61098f07e5f5ed27c827fbea73a
 EBUILD you-get-0.4.1432.ebuild 522 BLAKE2B bc0ebe9d6f4ee322866b53646416a619df32b821cd41ae079ebd1c2908d15e32b09b5d0fa53366aad84b3572805ef81371c773a4633969bb483bbc10a5b72080 SHA512 00e8bd8d8af3c4dc371e271d92c3260d1dbb7f6c4a5fd6e6767459f10b668b8a0b2a8914f15379bc0a98ebf656dceeaf0e0babd79afc488e11911d58a924aaec
 EBUILD you-get-0.4.1500.ebuild 513 BLAKE2B c6d455aacb337efc0856dc54aaf5ffb85889d7f2e50ce02ce7860566559eafcab2a4c57433822d006a957e6c075f9ca08918f1e1649abf1f79f4fba2ecfb800b SHA512 7aeab9d0eb92bd90ab3b6096d294fe27c43e43924edf350e6704eeea58b1590af236638df2c35a7ed4c24b264ff72602dfee069da822aff5c52335b24f4d5346
-MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
+MISC metadata.xml 330 BLAKE2B 8eb53ce51d204266891fc05de500db3eab2f9db0078f99ad42ea44c76922239ed93a211ebf489ad7b01c6ac8ce11e1b535d8bec14a8489caf0355d294dc49e4a SHA512 f00ef67900d38db89f07d57a78d697c61368e8c475025eec4a647b32ce5b9cab54ccce7bcb8fc7b6500c9a3d4cb8cb183b423021aa4332250ea16e9a6777652c
diff --git a/net-misc/you-get/metadata.xml b/net-misc/you-get/metadata.xml
index e537d4c521df..822511e9f314 100644
--- a/net-misc/you-get/metadata.xml
+++ b/net-misc/you-get/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 5802417f87b9..01b62a0842d8 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,6 @@
-DIST youtube-dl-2021.02.22.tar.gz 3293733 BLAKE2B 83c3d53624a5e2dd1e901fbdbf90e95dc43c632c8bb263e25121c7a68beffe495e481c52d35b822a82a885eb4c4836c1567fd174ac57cedbc18bbb9768f43dc0 SHA512 eaecddf40759777c00abc1b456d8f55dd2ef242a8445970dd655a21dd148459c2c538a4b04fafddbdd295911a96e432a926c5f26e5a29c993fb3bc10f0ca1b9b
-DIST youtube-dl-2021.03.02.tar.gz 3302162 BLAKE2B c1ccc5822061f0d815ada19827cada576817acd1ec7d18410a021fc599b7ebd456a4d913475b7649eae8c75d757860d5bb1a76a51be740ba880746ff585700e4 SHA512 1318434c009a9eb41231bb7897b16fd72fde5d3165f6a24ff97031ed89b4d6408520242c71270f12b4f55dfa97ca48d42c6f167ad036eca74241e61cb950c298
 DIST youtube-dl-2021.03.03.tar.gz 3303114 BLAKE2B f63f2aedb6494b22156df08b5aaa2c4438614fd99a7e2d45baaa754c71a278a2c22051086f578f54b4cfa6384aaf5e08e61d42b8023a754805a65e6b6a79ea58 SHA512 0a554ee6805ceaa1c68eab83be3bd6046bc56a26658c705e231f907c2970cdeb441e0ae57d5013385810b5bbee7e4de3ac7f6df36c3eef76a6fa9c5424b921a2
-EBUILD youtube-dl-2021.02.22.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
-EBUILD youtube-dl-2021.03.02.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
-EBUILD youtube-dl-2021.03.03.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
+DIST youtube-dl-2021.03.14.tar.gz 3306486 BLAKE2B 6c5705319e405e4bb098c72b696d41ba655f6e38884012b00da0a5f66a68ac49e34b1906cf22c5444ba62aed4f74d93517b81471b9ddebdc1ee72b3ae190a3a9 SHA512 12f08eaa8a4ba3598ab9caa1c313982e62168a4e4afa3f613f7dee0efef3bcfee701ffd525f1dd1ba1da66aa71bcfd8bed91fa64a8c7473aca6b9e6a09282a70
+EBUILD youtube-dl-2021.03.03.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
+EBUILD youtube-dl-2021.03.14.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild b/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild
deleted file mode 100644
index d787a3f3be53..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
index 9b024e43dbba..d787a3f3be53 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2021.03.02.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild
index 9b024e43dbba..9b024e43dbba 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.03.02.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index ee7f584878df..4bfb4fa01fcb 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,13 +1,8 @@
 AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a
-AUX zerotier-1.4.6-fixup-neon-support.patch 2667 BLAKE2B 39feb92294b2221fa61fbfe93c894bad4218528161854f74d5b5e9c301aef86b9f5a84de567d5050463d323a309179b4efb8e95eb09b22424c4ecfcc065a3da6 SHA512 f032b95f485ae264577f4c7f579a9f4e9ab4a82a5c806c6dc9bd37fb4262d60d98088a19b27a545893d1deedbefb7f1ffdeb52ac102d0b3cfbb82c46b3abca9a
 AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
-DIST zerotier-1.4.6.tar.gz 13055818 BLAKE2B 46003d9c3ad09e30dbefaa441422ed4570bdbdfb99f2f24fb82246f9e970501d38d96c19dc9771a1d0d30bc49bd8be2b79ebd2e5c8bd85e88b738b29f0a1dcc3 SHA512 72f00602f67190d03ac0c8caa6b79e7f346b10745bdf772c68f77a3a940cdd718d05ec642bc862a6235aab9bd3bfefb0c57571f358ae55f38761f45500f0f189
-DIST zerotier-1.6.2.tar.gz 16020599 BLAKE2B 91da6c85f8d3dfd993a9aea9cd2a8b33e560d5475413fde8bef0a69df7d89503a66b1967ac336bd2213f6ffc35e452f665d37ceb8d9ae53cf5e5d4d352775e74 SHA512 8abb31ba8aed4c187a4e88ffe6f536ed7d0fe2421f89ae706eef620cc9508372a089ce9e9579df372e21b6dab271bea91e2d12b424dd85ece8c19885a6caa643
 DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0
-EBUILD zerotier-1.4.6.ebuild 1802 BLAKE2B 3fa9f53c3568d53c528a20610d58400e3d51ec02d6b6c3781350fddcd133dc8c30aae6f74d4b6a43e06708bc3b71281b60a1c0958b2e1390d0caeb62d5c04d23 SHA512 712437b743c70d5941f72206c0ab9025b85809453ddf5c33e8d18ace4a9771f3c5c861b491758cc2f2b8ee455a50738f7d0b16ac3d87784998ba966f8d56fbb1
-EBUILD zerotier-1.6.2.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f
 EBUILD zerotier-1.6.3.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f
-MISC metadata.xml 482 BLAKE2B 8aaebdfd4d9a6454f3a426fb472a12e50f64e7cc356795b10175f9a3e3bfc5a181f503d609bb431b9619e73675ffa6e24059452696cdbe6f2d4aeff5f3a8cd11 SHA512 54bdb668f32bc05faee9dca6f29c3648127abe60c5338a4f1cdb71b3812e33314f1e6b691801caeb3fc3e5dfaa8ccc89b9f73469eb964321fc9f983ec669dadc
+MISC metadata.xml 482 BLAKE2B 20cfeda377f02fe4f2f86119bf088ad0b7e4d5384b482988ec440991b91e6cfd4192a7404c38d53740b545f1d084c9c248a9ada603cace307815bb6fd6de5469 SHA512 f3ab7f82955ef27184446a8e657e9b6f52d473ccc7f3dc74f7945d4840c77c75d1b1f12162ae9fc74bbec067baeccc75f79fab98638682bb107911afdfe069d9
diff --git a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch
deleted file mode 100644
index a6ca7f7ca382..000000000000
--- a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/make-linux.mk	2019-09-27 21:35:39.000000000 -0700
-+++ b/make-linux.mk	2019-09-27 21:36:01.000000000 -0700
-@@ -118,6 +118,7 @@
- # Determine system build architecture from compiler target
- CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
- ZT_ARCHITECTURE=999
-+ZT_DISABLE_NEON?=
- ifeq ($(CC_MACH),x86_64)
- 	ZT_ARCHITECTURE=2
- 	ZT_USE_X64_ASM_SALSA=1
-@@ -158,57 +159,57 @@
- ifeq ($(CC_MACH),arm)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armel)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armhf)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv6)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6l)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6zk)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6kz)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv7)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7a)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7l)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7hl)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),arm64)
- 	ZT_ARCHITECTURE=4
-@@ -268,10 +269,13 @@
- 		override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- 		override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
--	else
--		override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
--		override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
-+	endif
-+	ifeq ($(ZT_DISABLE_NEON),1)
-+		override CFLAGS+=-mno-unaligned-access -marm -fexceptions
-+		override CXXFLAGS+=-mno-unaligned-access -marm -fexceptions
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
-+	else
-+		ZT_USE_ARM32_NEON_ASM_CRYPTO=1
- 	endif
- endif
- 
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index e422a4abe39a..f7fa88e2deea 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-misc/zerotier/zerotier-1.4.6.ebuild b/net-misc/zerotier/zerotier-1.4.6.ebuild
deleted file mode 100644
index 49c7f7ed5ff9..000000000000
--- a/net-misc/zerotier/zerotier-1.4.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm systemd toolchain-funcs
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="clang neon"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	dev-libs/json-glib
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	clang? ( >=sys-devel/clang-6:* )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-respect-ldflags.patch"
-	"${FILESDIR}/${P}-add-armv7a-support.patch"
-	"${FILESDIR}/${P}-fixup-neon-support.patch" )
-
-DOCS=( README.md AUTHORS.md )
-
-LLVM_MAX_SLOT=9
-
-llvm_check_deps() {
-	if use clang ; then
-		if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-			ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		einfo "Will use LLVM slot ${LLVM_SLOT}!"
-	fi
-}
-
-pkg_setup() {
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	use neon || export ZT_DISABLE_NEON=1
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="${CXX}" STRIP=: one
-}
-
-src_test() {
-	emake selftest
-	./zerotier-selftest || die
-}
-
-src_install() {
-	default
-	# remove pre-zipped man pages
-	rm "${ED}"/usr/share/man/{man1,man8}/* || die
-
-	newinitd "${FILESDIR}/${PN}".init "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}".service
-	doman doc/zerotier-{cli.1,idtool.1,one.8}
-}
diff --git a/net-misc/zerotier/zerotier-1.6.2.ebuild b/net-misc/zerotier/zerotier-1.6.2.ebuild
deleted file mode 100644
index fdfc4d61007e..000000000000
--- a/net-misc/zerotier/zerotier-1.6.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm systemd toolchain-funcs
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="clang neon"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	dev-libs/json-glib
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	clang? ( >=sys-devel/clang-6:* )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch"
-	"${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch"
-)
-
-DOCS=( README.md AUTHORS.md )
-
-LLVM_MAX_SLOT=11
-
-llvm_check_deps() {
-	if use clang ; then
-		if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-			ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		einfo "Will use LLVM slot ${LLVM_SLOT}!"
-	fi
-}
-
-pkg_setup() {
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	use neon || export ZT_DISABLE_NEON=1
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="${CXX}" STRIP=: one
-}
-
-src_test() {
-	emake selftest
-	./zerotier-selftest || die
-}
-
-src_install() {
-	default
-	# remove pre-zipped man pages
-	rm "${ED}"/usr/share/man/{man1,man8}/* || die
-
-	newinitd "${FILESDIR}/${PN}".init-r1 "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}".service
-	doman doc/zerotier-{cli.1,idtool.1,one.8}
-}