gentoo resync : 12.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
commit: 7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree: 56fae051db521b8fce8014cbc8b11484885b14b3 /net-misc
parent: 6d691ad5b6239929063441bbd14c489e92e7396e (diff)
98 files changed, 1238 insertions, 686 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a0901b3134b7..17dca0abcb00 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 e86f44326ff9..5a991ae178bd 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,7 +5,9 @@ AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
+DIST apt-cacher-ng_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
 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.2_p1.ebuild
new file mode 100644
index 000000000000..ce6af89f9fa7
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.2_p1.ebuild
@@ -0,0 +1,97 @@
+# 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 7efb7f925e54..5111f32a7b99 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 958 BLAKE2B a0bb142f5343679cc734d2154054fae0a93faf3cba74dd6a0939d37b1acfd7dc0c41b1aa22bc7a45e408b7c046d31d9c29ad9d5f2869d7e6c5388c10bafb99f6 SHA512 0665a156659c7b7199f06cca2a2d9498ae1230f65e850b92b2d8efd56550671c6f1932beae53b27ddd145133dae067e0fc0dfcfd264ab251de17f2bda7e8d3bf
+MISC metadata.xml 982 BLAKE2B 7533ddfd8e1b53e146396e17afd9820007c39d11c502332690bfd722fab809c4294dc1b027308eecd315e850f58285aee0bdaee75430179b072a70644efc6a22 SHA512 8930691058fca9da7e8ea2dab459344904767b7369703b6e382601a9995567d850febcb20c1e527e5a5d4c624f00ff128f55d034d878e621c6e488fec20762ab
diff --git a/net-misc/asterisk-core-sounds/metadata.xml b/net-misc/asterisk-core-sounds/metadata.xml
index adf38368d01c..f280e1412562 100644
--- a/net-misc/asterisk-core-sounds/metadata.xml
+++ b/net-misc/asterisk-core-sounds/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="alaw">Install the sounds files for the alaw codec.</flag>
 		<flag name="g722">Install the sounds files for the g722 codec.</flag>
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index fd30d2e8e491..261e647f6214 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 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
+MISC metadata.xml 1052 BLAKE2B 687ef6900492c38b560c1b5d0b933c68f4ca5c19e6550e4eb4f4e2f5f244a33bbddf09458d6c39cb73801abce99bc8ab8dd0e6e41ab101843543c870e3b481e8 SHA512 907a2f028e59349bbcd6c2f41ae67d5bee8b72d73ab0ad0ee2b47eabd6830cb62c43bdf80548612c9b34bcf220d9a7998edd847c0ffa1edcdac2b36430eadc1f
diff --git a/net-misc/asterisk-extra-sounds/metadata.xml b/net-misc/asterisk-extra-sounds/metadata.xml
index 71b32add35e7..f15e5130f0ad 100644
--- a/net-misc/asterisk-extra-sounds/metadata.xml
+++ b/net-misc/asterisk-extra-sounds/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="alaw">Install the sounds files for the alaw codec.</flag>
 		<flag name="g722">Install the sounds files for the g722 codec.</flag>
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index ba6da0a783f4..215ef3ef6e8b 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 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
+MISC metadata.xml 1052 BLAKE2B 687ef6900492c38b560c1b5d0b933c68f4ca5c19e6550e4eb4f4e2f5f244a33bbddf09458d6c39cb73801abce99bc8ab8dd0e6e41ab101843543c870e3b481e8 SHA512 907a2f028e59349bbcd6c2f41ae67d5bee8b72d73ab0ad0ee2b47eabd6830cb62c43bdf80548612c9b34bcf220d9a7998edd847c0ffa1edcdac2b36430eadc1f
diff --git a/net-misc/asterisk-moh-opsound/metadata.xml b/net-misc/asterisk-moh-opsound/metadata.xml
index 71b32add35e7..f15e5130f0ad 100644
--- a/net-misc/asterisk-moh-opsound/metadata.xml
+++ b/net-misc/asterisk-moh-opsound/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="alaw">Install the sounds files for the alaw codec.</flag>
 		<flag name="g722">Install the sounds files for the g722 codec.</flag>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4fb605c3ef0d..a4d0c5c43255 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -3,6 +3,7 @@ AUX asterisk-13.18.1-r2-autoconf-2.70.patch 535 BLAKE2B 06f880515f27166a75738bde
 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-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-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
@@ -10,7 +11,9 @@ AUX asterisk.tmpfiles2.conf 43 BLAKE2B b459348ce0bf46a915b0a64a4961d753bb9610486
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
 DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f
-DIST asterisk-16.15.1.tar.gz 27796648 BLAKE2B 4daa0b121a789d0384d81c3b56951bfd7c919cae3de1d7eaa0ba50f01f428c1d56555838f9ce2b3fe24309b131310c59622ed114cd4f76ac7b06896ceb3da6fc SHA512 5ce6e1301825b142859087ba237b2c1b3e0687cac3fac28f35b043727cac26583697534b2726a65510e50ef27cf373b0c4cef60042f789aa6b875448a5f08914
-EBUILD asterisk-13.38.1-r2.ebuild 9702 BLAKE2B 81ba7afb1f99975315263405f52cd3e71f46d21862bf2614e708f8d1af37e29b8d6b8204dd36e340f1450d486f16b56262002829512cee47ff375161246aa5ad SHA512 f3b80252833265b52676f6e4ade92f5fa32de79f9cac7044a8bc8dc859f94b8dc605954508ccb04a26848d50cd5e874b402c157c9495c33e38472eaff60232bc
-EBUILD asterisk-16.15.1-r2.ebuild 10017 BLAKE2B 03d7e56adc3cdc9a714cfa4c3a4ea5a65d2b46e2f3d33a155b4cd2b4982dec8a0ba3d87f01baed7d3d3523278b4db78aa689bff9945ee3373c4e7a14b2bbb19e SHA512 40ed74f7949862d7cdd98ed7088ee5ad10159bd8ce706ccd8c3f3ac5f0ae7f253a62d0cc67be0fcaef17169ef1d2e2f3edef504d74cd0298bc76387f5a1f9279
+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
diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
index 628b768ef5e5..00fb2c78dce3 100644
--- a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} )
 
-inherit autotools linux-info lua-single systemd toolchain-funcs
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="https://www.asterisk.org/"
@@ -275,7 +275,7 @@ src_install() {
 	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
 
 	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
 	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
 
 	# Reset diropts else dodoc uses it for doc installations.
diff --git a/net-misc/asterisk/asterisk-13.38.2.ebuild b/net-misc/asterisk/asterisk-13.38.2.ebuild
new file mode 100644
index 000000000000..84f0aec402f7
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.38.2.ebuild
@@ -0,0 +1,312 @@
+# 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 vorbis xmpp"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
+	"${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch"
+	"${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch"
+	"${FILESDIR}/asterisk-13.18.1-r2-autoconf-2.70.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/ncurses:0=
+	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/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	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="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+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
+
+	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 NOISE_BUILD=yes 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 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_THREADS BETTER_BACKTRACES; do
+			_menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	emake DESTDIR="${D}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
+	chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed"
+	chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed"
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	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 &&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
+}
diff --git a/net-misc/asterisk/asterisk-16.15.1-r2.ebuild b/net-misc/asterisk/asterisk-16.16.2.ebuild
index f5718280906d..6a7ee37f0807 100644
--- a/net-misc/asterisk/asterisk-16.15.1-r2.ebuild
+++ b/net-misc/asterisk/asterisk-16.16.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} )
 
-inherit autotools linux-info lua-single systemd toolchain-funcs
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="https://www.asterisk.org/"
@@ -28,9 +28,7 @@ REQUIRED_USE="gtalk? ( xmpp )
 "
 
 PATCHES=(
-	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch"
-	"${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch"
+	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
 	"${FILESDIR}/asterisk-16.15.1-r2-autoconf-2.70.patch"
 )
 
@@ -284,7 +282,7 @@ src_install() {
 	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
 
 	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
 	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
 
 	# Reset diropts else dodoc uses it for doc installations.
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
new file mode 100644
index 000000000000..63b2896bb097
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
@@ -0,0 +1,11 @@
+--- asterisk-16.16.2/Makefile.o	2021-03-09 00:03:19.794028722 +0200
++++ asterisk-16.16.2/Makefile	2021-03-09 00:03:32.434013494 +0200
+@@ -556,7 +556,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)" \
+ 	"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
+ 	"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
+ 	"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 29690ccf0a39..33d958be7f8c 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 1055 BLAKE2B a3b6a513f8cfd307820fab001a37ab390bd1d976787b111e86f0b5963ace3ab0b641474aaf5ae125b7a946e5d307650051e23957c3f952fb7785e3d85561def6 SHA512 642846b3e1f15444f9818306653f27f6b3296f3f4aff4390b0fcd0388f2a21856185a0c77664952eee3f3838c90780ef8e47cd49da75361d6f4cecf3becf0543
+EBUILD cadaver-0.23.3.ebuild 1078 BLAKE2B ce8ac416a39a65d3c543503c7b079b56220c143430cba5263202aa9883f6992a6f0dcc7fc2a998f387bb96e8af6d5460656e99694c0ff8ee11d716679084c162 SHA512 8b664a3c3a11a2a1ad5edeb217ce46c14ea691a3499613e0de6b825b76e1f8c2b78dc185515024ad0eb016eab1b1a0def7d6a575e4b7c891f019c305f3eeed29
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 3c9576593434..a9288a4027bc 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -33,6 +33,7 @@ src_prepare() {
 	sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed"
 	cp "${EPREFIX}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed"
 
+	config_rpath_update .
 	AT_M4DIR="m4 m4/neon" eautoreconf
 }
 
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 6b96caea360c..d3924e3c7a54 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -4,7 +4,7 @@ AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50
 AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
-EBUILD chrony-4.0-r1.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee
+EBUILD chrony-4.0-r1.ebuild 5215 BLAKE2B 42b24a96d932a28a481dfeb8c27425e100b7b305cf55c65ba81359ff5dd301b7cc541dc0f999bb8e7fce3836788b00adb7c44840deab5541b570d4dd3610ae63 SHA512 d1befbff09f1d8a588997f85bfdd1ad726f27ccd64cc0821a9b3b1cb97355e068af8a291e05a969ad47de792101466cab2f8af9f6bb5fcc6a98caeae804b6efa
 EBUILD chrony-4.0.ebuild 4324 BLAKE2B c6e4eef917c334681564f974323f503d088fe0aeac43e5c88f302f5e6f29fdb0d45fd2862d768621a23110deb53e907597efb44d361a794b2e37181ae3c19208 SHA512 be89d10a76643ad8c46d005f3ddc49dc60485a7b5954445a7ddc4468c142d31100465c0222231da43f338f621fc11de2bd20ecc42bde43424b85b48f01b84d1f
 EBUILD chrony-9999.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee
 MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a
diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild
index 7e6fadddffaa..1f2f0ba26279 100644
--- a/net-misc/chrony/chrony-4.0-r1.ebuild
+++ b/net-misc/chrony/chrony-4.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 else
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 fi
 
 S="${WORKDIR}/${P/_/-}"
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 01bb6e4cb8b4..3a9b45e3ca8d 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,7 +1,7 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764
-EBUILD connman-1.39-r1.ebuild 2751 BLAKE2B 49d7e875a9ae05a837c328296539b0e22453d795609c257ef6783fc98e8319cfec57fa0837e1ee4373a74c81391f8fa1f7a573a776ba126ac7c073391a25001a SHA512 5a6f306112ec1d1110c78ee7abc12e8638b38e770a593672486175ab881f1c89e8f6d4c43e6e26c417971e2c212b4fe526d82d59811fa1b4b2ccb2fb567a9c50
+EBUILD connman-1.39-r1.ebuild 2745 BLAKE2B 78a55fff293c38a70f061c9b4af3dfc268a7c88e02cfd07d606ea4761716754f7b7aeb222e447bba125309c2ee11d6c340b69d4aef502d6a1b03a4c8be3d801b SHA512 f20d2d9062f30a56005815604a8435240a4d6202b7468121ac79750db0d554a42244f9a7793908e79419c0bef09910013fe6f318e4588c520910ad24d274179a
 EBUILD connman-1.39.ebuild 2722 BLAKE2B 6c6022f6646f3bacb03f3465d7eed3cddbd383a6039186eee7640248b9b191097f8ecef126214ae0ed94bec9b4b154d0d2961c7e8c2b0b123e0fa3e04144a017 SHA512 6d6e451329ad138849252c257dc9b82bb92a23e90e700d43b2a6e48be72f05dd9e26191b32c6387bb780db0881d620b9a7cb745cfa36de2a418a994d80d6992d
 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
 MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/connman-1.39-r1.ebuild b/net-misc/connman/connman-1.39-r1.ebuild
index 9f5662b9ab43..a25edfcf355b 100644
--- a/net-misc/connman/connman-1.39-r1.ebuild
+++ b/net-misc/connman/connman-1.39-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Provides a daemon for managing internet connections"
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index 3f61729eeffc..f7cf79cfc9dc 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.7.tar.gz 2606010 BLAKE2B d9fc43215d111a9911b3c54489f08579d91917e0d10bc554baf87389e8ff477c0ce9f663f399b29b6332448fd2a0ac20e8ae9a580436b9f32e4623862fca4b3b SHA512 49932122d9a8c32f56817cc7dabe84e0d3943c523fcc21cfc09020a3b036b452b00441dbbbe5e412e24b5391e1196795a292a5046587db27b29713eedf6432aa
 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 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
@@ -24,11 +24,8 @@ DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7cce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip 20348 BLAKE2B 74a4be12412897c2b8a361023107469ba1ed86109b0c216d010621bfe5700fbaaf4622ad5ab4b2fc13fc0c6ce9c2e2f9d47cdcad2c3efa95c47baa879bf3f816 SHA512 4cad5f43527cfdac732d5a71f083ded5080cbb01cb16245616408bcd41c99dd89002813a83a69d2c2e8a3aa46434495b855d592046108713739b3e29ee0ca8fd
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a
 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip 5985 BLAKE2B db4ca25a009754faf835ed02201c87cc04f82c3d3e9d4698d030984e2ba6eb557dd629d4b48005a44a87d6f333c573cc4b9465cd10456ba5af958a37dbeddc70 SHA512 9ad6acec3cd1b12d46279f0f7fd12d2216f53658eea4181d0331a9c2de4d8e5c7ae5f095c4eb7c1c97a1d14b0f231f23c36ee52d92708eb3dcdfdd4cfefe17c8
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -37,7 +34,6 @@ DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb
 DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
 DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip 45731 BLAKE2B f4a1442027b29625c694298e10ec9c107edd8437d8749110cd56440dae791c0e6d88a68187240cbc521f79fa7bdc4307e4b3b4edad38d57d5834644342a066e0 SHA512 88f37961ebe3a1701265a2f5cb606e97fe4ddd09e36ff13ca8c026e98640af5d35cb930e4d12b6690a97e5d934705102554c6d2912ebbb5ee08976c698cce2db
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
-DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
 DIST github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod 184 BLAKE2B f67cc91ee946f87065b29c78633866804f158d8dcbfbd6ad24d55f3e44d0ebf32db5666774d7a75920ae456bd16b115c672a2f07af9dcaa92550c1ccac6bee22 SHA512 04fa4c8e8636a01bec227f466844b251cbb74f856e8e1bc04de7401ae1452ecfa2839644a14b33b643d050d8f8edf503681ce0d4ac97bbcf2a5b0a8fdd7018c4
@@ -48,16 +44,11 @@ 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%2Fpeerdiscovery%2F@v%2Fv1.6.2.mod 216 BLAKE2B f8ecddb1f74ec2637b8ed97605ac7f4103a1dc3a82f8a510b41bb9d24f81211ad664d1c4b445875d3477042bdbdfe04ef193d6f795fafed38fd1ddbc7d5ca3ab SHA512 095f583c91a72a218aca90af2ad6314b4c39e5a1a5649cf64e077432580ae5b3ff3131903c0a3c594210eb26fcd21fc04204d7b1b1d7d944ab37a2d768c23f4c
-DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.2.zip 9033 BLAKE2B 70d77188c5769b53b1e8dc38a5e1c08a8eeaa89ca39c4072a0536e46d4fc06f0eb996ec3e68f378b7503f859922d3404648c2c7cc5288eb0efee36d080c4421e SHA512 ad384c29818af44600b25614d3db39ec74ff92050642647cc3f3573a62c27e6bf3ad614aba0fbc93cdcd76cd3ceb587cfeef3ad8a960111a77467d4eae859e9f
 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.2.mod 485 BLAKE2B 303274b3315a4e7107f1152ae749144afd65596d863409df57528bf599bfc7d5d36e42998bc89ad5c21a09e045476e8f7ef95d855c7cee09e6023919d68a8c97 SHA512 b8d37d5c92b053e6633cd1bac460c807aa87a8c8e44bf9c946809311ddde236ae36dc6470cc76fa49b66e90ae6416c8d4ef420dd81e895ffa4cb7f47f5dbb941
-DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.2.zip 606144 BLAKE2B 3eee43ffedcf89efec19968e925754b8782df8a5a182320c29a1a6901af641225032d3adb6d60a80c053785f866bd9df17807b8db0f85d5e86cc6f1b6076d1df SHA512 3a2a2e5351f7c49dbcfca9ab7c441de123b16b606fdd9b99d3d66ffb160de212c2c5fd26e36d6a7115369f8ab6a98a16fe80af46182cbb71804e4c667d3e1451
 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%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
-DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 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
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
@@ -68,40 +59,31 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b0
 DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod 32 BLAKE2B 714a7fdeaaa7ea25dedf0279e7edc1939ae954f9214851f3b8ca0baf2be779b323f79dcf86c34026dc48a9c12f448d5b70f0088292a0f5d7e77706eccd7167df SHA512 dbf23e08092d028c7f03935ddf3e1f63b2ab16781d713f1339a0dfd1199217e80e01a4183f1b18c25db99077b9f059baee8016ec069cac6252839f79008ad09f
 DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip 72830 BLAKE2B 5ce514604ab22c4d54b49be8b79448ccd2218c7d189acf746b74b2bf6869ff3dc74a99306b89bc7ee198cb78f717f05640ba6ca365c5f54b999730283354e4eb SHA512 72c9fdf871d60349e2dddc1dc70ba27b22632b0f0f992e7fa53ac89fdb7daf952fe5ac2c2a93a3875ca036cb7f14dff7c555267468fe9f533901d3766ee674bb
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201112155050-0c6587e931a9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 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-20201221181555-eec23a3978ad.zip 1864231 BLAKE2B a7261951977aa8143153915d72e608ef263a760de7b4977a11d0d2ead32f88ad370b993ada6344556616343a700a93edce3294df354f93d51214cfe888b97836 SHA512 1b7237562a92560aedb2527d8242b46c5a421488f638c0049812ceed87144828ca682bc4eeb87869db947479ac9e1350e5abbd31e1ff3e53734d4ea25bf5c27d
 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%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip 1583641 BLAKE2B f83348dd8fc8907f7a4251c600ec691eff20d86bf45a8af6646c715ab252fa9413dd0145364d7b4e0489043686e0497e79cc2e06532ccd97503c99fc87e6bd42 SHA512 9078bb5c9524a58dbbd099b931fa7df78cbf3f143313eaebab500f1bda247f8691bca3d92100bc4905ab7b97a5d3f94910fdbe4d58a16f03e19a153627149b7b
 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%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 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-20201113135734-0a15ea8d9b02.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-20201223074533-0d417f636930.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201223074533-0d417f636930.zip 1533200 BLAKE2B 3eeebc8d4cb2982446d4de432fa87efec38d572f0c655ce06368db86974481590afba70a16db3bea9538695f150194853a4ae688b5f9e3f3bd8e9856e11d1267 SHA512 ad71626ffdebd4147754bfbec2b2382cf987536a62b3e477634f1b1f42ec999a8baf9b96b89a388b12005a04e9a44ff5fa7772736247e8e623bdc2594bfbaaab
 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%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip 23282 BLAKE2B 9bfaf8ea78b49038403d7a49abdfa9ab6cfc4fc2d71e693a15368da8cbdcd99437898f72f8a240ec7484a7f2a11405258e4cd17bab00aaaed291e2a1d1566e3f SHA512 fa88149897dd4470a7e36683de33db945e219819ce74f39f384cad03db8fd6829d47e2711dec895fafa7aa24d576dffc7cb8594a499cb1e66abeada196d502be
 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
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.zip 23324 BLAKE2B 2374b37a902f15136181d5a52759aa5f2755ef5aab7f8ad2ff58ac31a1f249d1349b32d945075c3158b7c4a89f7e22887a2cd6f565ea3ab79b9d86955fba3ff6 SHA512 2774ed5c167d2f4d26d7b0fe2ff5beeb0bd2b7a45b9cfc4bd9a57c9fd5491c960de8d9fbd5f02c090d74ba45a8842fd94beb016c53ded33f9f3d50e65d601d09
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip 23402 BLAKE2B 03ef6b566c4f9539fe7310adff76e37bac4e3aaf32559f1a228690195207530ff68ad1179b22594cb7a62f9dcceb41631452052eb8bdab852848ffa1e19c0fbb SHA512 3aaf366b00d38d9dfe1ab23a0c6df05e2fb586f44470ec9b7cc59fc113cc68567a4102352b4a416da137df619b44c61e28042124cebcc525e3c6ebf10f8fbff2
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip 8609319 BLAKE2B a4459cdb830dd5de499cab9b0a37afa88f0cee1b3733a9d765a6693eea89fa5f7b2aafd9f5b27405c9bd38f27f715ef311845e52d3dedbcbf2ba020a04334898 SHA512 f40c677e92a896b7158f0b3ddb786e670a954fff7d981be3e0d3bc6d789d4f069174273050a0cedb8e2438d780e6950e027d84a2e2d64b7936e61edc613acd36
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -113,6 +95,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.7.ebuild 5587 BLAKE2B 78e34c970eebb29b44127a6c91c99cfae864dbd72a81ebe29ec32d4549d9b6a6e30dafb168735d53fd74c8c666d3fa2eebe7e960388cbe3490797e83a286f6fc SHA512 90f854b22f764ccff48a5d9ea08bd2a50a991cdefb776d8f1b151df7a0efd35c259d5902c290bcda1b7c6013594fc6364c89f2681353078e522c4ed67b9b2c3b
 EBUILD croc-8.6.8.ebuild 5551 BLAKE2B 478b8b8d16abb91b2d04aec605119c69a3373c20d15c4e5607529706ecb7a73dc9f31fa9b56d3d3c88bc46cb7cbc67bd03b8ac8665ab04054b7a826c6ec0d2ac SHA512 fe9def804f28c67423c468244f7f2ab9b22d7dc7535e97102ed5cfedbe4175457599300f3620c5d48c2a70968d971f0aeaf4969e30b539377a78f74ac3fe5179
+EBUILD croc-8.6.9.ebuild 5551 BLAKE2B 4a89a39dc5a53a3fae8889d1879a0a631a317b8425cb9f0e4e72b1b0717f5ef32421d76ea61bece4eb9739ce743cba4dac3648c115d82859dcd5a901fab3ba7d SHA512 963be9dcda3331922ee7f20a6f8491b970ba6012ed2f50dd8eba1381afa3cdb3051482f3c46ca856f1f2e5b456dcad72ade07b922a676ac5125acb37b7efa183
 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-8.6.7.ebuild b/net-misc/croc/croc-8.6.9.ebuild
index 1c82f08858e7..e3b197e5949e 100644
--- a/net-misc/croc/croc-8.6.7.ebuild
+++ b/net-misc/croc/croc-8.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,15 +31,16 @@ EGO_SUM=(
 	"github.com/kr/pty v1.1.1/go.mod"
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
 	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-runewidth v0.0.10"
+	"github.com/mattn/go-runewidth v0.0.10/go.mod"
 	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
 	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
 	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
 	"github.com/russross/blackfriday/v2 v2.1.0"
 	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
@@ -51,11 +52,10 @@ EGO_SUM=(
 	"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/peerdiscovery v1.6.2"
-	"github.com/schollz/peerdiscovery v1.6.2/go.mod"
-	"github.com/schollz/progressbar/v3 v3.7.2"
-	"github.com/schollz/progressbar/v3 v3.7.2/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"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/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,30 +67,29 @@ 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-20201112155050-0c6587e931a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
 	"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/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b"
-	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/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-20201113135734-0a15ea8d9b02/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20201223074533-0d417f636930"
-	"golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
+	"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/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"
 	"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"
-	"golang.org/x/text v0.3.3"
 	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/text v0.3.4"
-	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
 	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
 	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index b358c5747c8e..51aac87c03a6 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -7,6 +7,6 @@ AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7cce
 AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
-EBUILD dahdi-tools-3.1.0-r1.ebuild 2018 BLAKE2B 32d097769b4d741e32a6f9baba6b3c8ad3ed68412963c4122bba179bc367773d25c57f08e86c9956f3c1468010e3c3533987e917ab40d3203a1094c19c2fd4ff SHA512 14441431b504bfe0ebbf84e8d9d5614c625f54ce84d8977e6610e3f454fb5b1998790058967060d3f6c461f57bea2c511d9fb0b46895676f0e814094199f7c30
+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
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
index 78ae825186b6..7df08c9eb371 100644
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="ppp"
 PATCHES=(
 	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index a2a533a44f84..995304d61fc6 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -20,5 +20,5 @@ DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0
 DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
 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 4807 BLAKE2B 9634d7bff8eeac90a2463d1461679712e0c529ba55ff33b5c352074424899d5323359814b874380cfd34109ab0765c3025b8c7117f6bb684d5d55de2766ac748 SHA512 8ee0db6a8c26604ae5638d86d0ed5c9aead14545268444f556367b1d01287de78b8c57a8ca1bf711e4f5613dd665c10c30f0ee5e70a2316a5e0ab4bc69c892fe
+EBUILD dahdi-3.1.0-r3.ebuild 4806 BLAKE2B ae62f4327aa2a8cb09a5892230e2088c5533fb5e33c8480c119c6e58ea2695485ebecbd2bf4c0cdc73202e83891f1a5ae49a06ddda44a28b652e2c5049300666 SHA512 d1851513061f7b66728415f7c041bdcc16de673d571ecf5010a5e443be4db95d7d640addbb511ec39e2b850fbe4c34b369f43207a66306cc110cb1558f963f6a
 MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
index 6a86455478f1..bb776d1fafcf 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 25100d9f3396..a56def4000bd 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -24,5 +24,5 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
-EBUILD dhcp-4.4.2-r3.ebuild 8286 BLAKE2B 0d46df0b0ece5bbd260f441009e38ddceddafea6cd2ce1a0664d5419b970ac574291da2384b05bc3255b6961c9b4dd7c0eafd18ee5b8baf0d56bf887d48465c8 SHA512 06d56902fe42c9cef5d7807dccb2e18c55483e87a98cd5762e235fd7354bac9a5d4f7444a8b4b0a3983c5eb8d46de2aeec0c45b994428cad2e72824908115089
+EBUILD dhcp-4.4.2-r3.ebuild 8286 BLAKE2B 7a3e0ea582faeebe1f224fd119ee43be4b5d7cae63359ecc04aa6083ac44b32a532bb6aaabb88b50395b6955651f44cc7c7cefcf5e85441d8b04a2bed920b978 SHA512 8b6ed833ff91d5454486282e9f955cb347480b9b7d1c020a0137416505fe9fac3967357ad6090c9de6c953e3b2f61c8892f353e536d58754e4acd09cfbc2d8f9
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index 2d8a36235b05..a1d57e2ebbfe 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd toolchain-funcs flag-o-matic
+inherit systemd toolchain-funcs flag-o-matic tmpfiles
 
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
@@ -231,7 +231,7 @@ src_install() {
 		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
 		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
 
-		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
 		systemd_dounit "${FILESDIR}"/dhcpd4.service
 		systemd_dounit "${FILESDIR}"/dhcpd6.service
 		systemd_dounit "${FILESDIR}"/dhcrelay4.service
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index 1b0fe7b1d8c7..aa5003793ef7 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,6 +1,3 @@
-AUX dhcpcd-ui-0.7.7-tinfo.patch 912 BLAKE2B 98d9797abc46573c3d83ca6d9d3c97746f9cabaad6a5c5f5e498a3ee3b90b440477552297c425dc75cc778b4071ab48eb730eeb99e235acedf59341170cd0dd8 SHA512 c803e61c2841834e6bcb01b5736dd04f432ee00f2aaeddf083c28df5864c5eea1ca7d1b5395671cca01e52243029d214d31ab4e5f330dc2992add4ac2cb30a72
-DIST dhcpcd-ui-0.7.7.tar.xz 195648 BLAKE2B f382e331326e66d81674579ba018e6f9a6662df9d10fa0cca92808290e5d7621e7861afaa3d9a2c4d05fcc24b619922f8740faeaf4a531701f5d14505636fdf7 SHA512 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
 DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4
-EBUILD dhcpcd-ui-0.7.7-r1.ebuild 1350 BLAKE2B 2242025e46d67967cde0c7619f3bcddc47301d3e59f1c3ff129b4d650af2a94fa4828832e32a512bcd0e44df5f7284a361ce283b463d5aadf66eaf4c0fe0b03b SHA512 c6e730f0d2d7b847b62aebf2171ea849d3fdaf068ef7894bd8b8acf09ec7f5fa4cc77ff89307739f5de34ead6d069bd574dbea761aa81091675119a5a7cd4f5a
-EBUILD dhcpcd-ui-0.7.8.ebuild 1269 BLAKE2B 9d3b9877f5a35c65a2a6ca1461fe9a5bca4353ec5ec36db02f39b50fa69928f26bc5018efb3fcba8eabf6ca99653198daac4476837ea0df27c48dda3bd66f45d SHA512 182d54254e36eb0dad0228959ae23f1ca1a702e0a52c711df5829fdf3ee37d38e1efde139b0faa24854aa390f45ac07d26d0c6225ffe3121cb371b61246557c9
-MISC metadata.xml 278 BLAKE2B f04208caf75cd1e148b392ed9177f706cab4a373ff62412f46496d7e18430c6cf510e29876b1ef581fc67f561b3e114bcf05ee94920b1e3a10e6554d6cbb2887 SHA512 c7530022ff0aeb201cceabe36c9386e65eeb8ac3fe1fba0c429545408d22203bd972943c7ba8e8058f1d4166d306dfe9a2f3508f07438853b8997ce6bcf43e05
+EBUILD dhcpcd-ui-0.7.8.ebuild 1267 BLAKE2B 2ee0d2a0f9d333f826c0d59e5b84abbce55c4e0a76b5efa98beba880e925282dc9c9851936b8efb04bd9c8815f4958317abf90265f1dc7314b7adf4adb5d1a5d SHA512 e099c7c854489d0213a5ed8431bf390d44b450a871366b0f969acd70a225fb0754b3369dcf3c2ba8472ca4df5e9ce179927c8245d8bea791c832930da34e9424
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild
deleted file mode 100644
index 8cd78ad55b53..000000000000
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd xdg
-
-DESCRIPTION="Desktop notification and configuration for dhcpcd"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/"
-SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gtk gtk2 libnotify ncurses qt5"
-
-REQUIRED_USE="libnotify? ( gtk )
-	qt5? ( !libnotify )"
-
-BDEPEND="
-	virtual/libintl
-"
-DEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		gtk2? (
-			x11-libs/gtk+:2
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-		)
-	)
-	libnotify? ( x11-libs/libnotify )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		media-libs/mesa
-	)
-"
-
-RDEPEND="${DEPEND}
-	>=net-misc/dhcpcd-6.4.4"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.7-tinfo.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--without-qt
-		$(use_enable debug)
-		$(use_enable libnotify notification)
-		$(use_with gtk gtk $(usex gtk2 'gtk+-2.0' 'gtk+-3.0'))
-		$(use_with ncurses curses)
-		$(use_with qt5 qt)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
index c6399302fb9a..8df1568682ce 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug gtk libnotify ncurses qt5"
 
 REQUIRED_USE="libnotify? ( gtk )
diff --git a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
deleted file mode 100644
index 675b1edad4a9..000000000000
--- a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 988c171aa06bee85e393b28a482c894ccbbf8f58 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 10 Aug 2020 07:45:34 +0200
-Subject: [PATCH] configure: Fix build against ncurses with separate tinfo lib
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/configure b/configure
-index ed83221..f77bde5 100755
---- a/configure
-+++ b/configure
-@@ -472,6 +472,21 @@ EOF
- 		LIB_CURSES=-lcurses
- 	fi
- 	rm -f _curses.c _curses
-+
-+	#Check for -ltinfo requirement
-+	cat <<EOF >_curses.c
-+#include <curses.h>
-+int main(void) {
-+	curs_set(1);
-+	return 0;
-+}
-+EOF
-+	if ! $XCC _curses.c -o _curses -lcurses 2>&3; then
-+		if $XCC _curses.c -o _curses -ltinfo 2>&3; then
-+			LIB_CURSES="$LIB_CURSES -ltinfo"
-+		fi
-+	fi
-+	rm -f _curses.c _curses
- fi
- if [ -n "$LIB_CURSES" ]; then
- 	echo "$LIB_CURSES"
--- 
-2.28.0
-
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index 84adda2592e8..7a38bb900964 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-<use>
-	<flag name="gtk2">
-		Build with <pkg>x11-libs/gtk+</pkg> version 2 instead of version 3
-	</flag>
-</use>
 </pkgmetadata>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 6ba89c3db32a..7d1fcc2a5bd7 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -7,7 +7,7 @@ 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 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
+EBUILD dhcpcd-9.3.4.ebuild 4610 BLAKE2B b7ffc110a6a21b6c62e7f28abbcffb782bf0de08663a79fb2dad8ba9f924890f17385ef3bba1b7c57853a13dba54c76f3d076e2e2cffa3424084d7fc8a9839a9 SHA512 c69ebf80755230e6e88cf2547351c9f7f4702215fccac87a032bed0b9c969efc31d6f0a3696041b5488aa3f3a2978db1f287882d49a7cec4b489f81fb45a4224
 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
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
index 092c6e4a1dda..ab2855813cd2 100644
--- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.4.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 @@ 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
 
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 9771e0b9648b..bf1c5d76ed68 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,13 +1,7 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-114.4.426.tar.gz 100421824 BLAKE2B 1070be0d3607c8f3df0277dcae282bce704578d9c02fd191f32503dc1f152e6861b3945d19b186eda23ac8676b8e7da31050bc954a25e1b33fb4a4098d22f48c SHA512 d64ecd9889ab46c50ee6e2d7978afca3fa34fe3093f68ce2b328e488bb536a61a54c9c835be32765200e382dbaab3d8c025cf185998371793fb202c0998ab5f2
-DIST dropbox-lnx.x86-115.4.601.tar.gz 100133235 BLAKE2B edb1c89215511e4d36d0c2f1fba3f67e73b022efe7f3ff3cae2a85b089532659d2b0e685be5e017125a44897b487c5308225e44a39ced1dd779e0c212efe523c SHA512 bfd74e43bfeb9b65bf6dd84be7148cbca24ef33f16d24a9456eefc713dd3c6f583c0f4c2bd95b8ef13ec0d6a40b7a6b49e45d9c9179f8ee36326a62500119eb6
-DIST dropbox-lnx.x86-116.4.368.tar.gz 97022057 BLAKE2B 919a1fdf1a4eda92ec4e5e1de6789da6a995128339e459794e5a47e24b247338471ebdcfee92afc3a79691d1e092d5934cc83cbb3221a532fd41ad42db171e8d SHA512 d285225c22c0b5fd5e1c2e97467f666c6c1084857e4318589b69fbb3b37ef6a89f8147d5218a7d2ebbc0c4d88a405f10944f50b5a6fcecf64c48368d076d930a
-DIST dropbox-lnx.x86_64-114.4.426.tar.gz 104003045 BLAKE2B f71e9aba191f7258588aeb2cf2459eb0d9311c5c56e711f9b2932b8dfe2070cc0f1a20d3cfc9fc710ad75093e18fa494f9a42a6ff23d3e231e76edd29146612a SHA512 c9d42944e81fdb1ad315c388acdfba4b3da53bf90b6265c8ca030152c39ac0a60e8d064b1c47df7d8ecaca8b0801ad0851a2252d2241580cfc479cbf76e9fc3b
-DIST dropbox-lnx.x86_64-115.4.601.tar.gz 103710196 BLAKE2B 9e909052c4b1c66f4c691801322c895471754f9081837fd1da47a19abf5be37f564044ebb6b5a9630b9c72033111b96b4575d1e225095d57fa8ce36fca4e7def SHA512 c13ce9651f8b6020a15548ff7446c7d996f50030aea7f9fa53b8c92c65dda3fac9441147ec1694194dc51f9663b3a2f869705048c65449aca1a502d402f37bf3
-DIST dropbox-lnx.x86_64-116.4.368.tar.gz 100422000 BLAKE2B 5d49decf02a36126bc7b3f3d297425623dcef16c53a391bccaaa1767be7cceabb372fd82a22c918e003c08586f197113bbac417c2a13a6dc379210506087e0ad SHA512 6eef4d76b7d2e7ea0f0b2af2ca8d6dde407eb81c08c824578d746aae6beeb7b2e7f0965c672bf943cfb8a977f8f0afb9dd8bcb2628f5a6a130505c6e5c9335cf
-EBUILD dropbox-114.4.426.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
-EBUILD dropbox-115.4.601.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
-EBUILD dropbox-116.4.368.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
+DIST dropbox-lnx.x86-117.4.378.tar.gz 98240407 BLAKE2B 2a4a1f2967cc3b4fb59461d3ab94a8cb120db5ec3283d4ef0b1b13ad69e903bb87e11dbc72b1d1e2969aded63f03390af0087026864699c679276d195ec6e54f SHA512 261aad190643e02a102b70ce5418cf61f8affcf3607e6b35d91ec5713fb7ee058d2e20390fd6e8c434ae69d6f888ff390b12d2f544aa2b08a7ac98a9c545811d
+DIST dropbox-lnx.x86_64-117.4.378.tar.gz 101675442 BLAKE2B 42dbb52a4cb1998b1e114e5486acc0a89191c1856f1391c3f19186937faeae12ceec39e5496744f3237e457656f50d4c6af6b4f9ad5b02541e946c96f325ba92 SHA512 876314d7d56692c34c714c7aa8d03d5e9250a5a5bb72c74a16eaee68cf1cf28d4585e4b3ac457dc42d0230d222d62eeeab66672765c182d999f7200a1335a4b7
+EBUILD dropbox-117.4.378.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-115.4.601.ebuild b/net-misc/dropbox/dropbox-115.4.601.ebuild
deleted file mode 100644
index a77b20f7a3b2..000000000000
--- a/net-misc/dropbox/dropbox-115.4.601.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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/dropbox/dropbox-116.4.368.ebuild b/net-misc/dropbox/dropbox-116.4.368.ebuild
deleted file mode 100644
index a77b20f7a3b2..000000000000
--- a/net-misc/dropbox/dropbox-116.4.368.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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/dropbox/dropbox-114.4.426.ebuild b/net-misc/dropbox/dropbox-117.4.378.ebuild
index 17ace6762e14..17ace6762e14 100644
--- a/net-misc/dropbox/dropbox-114.4.426.ebuild
+++ b/net-misc/dropbox/dropbox-117.4.378.ebuild
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index fb4a3605c791..b23d2b731fce 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 767 BLAKE2B 513bfe624e86287f7ba2d8fbcfd2d6e1dd66a79c9a4325a03037ff11f95c4eeae320b47f7ea09b8e6fb6643a42263556a56e02eef7ca8405541b25cc8f710837 SHA512 d5aa8f0a5bbfc2231495aa2f3dd3f6b4fe0a491b3a1d527a304a41d8d1a7f35a60fabd7283a55ff14ed30be328f557d9e0c5dd884648030a8ad5010418f08d5d
+MISC metadata.xml 763 BLAKE2B a13defe6718f4fa859877881e2fa08963dc284fb2ccdb36b7145bfe2aaae551483551f2ebc3c1410df7ef1fca2ba161936280e8a745c29322bf4e70d0e45bcde SHA512 1467b9c9f727a5dbdd97ae1c0e66844721ec17443ba08cdc77731a1d3252277722cb719892409b079db1e6bfa9185cf3f87dadaff5c8eaf90955fc294dfd7d44
diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml
index 955798794c34..63a2a6768ea1 100644
--- a/net-misc/gallery-dl/metadata.xml
+++ b/net-misc/gallery-dl/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
-        <email>xgqt@protonmail.com</email>
+        <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
     <maintainer type="project">
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 726f741796e9..ea915d39b1db 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,3 +1,5 @@
 DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B 16501f3f2c9efa3f2bf0305f7af159f91d36000c4850fbcc8bf29afaf204de14d7f0531fc0c63d0e83b7c56a1a26961903852e06254057a4bcc8ff1c900613c8 SHA512 a3871a4d0470917b3bc7b0369ea30eb372cabc72bab1d036653ab94f09d75d5794cc58944905a2b72024c005c96172658a3f14ea081d2d81e7349df10c649045
+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
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild
new file mode 100644
index 000000000000..f682826007ae
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 desktop xdg
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+#net-misc/gns3-server version should always match gns3-gui version
+RDEPEND="
+	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	# newer python packages are fine
+	sed -i -e 's/[<>=].*//' requirements.txt || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
+}
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 7d28661f58bd..4b279be35983 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,3 +1,5 @@
 DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B 0f3698adeb7cf9daede05c0281a2c324bad0952a9e5774e11ebb9af342da020bac8b7acb05a938cd8df5a8934bed6bd2b56ee0187ea28b8356376e1f1396e944 SHA512 233db2e3bb3d6a071ce3ce24b8c86049f2707863f92ca67c4fdfb763bbdc98d3b78a1c2156d2d05548ee10f84394ab333f1c3404723091dc4e7edeb3df5a4a57
+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
diff --git a/net-misc/gns3-server/gns3-server-2.2.19.ebuild b/net-misc/gns3-server/gns3-server-2.2.19.ebuild
new file mode 100644
index 000000000000..74edb61d0a62
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.2.19.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 systemd optfeature
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-emulation/dynamips-0.2.18
+	>=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	>=net-misc/ubridge-0.9.14
+"
+
+src_prepare() {
+	default
+
+	# newer python packages are fine
+	sed -i -e 's/[<>=].*//' requirements.txt || die
+
+	# Remove Pre-built busybox binary
+	rm gns3server/compute/docker/resources/bin/busybox || die
+
+	# Package installs 'tests' package which is forbidden
+	rm -r tests || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	systemd_dounit init/gns3.service.systemd
+
+	mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+	ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
+}
+
+pkg_postinst() {
+	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	elog ""
+	elog "The following is a list of packages that can be added:"
+	optfeature "QEMU Support" "app-emulation/qemu"
+	optfeature "Virtualbox Support" "app-emulation/virtualbox"
+	optfeature "Docker Support" "app-emulation/docker"
+	optfeature "Wireshark Support" "net-analyzer/wireshark"
+	elog ""
+	elog "The following packages are currently unsupported:"
+	elog "iouyap and vpcs"
+}
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 36de07cb9684..7162b6e6ec6d 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -5,10 +5,10 @@ AUX ctxwebhelper.desktop 320 BLAKE2B 877ade9bf35ca53ca81315e7ab6e9854e35d2392ad3
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-20.12.0.12.tar.gz 120763336 BLAKE2B 4db068617ce7f47351bf8d0b964f00719705090d7a805eccaca3823648852fa12b894aa2f55d5abc0c6936ee01204bc2967488368797d081f6fd97f1a1cb25b8 SHA512 9bc6fd49dea450269ac9f70c20fa5b6a3fb7812e83005063ce5a32032d02a2283d13fa25e64a426c1b7e7cce717a3c4dd0ce2903a51a12758f7f7c3efb558ae6
 DIST linuxx64-21.1.0.14.tar.gz 143364053 BLAKE2B 1835d597ebdf392c900862527424b146cf8dfbc8150cf76004a3c94cfb2ecd214b60c974c55110c90b958dc5bfae11c3bc5923aaa88f1840d5714a88b9d15b9f SHA512 817e1318302475a32e1ba718f2a5279ce70b033de1b384fa0ffb7b2a225b1eb788f70b83fd55f5ba9a66a98500c0c30a44bdc06f85f61c84e28cd1cd95a49d32
-DIST linuxx86-20.12.0.12.tar.gz 110107767 BLAKE2B 1958eb57622be69edb95ac2c0389f5dd98141bc92899d876b3c4911629c63a3d5b21bb2c7296975a41afbcc321b733fd05a6874ff4b03d79ff3c4aa6a1a44ec9 SHA512 e976ba3c00bbb16aa1039ac510fdb6118c1353e9ba4a67b4ac553896b6b51346d16ae8a569ddfbbc3ab89f89b1759789e2bb88e397611140e5caf11709917d98
+DIST linuxx64-21.3.0.38.tar.gz 143339036 BLAKE2B 645d9518b1e47e553aae8fe90ecf0d9f9e0523adb8cfcb692f500b28c63220d05361215072ea7a3de700068dd644585fac0169099b860ba4d4a662fe9b7ff5e5 SHA512 1f004a2c154281b71b919053fdcb5ca83c93a5047a8fc8bbe3acb53b78ccac8ca446dc5aa23495a5a69ef07107d3f1b9749994dcb95c2beeee735d57afcebf20
 DIST linuxx86-21.1.0.14.tar.gz 120010131 BLAKE2B 1e9380509cbbcd1849b0e306224447ad64d86717e636387eb3368eae318921b025029852c5f89a1ab1ca295d1a33ef4741468dcb00f3ffd7d442d8cf3d43a945 SHA512 7e8f6646262b2d59f08ed8a200b7fd71e029066210facba99eeb003c59ec1a543180a8e05d403aecc668b3f992b08198a567fbad86ba3a16b391afb30b453413
-EBUILD icaclient-20.12.0.12-r2.ebuild 5334 BLAKE2B 60e3c38841a6a507c9649e83fe012271f9acf1b88407a8ee411a738a73e4b7b288c136682194fd1f4b4688a84609ad5ee7509deb7857432899351ae02c18c1bb SHA512 9edefe5630ada112037046543cb25aedac3354f413fea1e1e77e96941cccca98ddb56565c5fde1a27036dc8b027194060cb0ac57ee36b2d3cd0762a18971399a
-EBUILD icaclient-21.1.0.14.ebuild 5336 BLAKE2B ba5372eab77e9f407818b50a2c068f53446de00422324de160be3a178d1c624558a0e25333966bcfe47c1d61e93bc6e38025bf3fa776e13506539b1c2ab898b6 SHA512 b8c86453827e697617955954d1a2756a074b641921cfd0cba2bd61edffdda96d1c665e7bb5499d1738abd0137e222bf85ec1018fe64fd20c39184f196b0a846b
+DIST linuxx86-21.3.0.38.tar.gz 129220087 BLAKE2B 9e85e74b34546ead052c9b9eacc59e32d5422b2afc31886d34c09596d27e4c792dd77338b936dbefb270219673e612a73908705b1d886d6f61a40e430c14b730 SHA512 354fff11dbb150e4b4e94d09dd288d1ff39b518f6d278dc33d645699d3ee0690ca93a86289921c4fc3e91d2cc5f1bbb28e4179d8672e17d02923851e22772d71
+EBUILD icaclient-21.1.0.14.ebuild 5334 BLAKE2B 60e3c38841a6a507c9649e83fe012271f9acf1b88407a8ee411a738a73e4b7b288c136682194fd1f4b4688a84609ad5ee7509deb7857432899351ae02c18c1bb SHA512 9edefe5630ada112037046543cb25aedac3354f413fea1e1e77e96941cccca98ddb56565c5fde1a27036dc8b027194060cb0ac57ee36b2d3cd0762a18971399a
+EBUILD icaclient-21.3.0.38.ebuild 5324 BLAKE2B 8ddf9c90fead27e13fe35dc5797ff68aa11a7ea0fe72af0048258e3c4ae4029db335a0e4cdc30fc1131886e9a2ecf969ecd841e3fef94e8407994a84dc6ae843 SHA512 d0a7c0aec8f1b782e96865406809992f44c0288d69c9c247bbca4714712a9b64d65e2dfed746dd0add18cf011971d68e1a0920abc760e83ac577b23f661cafc2
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/icaclient/icaclient-21.1.0.14.ebuild b/net-misc/icaclient/icaclient-21.1.0.14.ebuild
index a92334c81619..d0f5f9638ade 100644
--- a/net-misc/icaclient/icaclient-21.1.0.14.ebuild
+++ b/net-misc/icaclient/icaclient-21.1.0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild b/net-misc/icaclient/icaclient-21.3.0.38.ebuild
index d0f5f9638ade..2792d9de7463 100644
--- a/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild
+++ b/net-misc/icaclient/icaclient-21.3.0.38.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -196,7 +196,6 @@ src_install() {
 		lurdump
 		new_store
 		nslaunch
-		pnabrowse
 		setlog
 		storebrowse
 		sunraymac.sh
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index d24f43193556..8a08d6d9f9da 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -1,5 +1,5 @@
 AUX knockd.confd.2 189 BLAKE2B 288c5c9e47a3001d83edd0f9d54286754fecd7d8321896370af63c0e3429a2c4004a8e99a835e558878f6b934d8c50f6ecdc5f267cd7608c59de46cfed195162 SHA512 75a483770c31f8de3744c9c3119c5cf818b9ff780bf9cffb49c1f4a78b2f384dc392218ea2a0df9fd7178a19b0b1f5a59d8a81cdb56f952cd4c8e5a91c9cf25a
 AUX knockd.initd.2 527 BLAKE2B 1c0e429d07d4023d34ae129c900161a9a681cd76761e953e3b6416fb3f5ad067b8f2e5c567887ccfc43adaa3b1a1f9e58bcb19ed660b118785db41aa45330107 SHA512 dc66e53bdc42487609d978a538dec26712f25c87b9a2e4a70e1a833fedfbacf3b8618f87cbe110ed54938f6620fd2e5f7a79143d7f8503927686dfa26eb9acff
 DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7
-EBUILD knock-0.7-r1.ebuild 1123 BLAKE2B 6342aa37df57028fc75cffde7e6876ebd497d7ab1e1fbcfe8aa303cca3c0c4f86dda259893a4fa3952df189a8c5c22d41b1762cdaa02a7315265b79ac7ac42c0 SHA512 29be59b12c60eb33af2ed64a78fc4df90cd7bb6496f823e14b14c58d9389c3f64fe4cff36adf2572ee936f4518930ea4012a504eff6e8076f3bb0892747e659c
-MISC metadata.xml 246 BLAKE2B dba219f8b59aae4aed3685948a81fc06da8d34cbe8a59fafe7b9c503f63fbcb011514ee8734fd74928ffc93e2ab201902fb28702df8b30be5d8636e4de0ce6d8 SHA512 68d82bf2a215c76134e5dc45ed11f3db4546f21f6989513faa7792e0ba0b706688960710f1d6cee3d2f209636d3552df9ed8120edfc1609b9d7d687883becc84
+EBUILD knock-0.7-r1.ebuild 1093 BLAKE2B 6fa890d34f137f602cca10a1b24c6d05341a8ade371eb20ae3e241eb51072e37ca5a358085237c01f51dd141aa6fc3868c58d1e1f3994dc593861d74c4a11a35 SHA512 7d2d709aeda869f5e5191ee79c150aa7f40e7749e6c0a65be304989f4fb6f21262df7bf6d032401c5342f5bf3da7e43e10cc678a305bfb6210e9b81a70940125
+MISC metadata.xml 323 BLAKE2B 7686de9cbde61bea3e7014c4c2d795c57472c80ad8339c568ee91a2b8c3f21951fabdfb238e79765368e954704c322fae73e2851b01adfceedde6ba5198b52f8 SHA512 101eaef6a7379f57938957779947d799d43dac1bb045737c84d62b09000595f1d6464bb049661dab9342a1c74dcbbd10d6e37df2bf09d77b95a2aab8b3911ae2
diff --git a/net-misc/knock/knock-0.7-r1.ebuild b/net-misc/knock/knock-0.7-r1.ebuild
index 117341a6615e..5d3643d7508a 100644
--- a/net-misc/knock/knock-0.7-r1.ebuild
+++ b/net-misc/knock/knock-0.7-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Simple port-knocking daemon"
-HOMEPAGE="https://www.zeroflux.org/projects/knock
-	https://github.com/jvinet/knock"
+HOMEPAGE="https://www.zeroflux.org/projects/knock"
 SRC_URI="https://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -22,6 +21,7 @@ src_prepare() {
 	sed -e "/^AM_CFLAGS/s: -g : :" \
 		-e "/dist_doc_DATA/s:COPYING::" \
 		-i Makefile.in || die
+
 	sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \
 		-i knockd.conf || die
 }
@@ -31,7 +31,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="${EROOT}/usr/share/doc/${PF}" install
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
 
 	if use server ; then
 		newinitd "${FILESDIR}"/knockd.initd.2 knock
diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
index 46f1937fc92c..8def26b02c6b 100644
--- a/net-misc/knock/metadata.xml
+++ b/net-misc/knock/metadata.xml
@@ -5,4 +5,7 @@
 	<use>
 		<flag name="server">Installs the knockd server daemon.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jvinet/knock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index 73f1ab6be0fc..efa7e333ae37 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,7 +1,8 @@
+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 1342 BLAKE2B 81841c1b3c26f67637dcdbe94d37051512c38039499e5415f3926ca120d7ba46bfac02bed477f4ee97ab25f3eb4077f4815d011ba7ac5bd58b024726178b72fd SHA512 08d9a4b7093124719d66096dc277fbad5a25298d9da80850ad5e28522f70fe5691fa97257bbdaa7b914bc9c6bfd9ba6d7447e2c20f1e1f42147f08c739cff848
+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.18-autoconf-2.70.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-autoconf-2.70.patch
new file mode 100644
index 000000000000..fa7b4195d93b
--- /dev/null
+++ b/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-autoconf-2.70.patch
@@ -0,0 +1,82 @@
+From d6d7130f0a2e3b81880fca29966e42c1b2be40a7 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 8 Jan 2021 22:22:52 +0000
+Subject: [PATCH] m4/sctp.m4: make conpatible to autoconf-2.70
+
+On recently released `autoconf-2.70` generated `./configure`
+fails as:
+
+```
+$ ./configure
+...
+checking for struct sctp_event_subscribe.sctp_stream_reset_event... yes
+checking for gcc options needed to detect all undeclared functions... none needed
+./configure: line 16464: syntax error: unexpected end of file
+```
+
+This happens becuase new autoconf generates less whitespace:
+
+```
+{
+if ...
+...
+fi}
+```
+
+It requires at least whitespace between `fi` and `}`.
+
+As input already has newlines the change just drops extra `{}`.
+
+Tested on `autoconf-2.69` and `autoconf-2.70`.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
+---
+ m4/sctp.m4 | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/m4/sctp.m4 b/m4/sctp.m4
+index 6593517..94527a6 100644
+--- a/m4/sctp.m4
++++ b/m4/sctp.m4
+@@ -6,7 +6,7 @@
+ 
+ # Macros to assist on probing kernel features
+ #   Probes if a type is defined
+-AC_DEFUN([LKSCTP_CHECK_TYPE], [{
++AC_DEFUN([LKSCTP_CHECK_TYPE], [
+ AC_CHECK_TYPE([$1],
+ 	AC_DEFINE([$2], 1,
+ 		  [Define if $1 is present.])
+@@ -22,10 +22,10 @@ AC_CHECK_TYPE([$1],
+ #ifdef HAVE_LINUX_SCTP_H
+ # include <linux/sctp.h>
+ #endif
+-])}])
++])])
+ 
+ #   Probes if a struct has a given member
+-AC_DEFUN([LKSCTP_CHECK_MEMBER], [{
++AC_DEFUN([LKSCTP_CHECK_MEMBER], [
+ AC_CHECK_MEMBER([$1],
+ 	AC_DEFINE([$2], 1,
+ 		  [Define if $1 is present.])
+@@ -41,10 +41,10 @@ AC_CHECK_MEMBER([$1],
+ #ifdef HAVE_LINUX_SCTP_H
+ # include <linux/sctp.h>
+ #endif
+-])}])
++])])
+ 
+ #   Probes if a declaration is present
+-AC_DEFUN([LKSCTP_CHECK_DECL], [{
++AC_DEFUN([LKSCTP_CHECK_DECL], [
+ AC_CHECK_DECL([$1],
+ 	AC_DEFINE([$2], 1,
+ 		  [Define if $1 is present.])
+@@ -60,4 +60,4 @@ AC_CHECK_DECL([$1],
+ #ifdef HAVE_LINUX_SCTP_H
+ # include <linux/sctp.h>
+ #endif
+-])}])
++])])
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 3f696ca7327d..bf3050d07acf 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.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="6"
@@ -25,7 +25,10 @@ WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
 
-PATCHES=( "${FILESDIR}"/${P}-install-sctp.h.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-install-sctp.h.patch
+	"${FILESDIR}"/${P}-autoconf-2.70.patch
+)
 
 src_prepare() {
 	default
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 2d89e6177c92..896578cb989a 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -15,9 +15,9 @@ DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04
 DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
 DIST lldpd-1.0.6.tar.gz 1814839 BLAKE2B d4bf30a7ae5a5de93f67ef6b06662e287a4c2eff76f157dc9b0a551b4473e0b0896e7af1cd39866f2ee0013ebdf572e762d8543a00bda0d0a1136cfedc7f2ba9 SHA512 b0930cf3202eba6bcbb7d5f941bda16ebbdde15f1839c6664c2896f92a7c2842cbe87baa32c7ce85f1d1fe012a8ceb9975a06244644a4bc3759241a4a1d058d1
 DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
-EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 91a6ce4d2e1503f2bbff6f29c5819202e069a9fa06b033438ff4d98525fe389f8d11104ff4a058a83301e7ddea473599e277d6e2c8ba01db2bc0d0605761bcff SHA512 c828991bae9872304317d2436445df7d0db20f97a8902ba2a4effd12d6730bd66ec7b9130766baee6b7b31b076efed529afb811ca2f96b10298eadb4400a15ff
-EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663
-EBUILD lldpd-1.0.5-r1.ebuild 2356 BLAKE2B c54530cc9ae48dde1b11f426e9dae87149fa4c783b309c9ab52a16c02024595a6527ac898663ea3d73271fe6132232f8b8c510ebcc03cb9b6c397c555dc85da6 SHA512 46f7d387f267e781764096f58f5020c84c2b4231f25b184d8eedfeb2d5a54609d08ebe07885fde505f506c9e44de5eca6e0943fc5c00f4ebfdf1ee1d220b04d1
-EBUILD lldpd-1.0.6.ebuild 2322 BLAKE2B c25595742c11bac5b47132e49900500a447b8636d3858512685b3d7f5220e6fda7cef4c0b42a4f56ff486975cb222972d79864b08d732658255c47d5656adff2 SHA512 256af531af6e0adc62e31a0638fb1a63c11c44b7b02c5ec1ff4c5fc06e32b33460d8515451d6cdec2e05c7d58f5257abb2582051a5b11d4e6f74f1ca8f5b024c
-EBUILD lldpd-1.0.7.ebuild 2268 BLAKE2B abdd53f12a1ac074bfd324a92fb21ca75d233df07fdc4a2e8389f2a2e452ba46a630a1808e8d95408e93d962e20a3a8033fc904271315888ddd2711dc4241c87 SHA512 67cfcc5a407c243f5e9984d58c6732257d87628eaca4afc84141cd9d11c46ec31d599757dc5b8ed1d3f8d285ca02a78c940a9e2b0d33320bda4c175c8a1ebb28
+EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 0328fc61859fb18450cd5b147a7b6b73dcaf4c56820bd3c219c424dcf5626c5ae1f658985fc09df1a2083723cc2aebf2464e07e5c037cc9ad89f7d6b0ac062f5 SHA512 1e9829bf9aa96e3575841be49babbe2adfb8b22182e255b76867b4705278ebcc23efb74f7b16ad8c8cdcc3ecf320f823a67568cbf444efaeaac39b65163f55ac
+EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 52583299069a44be65e63277f9920fe6bb625bc130c05802c883206f0462ec59bfb8464ef0d5f6ec63b8e6103e08cfdec3cd5967585605686b0d47701ec6cabe SHA512 1f4e29b84fa0b99cd62f0afe09a756e02fe9fd9bbc6b6f2ffd68f326265d9b6e385ddc9690c6b99cabbd49229cce3f94f93185e58b8cdecbc6fec486699ec468
+EBUILD lldpd-1.0.5-r1.ebuild 2356 BLAKE2B 9faf6d79c27053c19f25022987dbbc9a99cf66161c8d9e16d1ed98a570517417143c294dad4e7f40590031ab4d7a9001384aa1e4f1c0e88a05ed34e4bdbe5511 SHA512 a11a3320a374b9efacb62f2bbee7bc87ec8d36eff0642bb107c9fa107f03b50b7a6eeb21b46521cc88030c32e71c847f339f9ef2a4fc93b1e1b5fcb537577424
+EBUILD lldpd-1.0.6.ebuild 2322 BLAKE2B ba665c9657f5acb8667905e9e254f94dcc9fb755252d693f1c2a91eeb752e920810d165b8cf7b0b2e9f9910c05104ff0f57f3c1e10d3a7fff58a52b3503ca97e SHA512 d05b15681677e773a9dd4b9e441e4a37a091c541a7cecf073e6b36a0f8e048edea4d37b46b2e5511233ed3d830072a5b81e28d4f3594a56d51fde3254cfa41c1
+EBUILD lldpd-1.0.7.ebuild 2268 BLAKE2B 824700814c2aec26b73079dc0399a5913b32cabab16bb344088520d822b3ec1b1dbc5936b9cbf6b3a89fca886ef17528d4a4084645c81178f88c2c4e23dd13e7 SHA512 e1d9ece9bfb4bead21013713e5cfaf8e67bf7885f066c487eb75792d059bea027abae67be375c1a7ae1f79b94640371ff5c8f7d88c4e096a937f4737864647d8
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 2ecf7a755691..7a948e636cc0 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils user systemd bash-completion-r1 autotools ltprune
+inherit eutils user systemd bash-completion-r1 autotools ltprune tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
 HOMEPAGE="https://vincentbernat.github.com/lldpd/"
@@ -102,5 +102,5 @@ src_install() {
 	keepdir /etc/${PN}.d
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
index 92e05bbf1444..1619bcba5066 100644
--- a/net-misc/lldpd/lldpd-1.0.4.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils user systemd bash-completion-r1 autotools
+inherit eutils user systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
 HOMEPAGE="https://vincentbernat.github.com/lldpd/"
@@ -101,5 +101,5 @@ src_install() {
 	keepdir /etc/${PN}.d
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
index 78bc6d770a65..1151f58a48b2 100644
--- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd bash-completion-r1 autotools
+inherit systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
 HOMEPAGE="https://vincentbernat.github.com/lldpd/"
@@ -99,5 +99,5 @@ src_install() {
 	keepdir /etc/${PN}.d
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
diff --git a/net-misc/lldpd/lldpd-1.0.6.ebuild b/net-misc/lldpd/lldpd-1.0.6.ebuild
index 68d592e54515..b202dbd60a58 100644
--- a/net-misc/lldpd/lldpd-1.0.6.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd bash-completion-r1 autotools
+inherit systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
 HOMEPAGE="https://vincentbernat.github.com/lldpd/"
@@ -98,5 +98,5 @@ src_install() {
 	keepdir /etc/${PN}.d
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
diff --git a/net-misc/lldpd/lldpd-1.0.7.ebuild b/net-misc/lldpd/lldpd-1.0.7.ebuild
index dce1189ca422..13a686c29d3d 100644
--- a/net-misc/lldpd/lldpd-1.0.7.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd bash-completion-r1 autotools
+inherit systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
 HOMEPAGE="https://vincentbernat.github.com/lldpd/"
@@ -94,5 +94,5 @@ src_install() {
 	keepdir /etc/${PN}.d
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 501180c96f1d..9baf0e6ff9cc 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 481 BLAKE2B cd7584e18caf9bb81b3bd5387374fba2deb07b88400045882ec72212b1bfba7a93cd32fcd55274f781f65c0aace945ce207c0689d6ced78cf5dde78c32a14eab SHA512 f84193a0923bd8e8da619ec39040ea5bd86e41bc7fdc94c2f523888d0a79204320ba4a3a849e642bef7c6bd1639123ad2c9078f953b680f67f749cad39c67e0a
+EBUILD mobile-broadband-provider-info-20201225.ebuild 478 BLAKE2B 95128a4b1f11c25446b95a448dc66b14317599610102775a92774770cba6fbd1bb356ea3de3738671b2a02d4f077e8d998a83d4a165ebf737918859568e05bbd SHA512 1bdfae3b170831d67042e0c57f6435c4b6c2e7f24c0d23132bada85b1a628515e6b12b16ecbc5f57a8230f74c6e3079193283ea0dd2060a43f7083c7ac514edb
 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 29c33fd46f82..b064a2911136 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 9368c28efa24..0490a8b9b73a 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -3,6 +3,6 @@ DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d
 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.ebuild 3671 BLAKE2B ae2cd80d8edc4cb76141aa243e4dc0cc61c453de288d5e0d6bb8409915871cd953abb341bdc21eb44ff99594128228971bb74fcab141baa2419a9551edeabbdc SHA512 c3a52336779844143cfd7103151bc6211d5da75d3d3564ded60a788bcd9b1fb85f8173092803a447c23eceeb01ae85276d9b5fa466d084ae5b3c9fe7875ebf77
+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/modemmanager-1.14.8.ebuild b/net-misc/modemmanager/modemmanager-1.14.8.ebuild
index 926d0eeec65d..ad9e1885c1d6 100644
--- a/net-misc/modemmanager/modemmanager-1.14.8.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.14.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/netpipes/Manifest b/net-misc/netpipes/Manifest
index 0a05042e4bb4..4d5337bc2f57 100644
--- a/net-misc/netpipes/Manifest
+++ b/net-misc/netpipes/Manifest
@@ -1,4 +1,4 @@
 AUX netpipes-4.2-string.patch 179 BLAKE2B 12ab1a0d819bd8df023ef873f303304a22ff043651a3a7c7f659caf036320896f76804a26490148872e7203ad9985ea1eef8d20c02e577367562d779622bb117 SHA512 5eedd31bf184dd28b85dbfac07ba008e36d12419339181ad04f427d062f99d6be886720d212fe9f4f612988647be8c4f35e977bb0023f6c20e718da01bdbf9de
 DIST netpipes-4.2-export.tar.gz 75276 BLAKE2B 95c4b5a587760538522624d8908bab7748cd5ee09af681f90df6edf9c3d04b7c3b5cad39716be41ad416fb7b559ac994eeb412f89ed190f75ee2505ed5732beb SHA512 a875922d179b98d5d663825cb83dc92b515ca3fa77e44ce05941a0de58951840626836b597ea244a660be637d61be3428de7dab413a1c439e4673c82dae02531
-EBUILD netpipes-4.2-r2.ebuild 725 BLAKE2B 7d107119dac37d004257861f41ae57a55ba3c0bca70bc695e2e62004563b6d331c18ca3616b8a6c6b3591dd792570a761f0def91bba4ebae3a9db92b5e5b2833 SHA512 26644912a34914a2d901fbd77c45b3d7ecbf1f98db7c89128d03e03a677aa8f81fd2fe3d504d8c5b878308b9ddbe17369f9ea3c6fa1c920183f490b6ac46869e
+EBUILD netpipes-4.2-r2.ebuild 748 BLAKE2B ef5791a7ff9034dd140ee220580c06f9a702f735ef75a0fad2da629d81d8044261485ee860aa48f144a60148a37c0489bc4a8b913d424a7c8e987c6e17406e17 SHA512 8ad0cdf619834e985a3819abec8b526e0aedd8e6b7ffba2431505df57ea71cc0c11ec352156a30369556c6c1c47bc9119c5408cb4193c8354681d44c8de6223c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-misc/netpipes/netpipes-4.2-r2.ebuild b/net-misc/netpipes/netpipes-4.2-r2.ebuild
index 9fbe3848ce4c..ed14038c1dc8 100644
--- a/net-misc/netpipes/netpipes-4.2-r2.ebuild
+++ b/net-misc/netpipes/netpipes-4.2-r2.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
 
-DESCRIPTION="a package to manipulate BSD TCP/IP stream sockets"
-HOMEPAGE="http://web.purplefrog.com/~thoth/netpipes/"
+inherit toolchain-funcs
+
+DESCRIPTION="Tools to manipulate BSD TCP/IP stream sockets"
+HOMEPAGE="http://web.purplefrog.com/~thoth/netpipes/netpipes.html"
 SRC_URI="http://web.purplefrog.com/~thoth/netpipes/ftp/${P}-export.tar.gz"
-LICENSE="GPL-2"
+S="${WORKDIR}/${P}-export"
 
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-S=${WORKDIR}/${P}-export
+PATCHES=(
+	"${FILESDIR}/${P}"-string.patch
+)
 
 src_prepare() {
+	default
 	sed -i \
-		-e 's:CFLAGS =:CFLAGS +=:' \
-		-e '/ -o /s:${CFLAGS}:$(CFLAGS) $(LDFLAGS):g' \
+		-e 's;CFLAGS =;CFLAGS +=;' \
+		-e '/ -o /s;${CFLAGS};$(CFLAGS) $(LDFLAGS);g' \
 		Makefile || die
-
-	epatch "${FILESDIR}/${P}"-string.patch
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	dodir /usr/share/man
-	emake INSTROOT="${D}"/usr INSTMAN="${D}"/usr/share/man install
+	emake INSTROOT="${ED}"/usr INSTMAN="${ED}"/usr/share/man install
 }
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 04ca52f5b9f9..089550f99e31 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -12,5 +12,5 @@ DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a778
 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 11257 BLAKE2B 5c328aef0bf1ff84d9b5fc74ed4fcd2912e2be6a384f0ae842a512540344d2b28784d292b272f29ce1c28f304f88077a764acfcb7ce82305f92cee58c9e033b9 SHA512 5eb6c4d37bf9e1e62ce5e5cde5a6ef6319ba1450d200b586e6670d6fd2454a1adeb9de02c0204e7a76352e41c6b190f6137530ca88c99c78520b29fcac50e119
+EBUILD networkmanager-1.28.0-r1.ebuild 11254 BLAKE2B 1bda0067cf5074cea89c0a7ab0f007aea189531407c5f72c7da930140cab4cb54c0528dcf7c0ec2157021db1a459d9b4de957e5140310a8c7582980ce7398a6b SHA512 e173def62fbb02e654649eeeedf7c573e40e9d9fa0a6d51c907df918e4a3ed2cb55c2ca66cdac07686367f7cec316ad91bd4e9366bec1d39881b19568607e302
 MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild
index e904f84b7639..b3b1cd0f48cf 100644
--- a/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 5a8ae0671b89..51fb34c6d1ff 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,10 +1,11 @@
 AUX oidc-agent-3.3.1_desktop-category.patch 270 BLAKE2B ab841626749f19ecfb6f27d79224a2954633e623f306d66698d6f2d9a53047a29411c12bf572d76e273315a8d99b0f2b664604e6b0aa60efe43f74ff68261d60 SHA512 249d1a50da20e4bc37eb1c8d894bd87dc7f165b85af340ee862c72a926db521819796540fe95bb58c8494c2c8bc13ffd1c8a864ec455b81f878e9cc079872cdb
 AUX oidc-agent-3.3.1_install-perms.patch 1773 BLAKE2B 8fad809127230af52849da4d496cb71a26efbd8529c67c631eeb153472c60f83a96d46e12bd263d3582c8a5c4f4bbd9841a37b3d5e750f7b24c5a205d8b6aa63 SHA512 94631b5c13d9d41dd9377740e4559f65175e6f6438d2cd108a7d3e445005443791b18cd2926e2e925a4774e6d51d1288f665461c12cc390ee60300c192972d3b
-AUX oidc-agent-3.3.1_makefile-toolchain-vars.patch 1294 BLAKE2B 8267867cead49287697c403999845da7a51d697cd6b6a15589480fd05ab275af82c97202c9f050acc270e2b6750b952b4e2bdd03cd8702236c343df985fcd26e SHA512 8241a1eecc5db5c740743f02cb8d6daa05758447425aaa4f5b5832b416f1c195c118c51205ca83190c0bc07d2cc314641594cb76005e3cb136fb7e205f1cc5a7
-AUX oidc-agent-3.3.1_test-suite-buffer-overflows.patch 1526 BLAKE2B ec623853da106f60a58814181c80786bea8ec8c02bafbcf7d1ac840723ddbf77aaf810ea5b06a62aaa4268aafd3c6c5a821d25eeb656e66393012c6b338afa18 SHA512 a9f4f50eaff99e077ac3cd1290ba45e59f6a538694919f87b3c2467b498a95fac76b84f875f92d9575516d5581cd2dfbcc9602c978ac2fd591d8dc8aabb7499f
 AUX oidc-agent-3.3.5_makefile-toolchain-vars.patch 1342 BLAKE2B 4d2db2bc1711bcc99b4c7c98677836f80a9fabfb824e33c4affa70eda95188e22f32fc787bbd487d5a4462fce2333119ea5d6208c56acf638c5782f2d1b509f2 SHA512 4775a28c5e29b431238b712b7baa98501be3a3b5c46fcdcfae008665374539cd5192f0af81feeb1c5822d7d46378dd66d0650a0f2cf091d4801493a6a34ac2b4
-DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
+AUX oidc-agent-4.0.2_install-perms.patch 1931 BLAKE2B 9061a41dc805f98c4813f967f2e0280ed519c143551c9232bd1a3786f6e4569407744d3821845b5245751fb6bd91462d45fa6f12dcae92fcac1abd6fb5bf2f51 SHA512 f924f3e3bbcb0e427036fb2c13e9272641b340d829d19389c072faef5da6381f1470858033c78bc356bbba75b622bc0283cc4e1fba3255f80788b2d09fab5106
+AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb
+AUX oidc-agent-4.0.2_makefile-toolchain-vars.patch 1214 BLAKE2B 2e2c78973049160a9b6210d2180bb851c11a31ce90c8c1af5f05b0d86cd7cdce572c564c4117ec23f286c72a4d701b52ec815f6f30e68c58353fe5394bd210e6 SHA512 22c561c057be1de9ba1747a0234225954ec953f2bdecb0cc05149891e6fc43fede14808dbf59e9e27e5e5e8041d22b16ba4d46e366bd5b96a2b567b2d26a0f8d
 DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030
-EBUILD oidc-agent-3.3.1.ebuild 1485 BLAKE2B 14a68d23c070f73bc4919f5b48cb8ca2d6c8e6538da1a79826d9f6f50799d9a7ff056f2f8c52f9d904bbbf1941d5ef5e9df2b1d65e68d00fae7575a6c6fe78be SHA512 796a3eccc59b07f28dcbd6a82d5946028379a17ba68d55f0acf6d2525897ee805a02f6f733b9bcc4688f22b51d3b2ee6c0177e263c6033d10a769508d6f6b3a3
+DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
 EBUILD oidc-agent-3.3.5-r1.ebuild 1547 BLAKE2B 1baf0c63e4d2e54cd6c8ac1e311e81e3c04af5b27eb8fa9314ec1dba507f567b0407f07d7d3517487943f0de080f240cc84d05ae1a811cffee38f4c241df3372 SHA512 51a4f0bd8f8263bc1589cd56bdda73eb7f2232c309127dbcdc934aaf1a2c74b78c161b94ada715f91f66c2369e02f91a36ca2b37a73fec29f2f8441ec9def9a1
+EBUILD oidc-agent-4.0.2.ebuild 2137 BLAKE2B 2ee40466f628bb06d914923badd5e7d8995ea12e56276be89fbaebcd694838ca01467d0b29cca6a737aafbbf4ac8c6f2407f8b8bfaedad8134d0c551fd6fe7db SHA512 86be93a4c41c0007ecf56f9f70015e6a461e3fa106277fdf0c9c5f792881c0bf75fcb4871719323e5b5852fb2eb76312e97be58dfc4907814c4d53eb1f6f4c92
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
deleted file mode 100644
index dda1ab252214..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-1. Support user-provided values of CC, CFLAGS and LDFLAGS
-2. Do not force the use of a static version of libsodium
-
---- a/Makefile
-+++ b/Makefile
-@@ -54,20 +54,20 @@
- endif
- 
- # Compiler options
--CC       = gcc
-+CC       := $(CC)
- # compiling flags here
--CFLAGS   = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra
-+CFLAGS   := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra
- ifndef MAC_OS
- 	CFLAGS += $(shell pkg-config --cflags libsecret-1)
- endif
- TEST_CFLAGS = $(CFLAGS) -I.
- 
- # Linker options
--LINKER   = gcc
-+LINKER   := $(CC)
- ifdef MAC_OS
- LFLAGS   = -lsodium -largp
- else
--LFLAGS   = -l:libsodium.a -lseccomp
-+LFLAGS   := $(LDFLAGS) -lsodium -lseccomp
- endif
- ifdef HAS_CJSON
- 	LFLAGS += -lcjson
-@@ -81,7 +81,7 @@
- ifdef MAC_OS
- CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION)
- else
--CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
-+CLIENT_LFLAGS = $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
- endif
- ifdef HAS_CJSON
- 	CLIENT_LFLAGS += -lcjson
-@@ -478,7 +478,7 @@
- ifdef MAC_OS
- 	@gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc
- else
--	@gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc
-+	@$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc
- endif
- 
- .PHONY: shared_lib
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
deleted file mode 100644
index b43f20c06860..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/test/src/utils/stringUtils/tc_strelim.c
-+++ b/test/src/utils/stringUtils/tc_strelim.c
-@@ -7,7 +7,7 @@
- 
- START_TEST(test_noFound) {
-   const char* const str = "abcdeffedcba";
--  char              s[strlen(str)];
-+  char              s[strlen(str) + 1];
-   strcpy(s, str);
-   ck_assert_str_eq(strelim(s, 'x'), str);
- }
---- a/test/src/utils/stringUtils/tc_strelimIfAfter.c
-+++ b/test/src/utils/stringUtils/tc_strelimIfAfter.c
-@@ -7,7 +7,7 @@
- 
- START_TEST(test_noElim) {
-   const char* const str = "abcdeffedcba";
--  char              s[strlen(str)];
-+  char              s[strlen(str) + 1];
-   strcpy(s, str);
-   ck_assert_str_eq(strelimIfAfter(s, 'b', 'x'), str);
- }
-@@ -15,7 +15,7 @@
- 
- START_TEST(test_noFound) {
-   const char* const str = "abcdeffedcba";
--  char              s[strlen(str)];
-+  char              s[strlen(str) + 1];
-   strcpy(s, str);
-   ck_assert_str_eq(strelimIfAfter(s, 'x', 'a'), str);
- }
---- a/test/src/utils/stringUtils/tc_strelimIfFollowed.c
-+++ b/test/src/utils/stringUtils/tc_strelimIfFollowed.c
-@@ -7,7 +7,7 @@
- 
- START_TEST(test_noElim) {
-   const char* const str = "abcdeffedcba";
--  char              s[strlen(str)];
-+  char              s[strlen(str) + 1];
-   strcpy(s, str);
-   ck_assert_str_eq(strelimIfFollowed(s, 'b', 'x'), str);
- }
-@@ -15,7 +15,7 @@
- 
- START_TEST(test_noFound) {
-   const char* const str = "abcdeffedcba";
--  char              s[strlen(str)];
-+  char              s[strlen(str) + 1];
-   strcpy(s, str);
-   ck_assert_str_eq(strelimIfFollowed(s, 'x', 'a'), str);
- }
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
new file mode 100644
index 000000000000..6184f42d9335
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
@@ -0,0 +1,60 @@
+--- a/Makefile
++++ b/Makefile
+@@ -411,19 +411,19 @@
+ 
+ ## Man pages
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(AGENTSERVER_MAN_PATH)/man1/$(AGENTSERVER).1: $(MANDIR)/$(AGENTSERVER).1 $(AGENTSERVER_MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ 
+ ## Lib
+@@ -437,24 +437,24 @@
+ 	@ln -sf $(SHARED_LIB_NAME_SO) $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/export_symbols.h: $(SRCDIR)/$(CLIENT)/export_symbols.h $(INCLUDE_PATH)/oidc-agent
+-	@install $< $@
++	@install -m 644 $< $@
+ 
+ 
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+-	@install -D $< $@
++	@install -m 644 -D $< $@
+ 	@echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
+ 
+ ## Xsession
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch
new file mode 100644
index 000000000000..1e8765aef9d0
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,7 @@
+ 
+ # USE_CJSON_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i libcjson >/dev/null && echo 1 || echo 0)
+ USE_CJSON_SO ?= 0
+-USE_LIST_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i liblist >/dev/null && echo 1 || echo 0)
++USE_LIST_SO ?= 0
+ 
+ ifeq ($(USE_CJSON_SO),1)
+ 	DEFINE_USE_CJSON_SO = -DUSE_CJSON_SO
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch
new file mode 100644
index 000000000000..533af1f2a6d4
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch
@@ -0,0 +1,43 @@
+--- a/Makefile
++++ b/Makefile
+@@ -74,9 +74,9 @@
+ endif
+ 
+ # Compiler options
+-CC       = gcc
++CC       := $(CC)
+ # compiling flags here
+-CFLAGS   = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra -fno-common
++CFLAGS   := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra -fno-common
+ ifndef MAC_OS
+ ifndef NODPKG
+ 	CFLAGS   +=$(shell dpkg-buildflags --get CPPFLAGS)
+@@ -87,11 +87,11 @@
+ TEST_CFLAGS = $(CFLAGS) -I.
+ 
+ # Linker options
+-LINKER   = gcc
++LINKER   := $(CC)
+ ifdef MAC_OS
+ LFLAGS   = -lsodium -largp
+ else
+-LFLAGS   = -lsodium -lseccomp -fno-common
++LFLAGS   := $(LDFLAGS) -lsodium -lseccomp -fno-common
+ ifndef NODPKG
+ LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS)
+ endif
+@@ -112,12 +112,12 @@
+ ifdef MAC_OS
+ CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION) -lsodium
+ else
+-CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lsodium -lseccomp
++CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lsodium -lseccomp
+ ifndef NODPKG
+ 	CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+ endif
+ endif
+-LIB_LFLAGS = -lc -lsodium
++LIB_LFLAGS := $(LDFLAGS) -lc -lsodium
+ ifndef MAC_OS
+ ifndef NODPKG
+ 	LIB_FLAGS += $(shell dpkg-buildflags --get LDFLAGS)
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
deleted file mode 100644
index 2ca56ed3f68e..000000000000
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic xdg-utils
-
-DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
-HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
-SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="app-crypt/libsecret
-	dev-libs/libsodium
-	net-libs/libmicrohttpd
-	sys-libs/libseccomp"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-libs/check )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1_desktop-category.patch
-	"${FILESDIR}"/${PN}-3.3.1_install-perms.patch
-	"${FILESDIR}"/${PN}-3.3.1_makefile-toolchain-vars.patch
-	"${FILESDIR}"/${PN}-3.3.1_test-suite-buffer-overflows.patch
-)
-
-src_compile() {
-	# Bug #728840
-	append-flags -fcommon
-
-	# Parallel building doesn't work
-	emake -j1
-}
-
-src_install() {
-	emake \
-		PREFIX="${ED}" \
-		BIN_AFTER_INST_PATH="/usr" \
-		INCLUDE_PATH="${ED}"/usr/include \
-		LIB_PATH="${ED}"/usr/$(get_libdir) \
-		install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-	elog "You should use oidc-gen to initially generate your account configuration"
-	elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
-	elog "consult the man page of oidc-gen, or full documentation at"
-	elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
new file mode 100644
index 000000000000..88d48a54d23d
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic xdg-utils
+
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+	dev-libs/libsodium
+	net-libs/libmicrohttpd
+	sys-libs/libseccomp"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2_install-perms.patch
+	"${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
+	"${FILESDIR}"/${PN}-4.0.2_makefile-toolchain-vars.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+src_compile() {
+	# As of 4.0.2 parallel building still doesn't work
+	emake -j1
+}
+
+src_install() {
+	emake \
+		PREFIX="${ED}" \
+		BIN_AFTER_INST_PATH="/usr" \
+		INCLUDE_PATH="${ED}"/usr/include \
+		LIB_PATH="${ED}"/usr/$(get_libdir) \
+		install
+
+	# This file is not compatible with Gentoo and in any case, we generally
+	# let the users load such agents themselves.
+	rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog
+		elog "You should use oidc-gen to initially generate your account configuration"
+		elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+		elog "consult the man page of oidc-gen, or full documentation at"
+		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
+		elog
+	else
+		local new_major_ver old_ver
+		new_major_ver=$(ver_cut 1)
+		for old_ver in ${REPLACING_VERSIONS}; do
+			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+				ewarn
+				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+				ewarn "to make sure they are compatible with the updated clients."
+				ewarn
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 94b302cd3633..61a10f8de35c 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,4 +1,4 @@
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
-EBUILD omniORB-4.2.2.ebuild 2695 BLAKE2B a51275dcce97af6bcf571b166c3f6aa7530eb4c210f1ee6f32c27594c3ecad43d6e12c36e7ff88b856150e399aaf3aa2cd4c127583b69a71cf72e483cb6d2411 SHA512 33faf477d07746900a3415ab5f8d28391d5c5609a2910f1bc8204f6ca873b60a8a94ef367d94539fcd98842637ad708a7fa3cc41fb827acb9e8224712f1f1f10
+EBUILD omniORB-4.2.2.ebuild 2356 BLAKE2B 399814240e5c0b85626ffb6800812207be3d7a3929d2defb4fc7a0f857d9d3f0187eb6986602696f636d30dcc527a85f7d51a985cef437196eb238ddfc750919 SHA512 f1019973a9c3feab9b118df4f9dd76cc028e995e5ec488f7b2d9822cf030ab1a9cb8c5ecd2779a3595cf2e4b3d5772653f95e18bdd11406c0a474a3e8460aaae
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/omniORB-4.2.2.ebuild b/net-misc/omniORB/omniORB-4.2.2.ebuild
index b6bc68e1003e..403726b19216 100644
--- a/net-misc/omniORB/omniORB-4.2.2.ebuild
+++ b/net-misc/omniORB/omniORB-4.2.2.ebuild
@@ -1,14 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# The build system picks one version of python and sticks with it. It
-# tries to guess your version (based on /usr/bin/python), but for
-# consistency we have to force it to use one that we specify. The
-# highest version the configure script will accept is python-3.3, but
-# that's on it's way out, so we prefer to stick with python-2.7 for now.
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-single-r1
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3865d4279c1f..c6b6f587e555 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -36,5 +36,5 @@ DIST openssh-8_4_P1-hpn-AES-CTR-15.1.diff 29966 BLAKE2B 79dea4e16ffdda329131eb48
 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
 EBUILD openssh-8.4_p1-r3.ebuild 17822 BLAKE2B 33429fc7138dafc13940b6956af610fc15e4d16efd2cc8b318e510365c86c96b73de3961d8506e072ca2972a0e97fa7155af457e310c307d339f451657affbec SHA512 0d37ad65c202611424972d3cb2d5cd43bc57ef2cbf96165fae3a053c45c512c59d060430155292148702df079a60f569e508fdfdccfafc2dbb8fc4c3f2aacb86
-EBUILD openssh-8.5_p1.ebuild 17660 BLAKE2B 34032e2de622eb96b713f38d183a2cc71d6f56e6f1890d2dc2757c8705c70073748103e8658728d48dd8dc1599e8f3d8fb55552df5b56e5010b7f41bbbade999 SHA512 a9cbc9f4063334c19f749ab10a7c9475bf00ec615954203cce6a470fe96b262b53219f7b51f9404223d0fc7229f15e378d6563abe4b9a52403089a394b182935
+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/openssh-8.5_p1.ebuild b/net-misc/openssh/openssh-8.5_p1.ebuild
index a5b7915c25d5..ab670d15e10e 100644
--- a/net-misc/openssh/openssh-8.5_p1.ebuild
+++ b/net-misc/openssh/openssh-8.5_p1.ebuild
@@ -438,7 +438,7 @@ src_install() {
 
 	# https://bugs.gentoo.org/733802
 	if ! use scp; then
-		rm "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
+		rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
 			|| die "failed to remove scp"
 	fi
 
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 134b452468ca..30df8b26e523 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -11,5 +11,5 @@ AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b
-EBUILD openvswitch-2.14.1.ebuild 4414 BLAKE2B 2b341d291e43a49554c6c4e79c2ed1235e6bf98dd9da8149745612a2af40e213efd2a7b4540041b86c7c309420f33504fc66c9897e781a763669764153b21db7 SHA512 e09717c7a4bf08aee7538ff47a407c4ffed2555d3ef19a500f3b4b4bdb49facc14a847210bdc894cebef1967d0d9269c949b23b35d20b428d646bb400f77e762
+EBUILD openvswitch-2.14.1.ebuild 4414 BLAKE2B c14016f321773081241d64411e160e0aef6871216021675e5ac5766bb14f19b1bca3c76830ef5f8eecd48562c5ca3b04be33f2e279fab58b741e83bb913fc136 SHA512 95042a8aa685b3a20b9b1b113f6d34c635e6fc60651cb470b9306e76c4fcdb4991ee0fcd142484fee365daec112538002290464551d7b16cc0fa6fb2c6534ead
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild
index a0571b1e652a..ee149240777d 100644
--- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.14.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
-inherit autotools eutils linux-info linux-mod python-r1 systemd
+inherit autotools eutils linux-info linux-mod python-r1 systemd tmpfiles
 
 DESCRIPTION="Production quality, multilayer virtual switch"
 HOMEPAGE="https://www.openvswitch.org"
@@ -112,7 +112,7 @@ src_install() {
 	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
 	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
 	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+	newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
 
 	insinto /etc/logrotate.d
 	newins rhel/etc_logrotate.d_openvswitch openvswitch
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 9c0c555fc6f3..3ed28488183d 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -2,9 +2,8 @@ AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc9
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
 AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5
-AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-EBUILD rsync-3.2.3-r1.ebuild 4127 BLAKE2B c8d70118e080dda9746754bb30975a656f0b816ab692d4a29b4a5ebbc8f84a79c494f749c8d793f25054a09bbbb2ca230de9d867ade97363a87ebcc841db4049 SHA512 95a0141fb08c248eaab6a3d1c3196da46e7f5839d5ffb75d63d3d6cac016bab4443603557600600943db25de8e9da13c6df9d0e753be8819420080ea068f92ff
-EBUILD rsync-9999.ebuild 4136 BLAKE2B 0b179106e0a894845f7f6cb486b4743caeded0a2155830e44a84add1a92c2b68f4c9251c3c5b7cca7a3e538fe707e8860500dd0ad31e9f0ab2adde71cc4097dd SHA512 e5267e12cf594181cdf4f30816f1211694452a6fd310f6688d352058593e81bf83c3a717f3079683d6f524f5a11a62039bc6cb11e484e229e73db246037f46bb
+EBUILD rsync-3.2.3-r2.ebuild 4150 BLAKE2B 17a6902024b3debf7cb1fa369a7f598e2f8180f500c3d83f6ce18f61c4ffafa73c6235590e940048ed583d8f778c2fefbac74d42ee141195c4bdf1583900117a SHA512 bd452773826e5a598d3652399f12d8bcafc355571ea8d9150c9f41ce7cdc5bd7c900f3263a08774e16d540e90ed400059a8d8e9af9b60abbf2660f63f85d2073
+EBUILD rsync-9999.ebuild 4159 BLAKE2B 5af5cfa5f360d340dd5b700cf044a235780efb5138d274eff30bec433ef58fe3eac5dfada535ea3327f04bcda7d89cf71db853ffd9eea269f5e06381d5fccb1f SHA512 3a0a9a11e560ecf944f18c222bfe41bb1af2012ba80d02200d2dd1866755bbde493d1b9e0727157c08793d01d1efc5893fcff56307d1b8b2a188ae37bac60524
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/files/rsyncd.service b/net-misc/rsync/files/rsyncd.service
deleted file mode 100644
index a2c1de0add1f..000000000000
--- a/net-misc/rsync/files/rsyncd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=rsync daemon
-After=networking.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/rsync --daemon --no-detach
-StandardOutput=syslog
-StandardError=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/rsync/rsync-3.2.3-r1.ebuild b/net-misc/rsync/rsync-3.2.3-r2.ebuild
index ca7bad626efc..3b73247a47c9 100644
--- a/net-misc/rsync/rsync-3.2.3-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r2.ebuild
@@ -120,7 +120,7 @@ src_install() {
 
 	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
 
-	systemd_dounit "${FILESDIR}/rsyncd.service"
+	systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service"
 }
 
 pkg_postinst() {
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 0eb044cd5827..c09292830a34 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -120,7 +120,7 @@ src_install() {
 
 	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
 
-	systemd_dounit "${FILESDIR}/rsyncd.service"
+	systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service"
 }
 
 pkg_postinst() {
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 56d935f58a69..7e7b8c7ddcb9 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,3 +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 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 372 BLAKE2B 127c5ab93d8a19412aa11aeeb9616211463c1f29b3b5759fed91f8d60ccbabdbb3e12d3afe90b123375ee9bdab4667e3dacb061595d4df190a199211dbc18022 SHA512 45271bd20d458ce806462b3acc4772c524f8cf43aa2e3f9b7ead0ceeadc9102a68e6f37c884d5adb522e3a1551ff606e1d27c368f2c09c66429c21120fc72340
diff --git a/net-misc/sipcalc/metadata.xml b/net-misc/sipcalc/metadata.xml
index 6f49eba8f496..78e1c2f9528e 100644
--- a/net-misc/sipcalc/metadata.xml
+++ b/net-misc/sipcalc/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mmk@levelnine.at</email>
+		<name>Michael Mair-Keimberger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..17eccb499d61
--- /dev/null
+++ b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator"
+HOMEPAGE="http://www.routemeister.net/projects/sipcalc/
+	https://github.com/sii/sipcalc"
+SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 8f0f84d8c416..ac87fe798c02 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -2,8 +2,10 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4
 AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed4933cdfe15378c428d4bd006b6f91412f5071519d9027efe95b94ecd3baf4ebabd7143d358433cccc7335ea41a9a5fb9ed280e63664c04d01 SHA512 13afe7b894954d25635c2fc146b6386eb3973c151363067ec0762f95a349bf6d2d26005521214db07fd2a69ce9e994c9d25b92d0b80882c015b8313bb2016328
 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
 DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3
+DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
 EBUILD spice-gtk-0.37-r2.ebuild 3737 BLAKE2B 1b379af9d6f19b31fe90150bf455c93eb5b1130789b70040ee5e82f9a8d073593744e7a965c5d88742012f7ee27d98e04c181885ab107d77aa0903499676d33b SHA512 20952e0c0b3ce3e3d8ba329f28b01fd3f0d2fd580f6ef67aa651c026fe93ceefbd8f05b9023a85b3ddfe41bae562fdd7b59455e7d5aecee9fb9253bd566390c0
 EBUILD spice-gtk-0.38-r1.ebuild 3382 BLAKE2B 6cad1b6f314437630b29c183abe7fe93b4eed5ac70c22096d54e495d1f0ad62a750a2810207258a0a936456d3dd1c44f1907f978684278a6b628d8f1056d5f1a SHA512 5edcb316574f32a5dde19ae3abdf00ebe37d9fe632ba245912229896318e7f4bcfe19f30534eaf750d1e4aa552cfe915159c088585384ccf1526abb38b86ac7e
 EBUILD spice-gtk-0.38.ebuild 2982 BLAKE2B d055699e445e617d196fc3d96439a6655ffa04c1a5470c7d075bd67dfd02c1a7ee193fe2874e633fe931c8752068b5048e4f807b6f16c7c14eb818250dd2d522 SHA512 3a16071be02e1cdcc7f6ecda433b3909594b9a65a8013d3177f21340c8114e4528dedadb835843b1e51b36219cf10ef5ce9ffec09bfeeebdac5d5cfed0e22810
+EBUILD spice-gtk-0.39.ebuild 3210 BLAKE2B 639775dd0e80c9665a89a6d3759904092d77976b48001c7cd1125e2742a8c95c68bb5182ba0062a214d446a8d8261ee6a6b13bcd168655e12ad7d4d4758a0e0f SHA512 3d4c065247a0bb85f7d9466c413c3a86d866d4fcd9232c537136bb33d4c10b251bfb445203172da9d3ae064157c77f8734707b5c6e26d83b00bc79ec22c82903
 EBUILD spice-gtk-9999.ebuild 3235 BLAKE2B 5926310e84c13cfc0814c2eb08c2bfccbfe69afd7ed06f5d2d8ea4d818150578b60431d479b58b702bddbcf9b4cbbca2ac6e4ac907a2352fb32a0bd2e4e14bac SHA512 f3a3ab3053219df825ad1ac6a88be816ebd72521a626d11b9f034657e9c8b42652e7d8f16c17ecebab7d79d0952f58701b1ebfebb136745565bdf4a397fd6e6f
 MISC metadata.xml 785 BLAKE2B b9448548d4a31423a95447eda043cf100df88fe9264889c2909442b64b54cc2d055c9faa8fa7698a161df5c838b1b38e1b1bd6d5c7b4d76ff67d33b48203cac9 SHA512 c5bf0dfd74d054fdef09eb86a98aadfa9c28fa1c2986b01a61c66151542c574db79710332ff0ccad45635278f57f7636d294ec3d0d2523a4cdc8a7c4cbbdddd0
diff --git a/net-misc/spice-gtk/spice-gtk-0.39.ebuild b/net-misc/spice-gtk/spice-gtk-0.39.ebuild
new file mode 100644
index 000000000000..8f9a666c3e7f
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.39.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit desktop eutils meson python-any-r1 readme.gentoo-r1 vala xdg-utils
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+gtk3 +introspection libressl lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0[introspection?]
+	media-libs/opus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	introspection? ( dev-libs/gobject-introspection )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+		)
+	)
+	webdav? (
+		net-libs/phodav:2.0
+		>=net-libs/libsoup-2.49.91 )
+"
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( x11-libs/libva:= )
+	arm64? ( x11-libs/libva:= )
+	x86? ( x11-libs/libva:= )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.14.3
+	dev-perl/Text-CSV
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gtk3 gtk)
+		$(meson_feature introspection)
+		$(meson_use mjpeg builtin-mjpeg)
+		$(meson_feature policykit polkit)
+		$(meson_feature lz4)
+		$(meson_feature sasl)
+		$(meson_feature smartcard)
+		$(meson_feature usbredir)
+		$(meson_feature vala vapi)
+		$(meson_feature webdav)
+		$(meson_feature wayland wayland-protocols)
+	)
+
+	if use usbredir; then
+		emesonargs+=(
+			-Dusb-acl-helper-dir=/usr/libexec
+			-Dusb-ids-path=/usr/share/misc/usb.ids
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 11760e15eb40..f9171d826210 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -6,7 +6,7 @@ AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc
 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
-EBUILD stunnel-5.50-r1.ebuild 2793 BLAKE2B 171534b2db1295d9a0f23664a43d5f01a45b113397c24c8e3e53484cd1fef30b609f3d696eb76ec57a3b2408c1f52e5755ab7e75b9669b247170dcb3b8790b81 SHA512 27a6c83a40b46a568091bffc0586fabbea86df217bca9f674156e08eeb15ff7443caecc78c678c33e0f10e69bcfaa8b4c36c08a72a147d66068013c3b43dd934
-EBUILD stunnel-5.55.ebuild 2765 BLAKE2B fc58336184cded5e804826ef244c7be76b299fe97d27cd8c3bd905734e955e3328c6d04ed017596a111af0e10fa3cb816df2cb9d19e2e730874c5d7049a41e91 SHA512 0a97d7b0d6324a84ab63361f8d2331e8960e657cd9bfccd6275cc110b38b2bf0697f394fc89354a0b48c446815f8cd550e95971881b0862f104c496107946c40
-EBUILD stunnel-5.56-r1.ebuild 2893 BLAKE2B b28033d76fc038da5bbc15bdceab0d34e7e35365ff94a15cb6c9f6227958fbf2047415f4dfcd041b11fc206ee542245188088e75bca20d1fbe3f20b969501b38 SHA512 959cdbaf092c634f9b2626cf6a68433588dd42f6a8c94d717d37cbe80bfc9017c5072d6d6c6fa8a1ba49c289c5b1d0b5624d3e1add28d9d7c498e530857df9fb
+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
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 7a02d027adc7..462a59083c99 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit ssl-cert multilib systemd user
+inherit ssl-cert multilib systemd user tmpfiles
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="https://www.stunnel.org/index.html"
@@ -79,7 +79,7 @@ src_install() {
 	doenvd "${T}"/20stunnel
 
 	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
 }
 
 pkg_postinst() {
diff --git a/net-misc/stunnel/stunnel-5.55.ebuild b/net-misc/stunnel/stunnel-5.55.ebuild
index 2a3a28d96e59..9744f7b8a26f 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit ssl-cert multilib systemd user
+inherit ssl-cert multilib systemd user tmpfiles
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="https://www.stunnel.org/index.html"
@@ -75,7 +75,7 @@ src_install() {
 	doenvd "${T}"/20stunnel
 
 	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
 }
 
 pkg_postinst() {
diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index 32b76bcf26e4..485343478d77 100644
--- a/net-misc/stunnel/stunnel-5.56-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit ssl-cert multilib systemd
+inherit ssl-cert multilib systemd tmpfiles
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="https://www.stunnel.org/index.html"
@@ -73,7 +73,7 @@ src_install() {
 	doenvd "${T}"/20stunnel
 
 	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
 }
 
 pkg_postinst() {
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index cf1db9fb2586..cbcc8b4307b0 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,7 +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
 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 2752 BLAKE2B 232dabfe54805fb5445d4ad87c81c26080a696ee03d8516cfd2340709429dce95d2cfca1359fd96d4c847e3e6ebf14909fc6805d77f55689b3808a25803d9c0f SHA512 f8b47ef5896c0863840356ea0871bde1471bbedf787344502df57026222361837519e2c7279fd9bc0ef5e00fad10523a7f401f1f715ebef72c1b6a468a6654c3
+EBUILD unison-2.51.3_p20201127.ebuild 2756 BLAKE2B 3699033422041cf1bf5e626637f9ede038f474884564b921269e6bb996d0b725a09c52ffee6f9246a29b11433b7ea16212f6559184f2da21c129f71f5759962e SHA512 8e0ff13147e90eb51a9c49ed3b6020a288838490c8e6ccc11b5f9a2e75511d872d1a5bd84bd4242a1e1a73fb0ed7e633bed149a4ad25e8d94cd0ee46e3f1dc61
+EBUILD unison-2.51.4_rc1.ebuild 2662 BLAKE2B 604940ff64c3da3eba3116f6ce593b50ed249280ad3a85ce6fa469e752277cd976b0e9ce584a7000cd6583f9c6425a666e9b37c627f581ffc2b7e94f483ee19a SHA512 22f11f7a31acef79d3dbe0e663f3178988faabcd23f83e0924a92d65f95ef60efe4a725283cbb819c9ffe0f674f53aff3bad1815148f140553197404d96e13e9
 MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502
diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index a035fe9b7214..f63e304f3ab9 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local myconf="all"
+	local myconf
 
 	if use threads; then
 		myconf="$myconf THREADS=true"
@@ -57,13 +57,12 @@ src_compile() {
 
 	use ocamlopt || myconf="$myconf NATIVE=false"
 
-	# Discard cflags as it will try to pass them to ocamlc...
-	emake $myconf CFLAGS=""
-
 	if use doc; then
-		myconf="$myconf docs HEVEA=false"
-		emake $myconf CFLAGS=""
+		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
 }
 
 src_test() {
diff --git a/net-misc/unison/unison-2.51.4_rc1.ebuild b/net-misc/unison/unison-2.51.4_rc1.ebuild
new file mode 100644
index 000000000000..7ce1abe5eaba
--- /dev/null
+++ b/net-misc/unison/unison-2.51.4_rc1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+	doc? ( app-text/dvipsk
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+	# 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"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	if use doc; then
+		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
+}
+
+src_test() {
+	emake test CFLAGS=""
+}
+
+src_install() {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	cd src || die
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+
+	if use gtk; then
+		newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+		make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}"
+	fi
+
+	# Waiting for https://github.com/bcpierce00/unison/issues/411
+	if use doc; then
+		DOCS+=( ../doc/unison-manual.pdf )
+	#	HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+	eselect unison update || die
+
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
commit	7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree	56fae051db521b8fce8014cbc8b11484885b14b3 /net-misc
parent	6d691ad5b6239929063441bbd14c489e92e7396e (diff)