gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /net-misc
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
132 files changed, 1897 insertions, 3355 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c8335425b9f6..8f7d1386e393 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 a25486a436ef..e86f44326ff9 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,12 +1,11 @@
 AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb
 AUX apt-cacher-ng-3.5-perl-syntax.patch 365 BLAKE2B db71cf58c61ef6192f0d2955f64dbbe89ea580c4dbdd6cabc150f5cdebbf383f916dcfc1379e0caa1792be7dbda18898e71fc7a4f1829ae77160dc4a9ca83a74 SHA512 fe933eac743b13974cd7451f9a8fcbd32d6f779b992aaa07526eb291eeb64dbd48050ec08ae141fee55df2f1c415799073a78236c6fa10d5eb12733e2919ca16
-AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de
+AUX apt-cacher-ng-3.6-optional-systemd.patch 2307 BLAKE2B aaf31601172f378c403dea6fc9f5d0ace9a6bb5f4d1eb2a4cdfd5198c15b59ad5f98663618d2303fd52147de40cfb2f8ac6e0b149ea73e9bf4cdba27c647a14c SHA512 b337dbaf7379e1cdbfab32c93046312e7e69ffebc5229f056c11434ae2fd1248ff94595eaeb0810d7a8a6e127fb663919c5d4311be06e6b0013e057912062aeb
 AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38184b905d6ecd372bfa8e13b52babba18da0c8f364a6ba66890d6de96ce6970c7c8ff3b2d2 SHA512 4a7cd8ee8125def9290d2e7a369f76308bcf8faf22eb908c974cedb7206d1d02417636cc14ccec9047bd25d7f4fd0d245189353cb2b0266f8c8122e019460666
 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.5-3.debian.tar.xz 49708 BLAKE2B 85092374207a252dcb4ef7b95dc434f81f9b67791e20099dc058022a9a575130070c12827f3fd04640fcec3b44a444fb85d8cea6439d5eaeeb359f263fb05682 SHA512 f690ae69d38b8e9c73ef095e9779364c7c5ccd246b19e8f5ce2edde47861e44c0aedabc75bcf11f5b408e034e52190dc8ed1789b503284f8f68dc1f5e84e1712
-DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
-EBUILD apt-cacher-ng-3.5_p3.ebuild 2449 BLAKE2B 71da549cdea5abb9a301aeeee78b8c9507d833fbdd545b747f75fab9684f02f8934be2ddbf6de1d66ba82de5ec180fd82a630280b4e452ca674ab02bba7cc814 SHA512 e04544ab9969f7384893efdc68220c0293ebaf38eb7da085b55bbbc154fad4a4d3710f7a283c0ca2021daf70058fe342943d2fd29c1a38a7dc820f715006fbd1
+DIST apt-cacher-ng_3.6.orig.tar.xz 331300 BLAKE2B 6c3e118e2b2d79492d6b33f1a40fd9e4aa963e90141706b84603e69551e37f99a813d59c564d442b38eea2ba3b115913d767c9a97da0b08b5efe8bfe2b657acf SHA512 6f58afe10d9e5adb036ca2de67cf017415623dc0552ed60a64967ac248a1cc44be87fd9ddf8905a16d347bd1367425a46316ae6cd4fdc2f1e94f668b59dae63e
+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 514 BLAKE2B fc89f43d55b9d0d2250522ffa3704a51e336a9c7ec13b928ec483be4da6cf01edd7ab11bdd6e2ede0b1203eef2682270479e1703822849f50c2ccbc32cc0502f SHA512 fe3e1774feb81e61d22f56d6095d7d6caaaecadccda26812c4677c02470e0a6528c474a53ec73615abd5ecd22d4410991d0ce01b7f1177b92fccfd8cca3cf0a7
+MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
index 56294639238b..ce6af89f9fa7 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6_p1.ebuild
@@ -8,13 +8,12 @@ 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
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+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 tcpd"
+IUSE="doc fuse systemd tcpd"
 
 DEPEND="acct-user/apt-cacher-ng
 	acct-group/apt-cacher-ng
@@ -23,6 +22,7 @@ DEPEND="acct-user/apt-cacher-ng
 	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}
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-3.3.1-flags.patch"
 	"${FILESDIR}/${PN}-3.5-perl-syntax.patch"
-	"${WORKDIR}/debian/patches/debian-changes"
+	"${FILESDIR}/${PN}-3.6-optional-systemd.patch"
 )
 
 S="${WORKDIR}/${P/_*}"
@@ -47,6 +47,7 @@ src_prepare() {
 		-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
 }
 
@@ -54,22 +55,21 @@ src_configure() {
 	local mycmakeargs=(
 		"-DHAVE_FUSE_25=$(usex fuse)"
 		"-DHAVE_LIBWRAP=$(usex tcpd)"
-		# Unconditionally install systemd service file
-		"-DSDINSTALL=1"
+		"-DSDINSTALL=$(usex systemd)"
 	)
 
-	if tc-ld-is-gold; then
-		mycmakeargs+=( "-DUSE_GOLD=yes" )
-	else
-		mycmakeargs+=( "-DUSE_GOLD=no" )
-	fi
-
 	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}"
 
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.6-optional-systemd.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.6-optional-systemd.patch
new file mode 100644
index 000000000000..944802015e59
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.6-optional-systemd.patch
@@ -0,0 +1,62 @@
+commit f73ba7b31712c1c5543da5a6dab554cac48d2904
+Author: John Helmert III <jchelmert3@posteo.net>
+Date:   Fri Feb 19 10:59:51 2021 -0600
+
+    Make systemd fully optional
+    
+    Avoid linking to systemd without SDINSTALL set. Unconditionally install
+    systemd files with SDTYPE=notify because <systemd-209 is long gone.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c99864..5bafc45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -228,14 +228,16 @@ CHECK_CXX_SOURCE_COMPILES("${TESTSRC}" HAVE_PREAD)
+ FILE(READ ${TESTKITDIR}/HAVE_DAEMON.cc TESTSRC)
+ CHECK_CXX_SOURCE_COMPILES("${TESTSRC}" HAVE_DAEMON)
+ 
+-pkg_check_modules(lsd "libsystemd>=209")
+-# either part of the big library nowadays or in the helper library on older systems
+-if(NOT lsd_FOUND)
+-pkg_check_modules(lsd libsystemd-daemon)
++if(SDINSTALL)
++	pkg_check_modules(lsd "libsystemd>=209")
++	# either part of the big library nowadays or in the helper library on older systems
++	if(NOT lsd_FOUND)
++	pkg_check_modules(lsd libsystemd-daemon)
++	endif()
++	_append(CFLAGS_DAEMON ${lsd_CFLAGS})
++	_append(LDFLAGS_DAEMON ${lsd_LDFLAGS})
++	set(HAVE_SD_NOTIFY ${lsd_FOUND})
+ endif()
+-_append(CFLAGS_DAEMON ${lsd_CFLAGS})
+-_append(LDFLAGS_DAEMON ${lsd_LDFLAGS})
+-set(HAVE_SD_NOTIFY ${lsd_FOUND})
+ 
+ SET(CMAKE_REQUIRED_LIBRARIES dl)
+ FILE(READ ${TESTKITDIR}/HAVE_DLOPEN.cc TESTSRC)
+diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
+index 850f9b8..6ba333f 100644
+--- a/systemd/CMakeLists.txt
++++ b/systemd/CMakeLists.txt
+@@ -1,17 +1,10 @@
+ cmake_minimum_required(VERSION 3.1)
+ 
+ unset(SDTYPE)
+-if(HAVE_SD_NOTIFY)
+-	set(SDTYPE notify)
+-else()
+-	set(SDTYPE simple)
+-endif()
++set(SDTYPE notify)
+ CONFIGURE_FILE(apt-cacher-ng.service.in apt-cacher-ng.service)
+ CONFIGURE_FILE(apt-cacher-ng.conf.in apt-cacher-ng.conf)
+ unset(SDTYPE)
+ 
+-# this is experimental and is supposed to match LSB
+-if(SDINSTALL)
+-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tmpfiles.d/)
+-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.service DESTINATION /lib/systemd/system)
+-endif()
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/tmpfiles.d/)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apt-cacher-ng.service DESTINATION /lib/systemd/system)
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
deleted file mode 100644
index 8fe769ada328..000000000000
--- a/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,15 +114,6 @@
- 
- if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(USE_LTO_DEFAULT off)
--else()
--   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
--   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
--   if(GC_SECTIONS)
--           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
--           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
--           _append(CMAKE_SHARED_LINKER_FLAGS -Wl,--gc-sections)
--   endif()
--   set(CMAKE_REQUIRED_FLAGS "")
- endif()
- 
- option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 453387392cc2..70b0627d8086 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-			<email>jchelmert3@posteo.net</email>
-			<name>John Helmert III</name>
-	</maintainer>
-	<maintainer type="project">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
 	</maintainer>
 	<use>
 		<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 4edc76549e6e..f5c2e1320748 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,7 +1,3 @@
-AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
-AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
-DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 DIST aria2-1.35.0.tar.xz 1534460 BLAKE2B fc207ad0054e211b79ee1c6302c6bf83d0638fd5659d19dbd63d7cfb31101feb7d1a661b989ec42552c9a5c072dd660d2f7203063c3c1e14f53d5ce4c5a3c317 SHA512 82b49cecd61064ae33b4a422a2320d533f54afea8fab0f014072a46afdc05972d2e9c603e843960c097410adf87290df65849f4ee05e047403618ae50db151ef
-EBUILD aria2-1.34.0-r2.ebuild 5021 BLAKE2B 0ecbf5266128c9a48b44f2ca436586a88a15dcb7b631815522b936134e031a00616d9c5d798250b20652bd1b28ff7302800fc62ddf792339851e55d75d0a9930 SHA512 eb66d6bd33872e0b65f5be17819ca9c6deed57c29e07c1ff403a14afd4e35d0830fb669469122ea61fccb960745e476820bc2ff16548c302b59cd78e9196e2d6
-EBUILD aria2-1.35.0.ebuild 5076 BLAKE2B 956267a42993045c8ebe7cfcd1dd368c68d0ff5e550542587b8a34a388232ff0a1d4ebc052540535c235f190119e042fadcfb8b05e9334115ccc2b03c6815db2 SHA512 f7a9ae3691589c7dff989f719de562aeddc75ee19c5c598ed45223ad259114dfb4215010ea31014e832d1bd6db05833146b031686c0add72415ee97fc7cdabd8
+EBUILD aria2-1.35.0.ebuild 5074 BLAKE2B 775f7d972e19016a586fda1f381803908d7f6ba0ab9631b0521653a92171c5e39b427f83f008c50dd33302920aab53aa0aa1e4417991248ff66a3889d0c5b8a2 SHA512 c94f8e082089352bc4bd3a331e485aa8776ec623f31ad29f22726f645c014bed2271ae870df9621e6fce036f0362f021c7c1ddfecf4edcfa4fbc5ded5d08808d
 MISC metadata.xml 1325 BLAKE2B d958c3669bbebc969e706f70ea93d91f2068d19fe117d4112a818f711e0b3d421f35d67ad303ad856d6abf87b3f85ae0be17c487afef9df48f0a47264aa390e8 SHA512 668bea0c2d30e3fb10131a9ea0a9ba860cccfed7d5e810d165cc01d0ae9bb5d49653cba5aabe1cf5eb42bfbc1759198a82bec63e205a2c0dc05e4f93fac0d696
diff --git a/net-misc/aria2/aria2-1.34.0-r2.ebuild b/net-misc/aria2/aria2-1.34.0-r2.ebuild
deleted file mode 100644
index ec3bc5903b47..000000000000
--- a/net-misc/aria2/aria2-1.34.0-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-# Crazy GnuTLS/OpenSSL/etc. logic below:
-# 1. Those libraries are used for two purposes: TLS & MD.
-# 2. Upstream preferences are:
-#    1) gnutls [tls]
-#    2) !gnutls? -> openssl [tls+md]
-#    3) !openssl? -> nettle [md]
-#    4) !openssl? !nettle? -> gcrypt [md]
-#    5) !*? -> bundled md routines (we don't use them)
-# 3. There's also gmp usage for bittorrent with nettle.
-# 4. You can't really control features, just dependencies.
-# (we are skipping native Apple/Windows TLS support)
-#
-# We map this into:
-# ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
-# !ssl? -> nettle || libgcrypt
-
-CDEPEND="sys-libs/zlib:0=
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( >=dev-libs/libuv-1.13:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? (
-			>=net-libs/gnutls-1.2.9:0=
-			nettle? (
-				>=dev-libs/nettle-2.4:0=
-				bittorrent? (
-					>=dev-libs/nettle-2.4:0=[gmp]
-					>=dev-libs/gmp-6:0=
-				)
-			)
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
-		)
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	!ssl? (
-		nettle? (
-			>=dev-libs/nettle-2.4:0=
-			bittorrent? (
-				>=dev-libs/nettle-2.4:0=[gmp]
-				>=dev-libs/gmp-6:0=
-			)
-		)
-		!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-make_unique.patch
-	# https://bugs.gentoo.org/674622 (CVE-2019-3500)
-	eapply "${FILESDIR}"/${P}-mask-headers.patch
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# See TLS/MD logic described above deps.
-	if use ssl && ! use gnutls; then
-		# 1. if ssl & !gnutls, use openssl and disable gnutls
-		myconf+=( --without-gnutls --with-openssl )
-	else
-		myconf+=(
-			# 2. otherwise, disable openssl
-			--without-openssl
-			# 3. if ssl & gnutls, use gnutls
-			$(use_with ssl gnutls)
-
-			# 4. switch between nettle & libgcrypt
-			$(use_with nettle libnettle)
-			$(use_with !nettle libgcrypt)
-		)
-
-		# 5. if bittorrent is used along with nettle, use libgmp
-		if use bittorrent && use nettle; then
-			myconf+=( --with-libgmp )
-		else
-			myconf+=( --without-libgmp )
-		fi
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/aria2/aria2-1.35.0.ebuild b/net-misc/aria2/aria2-1.35.0.ebuild
index a1e3b996fae8..49c783dfe046 100644
--- a/net-misc/aria2/aria2-1.35.0.ebuild
+++ b/net-misc/aria2/aria2-1.35.0.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"
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
 # xmlrpc has no explicit switch, it's turned out by any XML library
diff --git a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch b/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
deleted file mode 100644
index 448d6cfe7753..000000000000
--- a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e8e04d6f22a507e8374651d3d2343cd9fb986993 Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Thu, 17 May 2018 18:39:44 +0900
-Subject: [PATCH] Fix build failure when InternalDHKeyExchange is used
-
----
- src/bignum.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/bignum.h b/src/bignum.h
-index e59ab6bbf..5fb4402bc 100644
---- a/src/bignum.h
-+++ b/src/bignum.h
-@@ -19,6 +19,8 @@
- #include <memory>
- #include <stdint.h>
- 
-+#include "a2functional.h"
-+
- namespace bignum {
- 
- template <size_t dim> class ulong {
-@@ -31,17 +33,17 @@ template <size_t dim> class ulong {
-   std::unique_ptr<char_t[]> buf_;
- 
- public:
--  inline ulong() : buf_(make_unique<char_t[]>(dim)) {}
--  inline ulong(size_t t) : buf_(make_unique<char_t[]>(dim))
-+  inline ulong() : buf_(aria2::make_unique<char_t[]>(dim)) {}
-+  inline ulong(size_t t) : buf_(aria2::make_unique<char_t[]>(dim))
-   {
-     memcpy(buf_.get(), (char_t*)&t, sizeof(t));
-   }
--  inline ulong(const ulong<dim>& rhs) : buf_(make_unique<char_t[]>(dim))
-+  inline ulong(const ulong<dim>& rhs) : buf_(aria2::make_unique<char_t[]>(dim))
-   {
-     memcpy(buf_.get(), rhs.buf_.get(), dim);
-   }
-   explicit inline ulong(const char_t* data, size_t size)
--      : buf_(make_unique<char_t[]>(dim))
-+      : buf_(aria2::make_unique<char_t[]>(dim))
-   {
-     if (size > dim) {
-       throw std::bad_alloc();
diff --git a/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch b/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch
deleted file mode 100644
index 694681d88859..000000000000
--- a/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 37368130ca7de5491a75fd18a20c5c5cc641824a Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Sat, 5 Jan 2019 09:32:40 +0900
-Subject: [PATCH] Mask headers
-
----
- src/HttpConnection.cc | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
-index 77cb9d27a..be5b97723 100644
---- a/src/HttpConnection.cc
-+++ b/src/HttpConnection.cc
-@@ -102,11 +102,17 @@ std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
-   std::string result;
-   std::string line;
-   while (getline(istr, line)) {
--    if (util::startsWith(line, "Authorization: Basic")) {
--      result += "Authorization: Basic ********\n";
-+    if (util::istartsWith(line, "Authorization: ")) {
-+      result += "Authorization: <snip>\n";
-     }
--    else if (util::startsWith(line, "Proxy-Authorization: Basic")) {
--      result += "Proxy-Authorization: Basic ********\n";
-+    else if (util::istartsWith(line, "Proxy-Authorization: ")) {
-+      result += "Proxy-Authorization: <snip>\n";
-+    }
-+    else if (util::istartsWith(line, "Cookie: ")) {
-+      result += "Cookie: <snip>\n";
-+    }
-+    else if (util::istartsWith(line, "Set-Cookie: ")) {
-+      result += "Set-Cookie: <snip>\n";
-     }
-     else {
-       result += line;
-@@ -154,8 +160,8 @@ std::unique_ptr<HttpResponse> HttpConnection::receiveResponse()
-   const auto& proc = outstandingHttpRequests_.front()->getHttpHeaderProcessor();
-   if (proc->parse(socketRecvBuffer_->getBuffer(),
-                   socketRecvBuffer_->getBufferLength())) {
--    A2_LOG_INFO(
--        fmt(MSG_RECEIVE_RESPONSE, cuid_, proc->getHeaderString().c_str()));
-+    A2_LOG_INFO(fmt(MSG_RECEIVE_RESPONSE, cuid_,
-+                    eraseConfidentialInfo(proc->getHeaderString()).c_str()));
-     auto result = proc->getResult();
-     if (result->getStatusCode() / 100 == 1) {
-       socketRecvBuffer_->drain(proc->getLastBytesProcessed());
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 77038fba587f..84953a92b388 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,6 +1,4 @@
 AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82
-DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
-EBUILD bfgminer-5.4.2.ebuild 5051 BLAKE2B 9d00b36077d11bb18eb719e7b8d2addb77bf3bdb737ed8d0317f96e89106ccbe8363a166a18b487f6df5903c35b0eadd4b21116b037d5c61a38f8beebb894949 SHA512 a68f64e7151bca5a3213b917e9bbb755dff0004ae9c5a6a2f6c4dcda7194bae5a504f41492f1a5f8d3f860b9bd585783718351d92329815e504a69a888cf4461
-EBUILD bfgminer-5.5.0.ebuild 5170 BLAKE2B 6ecd2bd4c5ed8fb7037244d990f57402ba3fc1aceb9104ddddeefc4da3c371948bb8ba5f2d97df3ac1c761864f0b9b1247303cbb88a4a478ac65e38e3962d26f SHA512 c679f140eeb9adc18a5d23f04ae031f5dccd03152e8a750fe9e771889ca768826fd3a29c51c8444e0399fe5e97f49416112ca802d91950a26622594425f00eb1
-MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21
+EBUILD bfgminer-5.5.0.ebuild 5168 BLAKE2B ab41b6d6c181cce98314d227ca389d3e3d05e65b93dee4704b8cd975aec4b8ab79990c418be2bda61912de22cc612833ce0d811e16817890e59144e292782b1e SHA512 420efee89dbc369305a111c28562180008096868c3e46a30618c27978f39d247dce3e253ef14c3a4c61259380df8f19f06e426926b473badef70bef0302b7915
+MISC metadata.xml 3948 BLAKE2B 90fec0d1ed8355c7e762057e82097b2446e4ffec901cfeac88bfc556e6c4fff6eea5fbaf3bb74ad381017b0a7b68324e388e3dae8af77b630ea02c9df7d12ff8 SHA512 25ef458905a4350d93c4bd29e5b60116c25765701fd4d3e7bc46593f1b33c51aba8336e346a026ca60d1e6c71eb8c9d4780a805e1dfc87688d00dc54152b5455
diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
deleted file mode 100644
index bcef66c8d23d..000000000000
--- a/net-misc/bfgminer/bfgminer-5.4.2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-
-# TODO: knc (needs i2c-tools header)
-# TODO: kncasic & titan (need systemwide knc-asic install)
-# TODO: minergate (needs actual miner_gate)
-IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
-REQUIRED_USE='
-	|| ( keccak scrypt sha256d )
-	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
-	adl? ( opencl )
-	antminer? ( sha256d )
-	avalon? ( sha256d )
-	avalonmm? ( sha256d )
-	bfsb? ( sha256d bitfury )
-	bfx? ( sha256d bitfury libusb )
-	bifury? ( sha256d )
-	bigpic? ( sha256d bitfury )
-	bitforce? ( sha256d )
-	bitfury? ( sha256d )
-	cointerra? ( sha256d )
-	drillbit? ( sha256d bitfury )
-	dualminer? ( || ( sha256d scrypt ) icarus )
-	gridseed? ( scrypt )
-	hashbuster? ( sha256d bitfury )
-	hashbuster2? ( sha256d bitfury libusb )
-	hashfast? ( sha256d )
-	icarus? ( || ( scrypt sha256d ) )
-	jingtian? ( sha256d )
-	keccak? ( || ( cpumining opencl proxy ) )
-	klondike? ( sha256d libusb )
-	littlefury? ( sha256d bitfury )
-	lm-sensors? ( opencl )
-	metabank? ( sha256d bitfury )
-	minion? ( sha256d )
-	modminer? ( sha256d )
-	nanofury? ( sha256d bitfury )
-	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
-	sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
-	twinfury? ( bitfury )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-	rockminer? ( sha256d )
-	twinfury? ( sha256d )
-	x6500? ( sha256d libusb )
-	zeusminer? ( scrypt icarus )
-	ztex? ( sha256d libusb )
-'
-
-DEPEND='
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses:=[unicode?]
-	)
-	>=dev-libs/jansson-2
-	dev-libs/libbase58
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	hashbuster? (
-		dev-libs/hidapi
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lm-sensors? (
-		sys-apps/lm-sensors
-	)
-	nanofury? (
-		dev-libs/hidapi
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-	screen? (
-		app-misc/screen
-		|| (
-			>=sys-apps/coreutils-8.15
-			app-misc/realpath
-		)
-	)
-'
-RDEPEND="${DEPEND}
-	opencl? (
-		|| (
-			virtual/opencl
-			dev-util/nvidia-cuda-sdk[opencl]
-		)
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.7
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -no-pie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable adl) \
-		$(use_enable antminer) \
-		$(use_enable avalon) \
-		$(use_enable avalonmm) \
-		$(use_enable bifury) \
-		$(use_enable bitforce) \
-		$(use_enable bfsb) \
-		$(use_enable bfx) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cointerra) \
-		$(use_enable cpumining) \
-		$(use_enable drillbit) \
-		$(use_enable dualminer) \
-		$(use_enable gridseed) \
-		$(use_enable hashbuster) \
-		$(use_enable hashbuster2 hashbusterusb) \
-		$(use_enable hashfast) \
-		$(use_enable icarus) \
-		$(use_enable jingtian) \
-		$(use_enable keccak) \
-		$(use_enable klondike) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable minion) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable rockminer) \
-		$(use_enable scrypt) \
-		$(use_enable sha256d) \
-		$(use_enable twinfury) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm-sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable zeusminer) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-	if ! use screen; then
-		rm "${D}/usr/bin/start-bfgminer.sh"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index e58b26ba420d..1ecd48c23a11 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> $
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 
 # TODO: knc (needs i2c-tools header)
 # TODO: kncasic & titan (need systemwide knc-asic install)
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index 0a9f60a01dab..738a929a1b2a 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="adl">Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag>
 		<flag name="alchemist">Enable support for mining with AlcheMist</flag>
-		<flag name="antminer">Enable support for mining with AntMiner U1 sticks</flag>
 		<flag name="avalon">Enable support for mining with Avalon 1 ASIC modules</flag>
 		<flag name="avalonmm">Enable support for mining with Avalon 2/3 ASIC modules</flag>
 		<flag name="bifury">Enable support for mining with Bi*fury USB sticks</flag>
diff --git a/net-misc/casync/Manifest b/net-misc/casync/Manifest
index dbc8496fd5c4..05512607903c 100644
--- a/net-misc/casync/Manifest
+++ b/net-misc/casync/Manifest
@@ -1,3 +1,3 @@
 DIST casync-2_p20190407.tar.gz 1315643 BLAKE2B 2cb52682d14a06844bb6d08d9c20d3e356fc40f464463151adee7c0446b64ba106ed29873d71d757452b3dd81095efb1b5d1014b294d58724e4c70bf404b47c2 SHA512 973b4cec8289e1223eced5794d5f6e7af25c60bd52d3c8932005ad0b55aebbebba78d5514ef7be4b3b92a76915d6e3f56bd53d797c2d72ffde2bba98f926bd3a
 EBUILD casync-2_p20190407.ebuild 995 BLAKE2B ca87f5cb5977c4501534e62ee14caa606ebe55c0c5e962d9704479c3802c70add18676b024351fd1126e77550e50e119819f9924cc8dae6a85229f2696478df2 SHA512 3339d37c9b73a11250fd0201f62e95433360244c426c49088bf4480b6e5744dcca2d5339d499d0fa06ba6c7d2d87347e5707412d29a4a9f7d1b8834a2750bc21
-MISC metadata.xml 673 BLAKE2B 7e68de16fb965f49e96df59d7c52062759e021dec76904a64d829aed80578847b268e2c948df7cd1fc8c674789f4671a344e5f91ab36ed10b9fc49b41a5a9e75 SHA512 36681a585c036c549e1c71019ee179eea6dfa921ac68b219b7aa55da1e677d0aeb8082f6e5866fef831d5d8c77626e700a0c75a1a7984a6cb2aea7089ac26e89
+MISC metadata.xml 619 BLAKE2B 581feb2dd203fbd6b9c01018f7471c257d45a5a1a8bccacd3a29ed5781bb24b88d42d14948e6c8b4d9518b91b639f197601de9f63ae9b46261378952f607b6b4 SHA512 184753b356a27654f2b0515ff4e9079d053406e7be78269064151914a09540dc5a8e8ca06b3cad43a6ef35168475f8b11005cd4ab0bd2b0919fc6bd12f86a354
diff --git a/net-misc/casync/metadata.xml b/net-misc/casync/metadata.xml
index 0a6e55e76e12..c18a20c803dd 100644
--- a/net-misc/casync/metadata.xml
+++ b/net-misc/casync/metadata.xml
@@ -15,7 +15,6 @@
 	</maintainer>
 	<use>
 		<flag name="fuse">Enable fuse support</flag>
-		<flag name="man">Build and install man pages</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">systemd/casync</remote-id>
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 41c9445dea3c..bb6b0aebbaa1 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -2,7 +2,9 @@ AUX cni-dhcp.initd 376 BLAKE2B 5fe40f28773ffbb12416b40e3813578d28787e9ee26ec4a62
 DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8
 DIST cni-plugins-0.8.7.tar.gz 1965945 BLAKE2B 592b1f126547363877c657e03d69fcb25874e6d472d731861a1a03e3933901bd618a5097f3d91f6ca7fbedce29a0ff0076a65be1a528a2584a7dcb5940a4b010 SHA512 1b11b080b1f54a8a792b1048573d7d882603b76929f0c9343eeb2e010f97700c0deea4489faeb493a1aeac12557b6847b26784c378d0430c47de6bdaca6aa70f
 DIST cni-plugins-0.9.0.tar.gz 2705022 BLAKE2B 82f723501901da40e4ea2f111bd1ed3023a1d11e1715902830f3cd0cf0d46d9f9c57389b3a763448fcd52c40aba97a731986ca1862e2ecd912e8a274abf626c9 SHA512 8d545d17e6bf4180755708e47607c855b99f6ea4183a33930b7d05974d2151c90873f1e2064b806059a26caba6942502d9954fce697bf000995d539c2208811c
+DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b34d80705d3a336573401743392adca9a57b196d6d191b4a6f281110f47ecbb1525aacd91cd488bea61c7aaed12a6ef SHA512 24e8fcedbff2ae7a83aa96085b546b164de6a0884d593e3b5386e9d2de3c4d9a215db9e9405332020cc45c371709a32b600e263e4f8dee62c51adafdc0180f24
 EBUILD cni-plugins-0.8.6.ebuild 887 BLAKE2B 22a40a3a3e6269454c8393f45af4c03fb75d100f1976a89b58e56ee3add1e22d4b60aa4858bc49bdf663369df1f5ffe77e49b727df65efa8aec31e81cf46e917 SHA512 64f51abba277243b73f48e14abfeca29c6c68a1c74acd2023c58c27608ce7b7257102380926bfd982661325b668eb9ae3532cf2e1b64b80fc3a1c70603f19e8a
 EBUILD cni-plugins-0.8.7.ebuild 888 BLAKE2B 79bf0e6b70ca215ab02e203393dc0d1da9fbe67f5e1b2553fdda95a65083a5e974560e513d29c633a95b6823700052ed516efdb206b7ef87fd850dde26696a36 SHA512 2e183a9fd0587c39803d63eeaf25a04441776ddd993ce2b94167e0bf024c41b333ab4336670dc3ede154b4ac0983c6e8e59fa186378c19661d64cea4f4adad96
 EBUILD cni-plugins-0.9.0.ebuild 936 BLAKE2B d59052c6ac0291afc86987e72fad3b6dafb0abae2d452147d50884a9956830e35b7acc5b771bef4b6f9968b1d7b7918480b60417118232b4c7fdf34c5c1de2db SHA512 71e599ad2edccd2d18f86ac9d8c63b2cb28c39db2539714211d8a5fafb7781b8adb3811058b536bdd819fe97cc30763ce8c6065906aff1193fdcf3575c03a5af
+EBUILD cni-plugins-0.9.1.ebuild 936 BLAKE2B d59052c6ac0291afc86987e72fad3b6dafb0abae2d452147d50884a9956830e35b7acc5b771bef4b6f9968b1d7b7918480b60417118232b4c7fdf34c5c1de2db SHA512 71e599ad2edccd2d18f86ac9d8c63b2cb28c39db2539714211d8a5fafb7781b8adb3811058b536bdd819fe97cc30763ce8c6065906aff1193fdcf3575c03a5af
 MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
new file mode 100644
index 000000000000..3ef070097fe8
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
+}
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index bab3b80256b7..d764cf8f4ad4 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,4 +1,3 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003-r1.ebuild 946 BLAKE2B 2e7765dc6f6b307c9b20a08936e2ea6f00ee17032a4eef1f7191e515b330a88b218b1ab6f61f95e275868d93543cf4e97a6a0d7fdc4e1f10f5b3f206c90dd01e SHA512 1093fb87db31fb8da7a84d820eb7f2986d2abe9580684ccf173d9f168587775a0091304bb9a0337608fcce3e156e5df912cf1ab1ce2541e1f7605b41357ab26c
 EBUILD connman-notify-0_pre20191003-r2.ebuild 947 BLAKE2B e35b01aaff21a376caeafe9eb750cccc6594ed80ca06bbac27aa1a447fbb487f722a798b5cfb2dd7f34d568a2bd1d236297f28c0c96d4639b085c57979e850bf SHA512 e49827a6f26fe43145de0acbc0c8985c5b685a8c47c4e21bfd33302c5c6e6d43fb24ecf0ce0c56b765c9f197146af156c9b06340ff779a4e7a356ab55c34f98d
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild
deleted file mode 100644
index bb0142733fa5..000000000000
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit desktop python-single-r1 vcs-snapshot
-
-MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
-
-DESCRIPTION="Desktop notification integration for connman"
-HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
-SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
-
-EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	net-misc/connman
-	virtual/notification-daemon"
-
-src_install() {
-	python_fix_shebang ${PN}
-	dobin ${PN}
-	dodoc README.rst
-
-	make_desktop_entry ${PN} ${PN} ${PN} Network
-}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 5de79f2f0467..01bb6e4cb8b4 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,9 +1,7 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
-DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4
 DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764
-EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70
 EBUILD connman-1.39-r1.ebuild 2751 BLAKE2B 49d7e875a9ae05a837c328296539b0e22453d795609c257ef6783fc98e8319cfec57fa0837e1ee4373a74c81391f8fa1f7a573a776ba126ac7c073391a25001a SHA512 5a6f306112ec1d1110c78ee7abc12e8638b38e770a593672486175ab881f1c89e8f6d4c43e6e26c417971e2c212b4fe526d82d59811fa1b4b2ccb2fb567a9c50
-EBUILD connman-1.39.ebuild 2723 BLAKE2B 1aa2e2c8d2403d90e90cdc4c6aeb101d4a1a2d76e20c7cfc04af49e4f63f5361b2891b4182c3c7921b5b64ed6426ad90af0d5848e6bfb564700d074725b1fe97 SHA512 f8d8b5fc12168bf811e5b5e88dfd4f545f096598af3c8b6fdda0464ca607ecc344951662bc5fef5c42efdad1a8d7f1b0af44f844178a94f3ebcd73bdaa2cb7a3
+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.38.ebuild b/net-misc/connman/connman-1.38.ebuild
deleted file mode 100644
index d2079bf83776..000000000000
--- a/net-misc/connman/connman-1.38.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit autotools systemd tmpfiles
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
-+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
-wispr"
-
-REQUIRED_USE="^^ ( iptables nftables )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	sys-libs/readline:0=
-	bluetooth? ( net-wireless/bluez )
-	iptables? ( >=net-firewall/iptables-1.4.8 )
-	iwd? ( net-wireless/iwd )
-	l2tp? ( net-dialup/xl2tpd )
-	nftables? (
-		>=net-libs/libnftnl-1.0.4:0=
-		>=net-libs/libmnl-1.0.0:0= )
-	ofono? ( net-misc/ofono )
-	openconnect? ( net-vpn/openconnect )
-	openvpn? ( net-vpn/openvpn )
-	policykit? ( sys-auth/polkit )
-	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-vpn/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
-	wireguard? ( >=net-libs/libmnl-1.0.0:0= )
-	wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-systemdunitdir=$(systemd_get_systemunitdir) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable debug) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable examples test) \
-		$(use_enable iwd) \
-		$(use_enable l2tp l2tp builtin) \
-		$(use_enable networkmanager nmcompat) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openconnect openconnect builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable pptp pptp builtin) \
-		$(use_enable tools) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable wireguard) \
-		$(use_enable wispr wispr builtin) \
-		--with-firewall=$(usex iptables "iptables" "nftables" ) \
-		--disable-iospm \
-		--disable-hh2serial-gps
-}
-
-src_install() {
-	default
-	dobin client/connmanctl
-
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	keepdir /usr/lib/${PN}/scripts
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
-}
diff --git a/net-misc/connman/connman-1.39.ebuild b/net-misc/connman/connman-1.39.ebuild
index da08cdcd928c..d37b4b33e953 100644
--- a/net-misc/connman/connman-1.39.ebuild
+++ b/net-misc/connman/connman-1.39.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 89ab69d38666..3f61729eeffc 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,5 +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 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,12 +25,17 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c
 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
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+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
@@ -44,8 +50,12 @@ DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.6.mod 256 BLAKE2B 70fa2325354d
 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
@@ -61,9 +71,14 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-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%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
@@ -72,16 +87,23 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201113135734-0a15ea8d9b02.mod 33 BLAKE
 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%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
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -92,4 +114,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 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
 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-8.6.8.ebuild b/net-misc/croc/croc-8.6.8.ebuild
new file mode 100644
index 000000000000..59a35fdce545
--- /dev/null
+++ b/net-misc/croc/croc-8.6.8.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Easily and securely send things from one computer to another"
+HOMEPAGE="https://github.com/schollz/croc"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.5"
+	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denisbrodbeck/machineid v1.0.1"
+	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
+	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
+	"github.com/kalafut/imohash v1.0.0"
+	"github.com/kalafut/imohash v1.0.0/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"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/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/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"
+	"github.com/schollz/cli/v2 v2.2.1"
+	"github.com/schollz/cli/v2 v2.2.1/go.mod"
+	"github.com/schollz/logger v1.2.0"
+	"github.com/schollz/logger v1.2.0/go.mod"
+	"github.com/schollz/mnemonicode v1.0.1"
+	"github.com/schollz/mnemonicode v1.0.1/go.mod"
+	"github.com/schollz/pake/v2 v2.0.6"
+	"github.com/schollz/pake/v2 v2.0.6/go.mod"
+	"github.com/schollz/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"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210222171744-9060382bd457"
+	"golang.org/x/net v0.0.0-20210222171744-9060382bd457/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d"
+	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3/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"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/tylerb/is.v1 v1.1.2"
+	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	)
+go-module_set_globals
+
+SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	acct-group/croc
+	acct-user/croc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-network-tests.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	# Replace User=nobody with User=croc
+	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
+	# Rename bash completion function
+	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
+		src/install/bash_autocomplete || die
+}
+
+src_compile() {
+	go build || die
+}
+
+src_install() {
+	dobin croc
+	systemd_dounit croc.service
+	newbashcomp src/install/bash_autocomplete croc
+	einstalldocs
+}
+
+src_test() {
+	go test -work ./... || die
+}
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 816d773b7d08..25100d9f3396 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -23,9 +23,6 @@ AUX dhcrelay4.service.conf 105 BLAKE2B 52ad8018d2b6fd47b5d752a6e6626a8fa6c1d21fa
 AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd53dc30a25aad02f5332f538bc9d6ca65b5d388ff83f0ee30358d56cefa440fe7f5b8a6678521ba6b SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
-DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
-EBUILD dhcp-4.4.1.ebuild 7903 BLAKE2B 6ecca7fb6bec01270e230aeaa3b141c9cc092af4dd498a312e0f9785c3080b1069b2f9a0fbc8fa64442e4e416d42c45343eebac96ba7b2a22d8a7a0428e06787 SHA512 baf8324bfd80e5206ff27239825eb575b9bde687907bcf88341453d491135598580753400089ba6c5e92c639a8043032bc3ba6e7a16f78cc1f49e385b5203e3a
-EBUILD dhcp-4.4.2-r3.ebuild 8154 BLAKE2B 4088188226b1261b8356d84db315aefb7b19f6c2dee88234cf2f6e3d71f9b1a2ba2f35505417f0e73efb32e9faec2657214d27a925d89bba0e14f34da6ec8080 SHA512 acf8f516eea2e729121f0ec810827d27520a3f39b3aedf7a6b8abe26c1fd67db7770a416f7b7a7c765814fd9a8a2d092d7ad30262be96b134ca014595be47cdb
-EBUILD dhcp-4.4.2.ebuild 7930 BLAKE2B e4a9d780010707cf9f16816f29ccd1a9c0ebbf961bd89e6c05a1516a5a97c6900a3a04e6435ed4bd00bc8874dd126d6e87d95e1147933f72b1ae8deac2acc6dc SHA512 40b769fce9749bace22ebdabeabfaf44251b03a07bb8dd186c8af5238d1cbdd89a40e59205fac287f576b2fe5d2152371e7f1244c5d22daa2cf158d0814bc9df
+EBUILD dhcp-4.4.2-r3.ebuild 8286 BLAKE2B 0d46df0b0ece5bbd260f441009e38ddceddafea6cd2ce1a0664d5419b970ac574291da2384b05bc3255b6961c9b4dd7c0eafd18ee5b8baf0d56bf887d48465c8 SHA512 06d56902fe42c9cef5d7807dccb2e18c55483e87a98cd5762e235fd7354bac9a5d4f7444a8b4b0a3983c5eb8d46de2aeec0c45b994428cad2e72824908115089
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
deleted file mode 100644
index 52e3c8070bdb..000000000000
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
-
-DEPEND="
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl )
-		)
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${ED%/}"/usr/sbin/dhclient "${ED%/}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED%/}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED%/}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED%/}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT%/}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT%/}"${f} "${ED%/}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index b123e346e37a..2d8a36235b05 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
+inherit systemd toolchain-funcs flag-o-matic
 
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
@@ -162,6 +162,11 @@ src_configure() {
 	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
 	EOF
 
+	# https://bugs.gentoo.org/720806
+	if use ppc || use arm || use hppa; then
+		append-libs -latomic
+	fi
+
 	local myeconfargs=(
 		--enable-paranoia
 		--enable-early-chroot
@@ -170,6 +175,7 @@ src_configure() {
 		$(use_enable ipv6 dhcpv6)
 		$(use_with ldap)
 		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+		LIBS="${LIBS}"
 	)
 	econf "${myeconfargs[@]}"
 
diff --git a/net-misc/dhcp/dhcp-4.4.2.ebuild b/net-misc/dhcp/dhcp-4.4.2.ebuild
deleted file mode 100644
index 251ffeb42ec5..000000000000
--- a/net-misc/dhcp/dhcp-4.4.2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
-
-DEPEND="
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl )
-		)
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work - do NOT make "binddir" local!
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 59e9d8166bf1..c8f1f7371036 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,8 +1,6 @@
 AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
-DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
-EBUILD dropbear-2020.80-r2.ebuild 2727 BLAKE2B e85ffcaeb12d7f15a6ca744a643f6a6aa83400ea40fc2c7faf46d9feb3b5df26efb188792b52a5f6ba5a3cf36c0432c970a726be029e0dd82912270cfcaf1f72 SHA512 0042683e8de737d8b8d9fe96c1ed619785ed2dccb19cf8d646d15839a11bd4c8a9ae5417fb98d21aa9031292edd5ac7ea97492deae119a9c9483f42980f645bd
-EBUILD dropbear-2020.81-r2.ebuild 2966 BLAKE2B 4ed298b8a4f86391fd86b3a8105315ed8f47ddf94fd40bcac8a0edad21fe0d2119d26107f30568278a0f14093dfe1041090a6ccc76c6ea910fe65e5f8866ecb1 SHA512 17f3223cf8f868f2490876255c0569517fdb957d6c5573a7e9608be1a5b230f7705aaf17d4f55fcffa9810e4a669786485c88cc6c1dc3e77a72f97c0449c5d2f
+EBUILD dropbear-2020.81-r2.ebuild 2963 BLAKE2B 471b9c68b23258721d15e6a1f02dc326d347839303b449355b8f9f0de3d36f28a75c3c9a01300166fdb36d568ba30c5321b5e37cbf647d8f4f406d5aef8058f7 SHA512 7b2770f6dd8eb3c4589913e1285cba21c893c1fba5a8d9ab7486cb606d13bfc9e75c3f53513f77c1b4ecae78906cebebacd39abe02c68188f992760b4e3e05f0
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2020.80-r2.ebuild b/net-misc/dropbear/dropbear-2020.80-r2.ebuild
deleted file mode 100644
index 8ae9dcf02790..000000000000
--- a/net-misc/dropbear/dropbear-2020.80-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig pam
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
-
-LIB_DEPEND="
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-	>=dev-libs/libtommath-1.2.0[static-libs(+)]
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.46-dbscp.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex minimal "" "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-	)
-}
-
-src_prepare() {
-	default
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i svr-authpam.c || die
-	restore_config localoptions.h
-}
-
-src_configure() {
-	# XXX: Need to add libtomcrypt to the tree and re-enable this.
-	#	--disable-bundled-libtom
-	# We disable the hardening flags as our compiler already enables them
-	# by default as is appropriate for the target.
-	local myeconfargs=(
-		--disable-harden
-		$(use_enable zlib)
-		$(use_enable pam)
-		$(use_enable !bsdpty openpty)
-		$(use_enable shadow)
-		$(use_enable static)
-		$(use_enable syslog)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin || die
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}" || die
-	fi
-	save_config localoptions.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	if use pam; then
-		pamd_mimic system-remote-login dropbear auth account password session
-	fi
-}
diff --git a/net-misc/dropbear/dropbear-2020.81-r2.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
index d193f9a8b62c..54c40455d06c 100644
--- a/net-misc/dropbear/dropbear-2020.81-r2.ebuild
+++ b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 969258bdd181..9771e0b9648b 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,8 +3,11 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 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
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-116.4.368.ebuild b/net-misc/dropbox/dropbox-116.4.368.ebuild
new file mode 100644
index 000000000000..a77b20f7a3b2
--- /dev/null
+++ b/net-misc/dropbox/dropbox-116.4.368.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index bcf7a22eece9..03b4a8401607 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1-r1.ebuild 694 BLAKE2B 3e11e938791e7fae9632c375965b220fc41726c1147bf9eab0b34ca9d4eb1e7cdd2aaf4cacb4630d5c2010a5b64fceeebbb63dfc1f721e7bc1f06f8deec05b58 SHA512 e41cd9b0d30ac16dbd11507f876a471fe5e04bee6353bdb407474519b74878b8c34f3621b5a7bf919d5b5615a979122f8e000b48e812a2a84bb15b3a8c644224
+EBUILD econnman-1.1-r2.ebuild 860 BLAKE2B d639b8be7ea94639c23caf7069f71df9ba45ea43781a6bd01a10438141291a6f655bc178184009481d180bd7ae9c6e1dbefb488ff6249f54a6bdd68949a5dffd SHA512 1b8b7f1ba5fc97ee63c486f377d2961eecb9f71e99944629db66e60bc440eff8dc8dbfac527bc27eee917d34c70c311eb89532bbde82ead9093a1ebe2b36729c
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r1.ebuild b/net-misc/econnman/econnman-1.1-r2.ebuild
index 6bf5c1d6b710..7ccef1ed1883 100644
--- a/net-misc/econnman/econnman-1.1-r1.ebuild
+++ b/net-misc/econnman/econnman-1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit python-single-r1
 
@@ -27,4 +27,7 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	default
 	python_fix_shebang econnman-bin.in
+	sed -e \
+		's/Categories=Network;Settings;Enlightenment;/Categories=Network;Settings;Dialup;Monitor;/g' \
+		-i data/desktop/econnman{.desktop,-agent.desktop} || die
 }
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index 1f9ccd09d30a..ed9a1636b918 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -2,5 +2,7 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 530 BLAKE2B fbf901cfc9133ed45afc1a7859c02926fbb8ad52db9429c10b29a4a5dd75d9e4b1387077ea21f075d6cf176e7b167127a9f344b24b126bde5d9445257ffe5780 SHA512 981f57845811ff3d528fe4ab69d75f547dc0189ebb842260d448407645e19fb16be6ceeb6d4a76e3d491fc98a8773588fbddf9b96b270365da48ed2eb82f8e36
 DIST electrum-ltc-3.3.4.1.tar.gz 3897254 BLAKE2B 113e4175adad0d404f9677913bd24cbda569f20183de75d341d60b954f0423ff13042e0b05f66f7953729368412fc181d2c8da7caee15899f6810cb77c4be241 SHA512 cab85edbe9189fffd2a4b8d57dd89dc55f68cf3f02cd4a7427c53de852ab2001b82b1484126699c8eee36d765a8ca58936eba82e3c153f654bf5629b9cd50745
+DIST electrum-ltc-4.0.9.1.tar.gz 4464915 BLAKE2B 2c328f9fc433f39b11aa2bfc4e397b75aadd07adc66576ae985c5b41b32d663df80bb67dafbbce210f3581f6fb43e666070d090bf189eb4907efd07d306fc945 SHA512 926ad16246d0609a787614b84cadfa893ed792ab2a54a3c0b9d707019e29874b1ae1c42dba098f34b61f915d85578809ff87dc9026c85563264a2d2b583c8823
 EBUILD electrum-ltc-3.3.4.1-r2.ebuild 3768 BLAKE2B fb66c7d244268308f0542a7a7adf751e4c6a935171543061844b7bdb680fc34ddf94c86411df838fc68856f09693b31926e9e78300d63f87ad460ea415891421 SHA512 3e4a96eccc774d679f8453d5ad733ac7a0a67c74d886b59ed6f3975548441e8a589a5216b90cadfae7ab2ae854a107c69d8356da88ac16ba32c0baa894e394ad
+EBUILD electrum-ltc-4.0.9.1.ebuild 3866 BLAKE2B 781548f9512eaaa0fff4eb1762b6fe9da24842aaa550625154dabf90487dbdad08c8c402c1b20d1cfadb351f38c0e2af347d6343f38f87f0dec67789083ad9f5 SHA512 8b9547a5a3a981e10ec407d2f426cde154bc3ff37b1e3c998c4efc4c26290dd069d578a27b06cbc04c221f58ce7dfa1cae5d47451e3d13442c1008fe8fdc128f
 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9
diff --git a/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild
new file mode 100644
index 000000000000..7cdd8f438e5b
--- /dev/null
+++ b/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+EGIT_COMMIT="${PV}"
+DESCRIPTION="Litecoin thin client"
+HOMEPAGE="https://electrum-ltc.org/"
+SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+	l10n_es l10n_ja l10n_pt-BR l10n_pt-PT l10n_zh-CN"
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# unbind aiorpcX dep
+	sed -e '/aiorpcx/s:,<0.19::' \
+		-i contrib/requirements/requirements.txt || die
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	if ! use qt5; then
+		sed "/'electrum_ltc.gui.qt',/d" -i setup.py || die
+	fi
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(usex l10n_es    '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "${PN}/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" ${PN/-/_}/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm ${PN/-/_}/gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN/-/_}/${PN} || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r ${PN/-/_}/plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 ${PN/-/_}/gui/icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index 5b4015ed617b..eb54a27b1d6d 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1,9 +1,14 @@
 AUX exabgp-4.2.10-ip-path.patch 794 BLAKE2B 54a55550f928eaa3c3a64e3c7e19acff21b71753255f6c3abfede6e2f3446417e7e99413d82d12e03fcc292802ec76ccf6e572c0af081c46351b7d15ebcd5970 SHA512 71568d0d6b11f427d795e3a47e7877fd7ea5c5708d49e51958ee5077758a5ca2af0272d8143a3cca506f07e010cf4e8875403dce1d8d366a171c2c9eb1c7ef6c
+AUX exabgp-4.2.11-healthcheck-allow-disable-metric.patch 1200 BLAKE2B c3cbe40e36a89ebf777501aafabd6c0f855313a35792b057ee38321c5d58916f5caf8e8d037ade697f4fb55be8851d0b03087412cecb913be627267b703db49e SHA512 04a6e0cf857b28406408bf768f12acb3f1e71e224c9881ff0bedceea7ae8b54b502833db6b560754a5ff27c3c437127b8443d686becadff073dec0d97b9d49e8
+AUX exabgp-4.2.11-healthcheck-fix-log-crash.patch 504 BLAKE2B ba1070bfd58e84748cdf54435f7c0d525cfa426f4ecc0e922ec61be81df75e735e1fda21f4aed42df51edec89c2a3502c2219f127c82d135bd1c03e9bd5b2b4e SHA512 59b794bb383e510b6ef4ab2aee8f40644982275079d83aff124f0769e7a88fe1f0b86c3b1df910f923f2cbbe602b0df5ce144813f06145cf669c1a90bcae7b5b
+AUX exabgp-4.2.11-less-verbose-logging.patch 2346 BLAKE2B 7a08fe4ac14622a69136a0456a7249d1a3ab08cd1fd07338ec05eedaff05ece565c5d86abaf24ab3147a248067f91d84982118e2713362c0648c2e8ade139a59 SHA512 2f76c8eb7b4fdd9ea39f896af6892a1b13a7357868e8a99803df295a9955149d09c6a25c17f2f0c50c435bcc320fccfe9b424f899b17d4c9a73ee359deabf6ff
 AUX exabgp-4.2.7-paths.patch 302 BLAKE2B 52110fefb75e0a36452ea3e53f099897b30df8287d033b353f66df25cf75c4a75a80e91ef49a47c652a46274faabfcf5385653ae03eb75ed1afd866c068967c7 SHA512 678258e4848b17b9880849cb8d105ee64b4cb6bdd678c3c96707467a2bae51c30d34b8609bf5c9a48bcd0722f6247b009dc5c406a3bab02d77bf2f919e7f4fbc
 AUX exabgp.confd 183 BLAKE2B 59338bbd61001e4418b970abc45786004b833f80576117122fec99f148c1bab3bc7feed80c46b8bac2ac639b720daa320bd141f65b25a37a6ce1f229653f3741 SHA512 7b888ea5053ebb8da9acbd4a85b6a9900663cadb89258aea86d47cade505e8bbfc6e741fed599d410480467f76f759175d710c284bc6caafdabb4a61c53611ac
 AUX exabgp.initd 1472 BLAKE2B 488c1de5222be9f5f67e279fa9607c326922d80c2aafa6cb098f5f721ef1df30f1d56a2a0a0ef6ca376cdb00f65cb1fc644214248b7ea9dbc9dfd55442be7d2b SHA512 453ab87961b4647374af62a02280e750ba0b1bf535a5e92c4434c4ff6c0a55f7ec52a5e0e5a784a31695e02ece42543260186aa25c658368331c06c12794d4b4
+AUX exabgp.initd-r1 1587 BLAKE2B b3462e4e990b96975ee6904937ffb859ad761581b596d71adda251e6a2aeeb9c2559c517d5f99e5d7cf5b62f155545fd7e3e43be8fd7ce89a30eae180ebd1c5c SHA512 0e4f93a1fcadea383da86bccb886dfc340f92cab6814c01fc6a5f2923ad85b894ee8b314312c04b55f2f94c28f46af5081ac55592f45882c9ae5d328fa08d91e
 AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786
 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
 DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
 EBUILD exabgp-4.2.11-r1.ebuild 1250 BLAKE2B 32b423c361ba950250135dab442d795dfd8fc191bf3070877e2df2aae34dc76392030c15ce87bbe07b170d71c4ea64a1b5cace7885cb7bc308d6983731fad98a SHA512 0e245f536632f8cbf4869dd5cd52f945fb03e604ab2115d64ad9539075d384c64e003f3f5310ef8d4d31dc9a652705e1a684f579ec2b69184e91cd4fb70b222e
+EBUILD exabgp-4.2.11-r2.ebuild 1438 BLAKE2B 37e34dfe62a42ab901abf44a77b7a84c4434eb7da2d4c41b3fb007e14f93d98c3b91b545e345f8603c8f616e3dd79917c2081b6b77921df13ff3077c985a3e97 SHA512 57c1c36a2431e10de4dba2f788303d6a70a0d9446e4287fab535893ec2779c32a166f5b6e848132446580077d02c0df1838ece80a44ed7a6336abd94d3edb6cd
 MISC metadata.xml 343 BLAKE2B 306f12e34e1edf8060cdd1515f77040a2b400a9d853b8b46a73b219464947cf3fc1f64efc32bde26074aa61cb483466ea752481876a02cb14c8388787105e61f SHA512 9c4c8e26eb586fa1153b1f02db408cebd9a460c6ceca049fe121977d1a14ec130d9289aca2f0cffee009a5e7f314818eb37b55790c75502817bb2941be7352f6
diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
new file mode 100644
index 000000000000..3e7774c03533
--- /dev/null
+++ b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit tmpfiles systemd distutils-r1
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp"
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/exabgp
+	acct-user/exabgp
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/exabgp-4.2.7-paths.patch"
+	"${FILESDIR}/exabgp-4.2.10-ip-path.patch"
+	"${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch"
+	"${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch"
+	"${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
+)
+
+python_test() {
+	./qa/bin/parsing || die "tests fail with ${EPYTHON}"
+	nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
+	systemd_dounit etc/systemd/*
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	keepdir /etc/exabgp
+
+	doman doc/man/*.?
+}
diff --git a/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-allow-disable-metric.patch b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-allow-disable-metric.patch
new file mode 100644
index 000000000000..768fe80a8107
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-allow-disable-metric.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/exabgp/application/healthcheck.py b/lib/exabgp/application/healthcheck.py
+index a4f6b8d1..805cf8af 100644
+--- a/lib/exabgp/application/healthcheck.py
++++ b/lib/exabgp/application/healthcheck.py
+@@ -168,6 +168,7 @@
+     g.add_argument(
+         "--start-ip", metavar='N', type=int, default=0, help="index of the first IP in the list of IP addresses"
+     )
++    g.add_argument("--no-metric", action="store_true", default=False, help="don't send metrics when updating announcements")
+     g.add_argument(
+         "--up-metric", metavar='M', type=int, default=100, help="first IP get the metric M when the service is up"
+     )
+@@ -494,7 +495,8 @@
+             announce = "route {0} next-hop {1}".format(str(ip), options.next_hop or "self")
+ 
+             if command == "announce":
+-                announce = "{0} med {1}".format(announce, metric)
++                if not options.no_metric:
++                    announce = "{0} med {1}".format(announce, metric)
+                 if options.local_preference >= 0:
+                     announce = "{0} local-preference {1}".format(announce, options.local_preference)
+                 if options.community or options.disabled_community:
diff --git a/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-fix-log-crash.patch b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-fix-log-crash.patch
new file mode 100644
index 000000000000..a43e90a724e4
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-fix-log-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/exabgp/logger.py b/lib/exabgp/logger.py
+index 41a1cf28..f87785a2 100644
+--- a/lib/exabgp/logger.py
++++ b/lib/exabgp/logger.py
+@@ -339,7 +339,7 @@ class Logger(object):
+         else:
+             src = source
+ 
+-        log = self._option.get(src, True) and getattr(syslog, 'LOG_%s' % level) <= self.level
++        log = self._option.get(src, True) and getattr(syslog, 'LOG_%s' % level, logging.handlers.SysLogHandler.LOG_DAEMON) <= self.level
+ 
+         if not log:
+             return
diff --git a/net-misc/exabgp/files/exabgp-4.2.11-less-verbose-logging.patch b/net-misc/exabgp/files/exabgp-4.2.11-less-verbose-logging.patch
new file mode 100644
index 000000000000..fe09a58ed776
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.11-less-verbose-logging.patch
@@ -0,0 +1,44 @@
+diff --git a/lib/exabgp/application/healthcheck.py b/lib/exabgp/application/healthcheck.py
+index a4f6b8d1..d8195074 100644
+--- a/lib/exabgp/application/healthcheck.py
++++ b/lib/exabgp/application/healthcheck.py
+@@ -159,7 +159,16 @@ def setup_logging(debug, silent, name, syslog_facility, syslog):
+     enable_syslog = syslog and not debug
+     # To syslog
+     if enable_syslog:
+-        facility = getattr(logging.handlers.SysLogHandler, "LOG_{0}".format(syslog_facility.upper()))
++        if isinstance(syslog_facility, int) or syslog_facility.isdigit():
++            for log_facility, value in sorted(logging.handlers.SysLogHandler.facility_names.items(), key=lambda x: x[1]):
++                if value >= int(syslog_facility):
++                    facility = log_facility
++                    break
++        elif hasattr(logging.handlers.SysLogHandler, "LOG_{0}".format(syslog_facility.upper())):
++            facility = getattr(logging.handlers.SysLogHandler, "LOG_{0}".format(syslog_facility.upper()))
++        else:
++            facility = logging.handlers.SysLogHandler.LOG_DAEMON
++
+         sh = logging.handlers.SysLogHandler(address=str(syslog_address()), facility=facility)
+         if name:
+             healthcheck_name = "healthcheck-{0}".format(name)
+diff --git a/lib/exabgp/reactor/api/command/announce.py b/lib/exabgp/reactor/api/command/announce.py
+index 3c9091d2..e21cbe95 100644
+--- a/lib/exabgp/reactor/api/command/announce.py
++++ b/lib/exabgp/reactor/api/command/announce.py
+@@ -6,6 +6,7 @@ Created by Thomas Mangin on 2017-07-01.
+ Copyright (c) 2009-2017 Exa Networks. All rights reserved.
+ License: 3-clause BSD. (See the COPYRIGHT file)
+ """
++import logging
+ 
+ from exabgp.reactor.api.command.command import Command
+ from exabgp.reactor.api.command.limit import match_neighbors
+@@ -50,7 +51,8 @@ def announce_route(self, reactor, service, line):
+                 change.nlri.action = OUT.ANNOUNCE
+                 reactor.configuration.inject_change(peers, change)
+                 self.log_message(
+-                    'route added to %s : %s' % (', '.join(peers) if peers else 'all peers', change.extensive())
++                    'route added to %s : %s' % (', '.join(peers) if peers else 'all peers', change.extensive()),
++                    level=logging.WARNING
+                 )
+                 yield False
+ 
diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1
new file mode 100644
index 000000000000..ec2f01704b8b
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp.initd-r1
@@ -0,0 +1,64 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# default arguments
+: "${EXABGP_ARGS:=--env=/etc/${RC_SVCNAME}/exabgp.env /etc/${RC_SVCNAME}/exabgp.conf}"
+
+command="capsh"
+command_args="
+	--uid=${EXABGP_USER:=exabgp}
+	--gid=${EXABGP_GROUP:=exabgp}
+	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
+	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
+
+supervisor=supervise-daemon
+
+: "${pidfile:=/run/exabgp/${RC_SVCNAME}-supervisor.pid}"
+: "${output_log:=/var/log/${RC_SVCNAME}/exabgp.log}"
+: "${error_log:=/var/log/${RC_SVCNAME}/exabgp.log}"
+
+extra_started_commands="routes sessions"
+extra_commands="checkconfig"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
+		/run/exabgp || return
+
+	checkpath -q -p -m 0600 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
+		/run/exabgp/${RC_SVCNAME}.{in,out} || return
+
+	checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
+		"/var/log/${RC_SVCNAME}" || return
+
+	checkconfig || return
+}
+
+stop_pre() {
+	# don't restart if the configuration is bad
+	if [ "${RC_CMD}" = restart ]; then
+		checkconfig || return
+	fi
+}
+
+checkconfig() {
+	ebegin "Checking configuration for ${RC_SVCNAME}"
+	exabgp -t ${EXABGP_ARGS}
+	eend ${?} "Invalid configuration"
+}
+
+sessions() {
+	ebegin "Querying sessions"
+	exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show neighbor summary
+	eend ${?} "exabgpcli failed"
+}
+
+routes() {
+	ebegin "Querying routes"
+	exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show adj-rib out
+	eend ${?} "exabgpcli failed"
+}
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 76132d5eb4b2..fb4a3605c791 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,10 +1,8 @@
-DIST gallery-dl-1.15.2.tar.gz 323739 BLAKE2B 99a06331bd7dc6ec951749129ad0ac797d9ce2d9f98e75a29198fd47d0481c43b96922ea08149abfe990e8994a19b3170853618de9b51465264d100dba777f32 SHA512 7f31c0485d9de6eaf76e7b0772e66049f9aa8fd7d77d3ef6fd2803d7ec7dddbf3419051c9d8b3984eb86a8fbbf9a168cf8ec69a55082a38e2ca23cfc3574b1f4
-DIST gallery-dl-1.15.3.tar.gz 325926 BLAKE2B 9ae31ba89a60460cd041fe9f353d4a7d1dab14fe63a8967f1a94f8d0ea42ef30032e5f734cbb370f5ac681f9274ba756a156acc7bd11ca4b5aad387fdc6be76f SHA512 618dc26ba74274c961cce1ef058fce3e12741366329ce50d09421245987a88a796be3f1a31926e8b2c33cc87cddcde3585f74f4f1a80347153c2a7a9cab7e3c0
 DIST gallery-dl-1.16.0.tar.gz 327915 BLAKE2B 8d7805219f900ab66afc400a56b279a18ebb78c47a531b380af2d1578c338f84575f1fb5a006a5e1bb0684349d595550dc89177493890001e38077edd34e00b5 SHA512 84cd8ab4b3e4a63f912e36454e6f35adb9f9c395002d04391c4093d4efe62ff249999eda3755f0ce77b4d4b7ce11ccfb2acb972cd5144ea84b00d61e370f5de7
 DIST gallery-dl-1.16.3.tar.gz 333058 BLAKE2B df45afa7c745a6176e8490bdcef95b7e1eb63b8c8ea61abf5422928fc72b5bedb101336c2470fb8edde0d12ce48d8d5f0eb4ab44acf6dc032eed2412e55ca30f SHA512 abb3223c13d67297bfd8cd94ac0efa66d7f6315ff589bb8b5ab96a3487015b91e8ab27e9ee43f4ee1dbbc7b69676c73cf4d4833bcd868295332aca417008c0e1
-EBUILD gallery-dl-1.15.2-r1.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
-EBUILD gallery-dl-1.15.3.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
+DIST gallery-dl-1.16.5.tar.gz 340821 BLAKE2B 06820e1755ccbc64382b084a54420368c9e9c7578c53f690d26ee552c6303580ccdd6ae8bec3a6462af9c204c1017cd2ff766bbbac317908b2951455793a10a9 SHA512 fe4535310adb900c4e6094928d8184d2981e2bb90c972a04c068badb0ec1dbad252053da466f7ad74e0662d1db1dc58703262fc627b823d8e90b18247bdca3ac
 EBUILD gallery-dl-1.16.0.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
 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
diff --git a/net-misc/gallery-dl/gallery-dl-1.15.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.15.3.ebuild
deleted file mode 100644
index 458d0edf5edc..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.15.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..9})
-PYTHON_REQ_USE="sqlite,ssl,xml"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-# tests require network access
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-src_compile() {
-	emake data/completion/gallery-dl
-	emake data/completion/_gallery-dl
-	emake man
-	distutils-r1_src_compile
-}
-
-pkg_postinst() {
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/youtube-dl
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.15.2-r1.ebuild b/net-misc/gallery-dl/gallery-dl-1.16.5.ebuild
index 458d0edf5edc..b1acc9d0aa4b 100644
--- a/net-misc/gallery-dl/gallery-dl-1.15.2-r1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.16.5.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
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 96dcb3b5bddb..9a32a67fa484 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -44,5 +44,5 @@ EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
-EBUILD geoipupdate-4.3.0.ebuild 2789 BLAKE2B 19bc3fb69c2d2c38f4cb75cc5c31c247e09630e65fdebe1f82f3d5aca0095d2cda4638d393215e6136e31cd37112c829ffb241093c6b58a0030a8c280d1915a9 SHA512 9c9fb224b87230de0c690065d0554e71eccbf8f972260add0f7f1226ec6bf13923b348c4cf34eafc65cb1e43bd45ec5a34b16f1bbb874ce66b869a5d730080ff
+EBUILD geoipupdate-4.3.0.ebuild 2787 BLAKE2B 748a78c6fad95c490c683203f7a2b8dbf193c5dfc6e2e46829f5a0fa17b6b38b6d889f73ceb428f84fd083d17a61a715e6e12031771dc80b7e6ede417be04dc4 SHA512 951ed051f904adc8ac3d6626135b25668540927f06ff6e4d09a15e5b1c5fac6152702e7556a5753801e98e496079202addb4ebf0aa095f5528fe914644627c52
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
index ea39a1a811e3..083d40f6db79 100644
--- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.3.0.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
@@ -53,7 +53,7 @@ SRC_URI="
 
 LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 arm ppc64 x86"
 
 DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
 
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index c098e1800ad0..78b6c78625c7 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,7 +2,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d
-DIST gerbera-1.6.4.tar.gz 3060809 BLAKE2B 1ab10a20803adc84162b35f28b35910dfb2454d57a57ef7ebf9d0049c493892fe28aec7ac38e6b492e35319e3c12f4c7750649ce5d9a7e6e4a0bfcbb47e7983a SHA512 82bf58e22b58039cb1f7eb78b6f519507dc3d8eead4aaeb27764c5ed7926c7d069b854fc9050ef69d1d3982bd06f5a4620eedac9a35c91947e8acfa2b2508b30
-EBUILD gerbera-1.6.4.ebuild 2370 BLAKE2B e1e66fe87d5179311ca7368bfc889404ff863c7bf586b8846d08de8ca7f4c5074abe19019cfc639bba070fbc9f76d3804c6f24a44688fbb8ed0f652103e71dac SHA512 388b39d0303a72bea85b195447ccf65975cada83bb82f762cba491d4a60bff2bb67e0f24ba46d32e8e5b499411490503e23cb0263a57306b92609713109ce55d
+DIST gerbera-1.7.0.tar.gz 3574471 BLAKE2B 32aca4576236f852f7d0c85b86817e88e8539c074c6a3967266920750f89ef7fede6ccfa4e9534534dcf753fc030910500d5bf3dd3282d96c9f64b6492fe4a15 SHA512 32998ce281bdacfd11a0d4f7cfb1edcbea40cc6c5bb1dba4bbebed667ac47eea5049a49333ea15698e50a9954450873b4739f4ce9fcf4c56e1b548f19dee7533
+EBUILD gerbera-1.7.0.ebuild 2370 BLAKE2B e1e66fe87d5179311ca7368bfc889404ff863c7bf586b8846d08de8ca7f4c5074abe19019cfc639bba070fbc9f76d3804c6f24a44688fbb8ed0f652103e71dac SHA512 388b39d0303a72bea85b195447ccf65975cada83bb82f762cba491d4a60bff2bb67e0f24ba46d32e8e5b499411490503e23cb0263a57306b92609713109ce55d
 EBUILD gerbera-9999.ebuild 2299 BLAKE2B ac17a4ae8a371d35f4ddb6107405559285630f9b989cdec156edb7383a733930b5d78a68646092890a5c7ed068d43aa1962b050e77da275d0a8345906f0db569 SHA512 ddac3d08441b5a3e4797fa69785da72f87175f90a6fccaea23029b6f544af9b0d0d5ecd98375949d4e00354e444445dd33520bd47a92687e0a76b4f9f3c07bb0
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.6.4.ebuild b/net-misc/gerbera/gerbera-1.7.0.ebuild
index 5c8a5e6ac2fb..5c8a5e6ac2fb 100644
--- a/net-misc/gerbera/gerbera-1.6.4.ebuild
+++ b/net-misc/gerbera/gerbera-1.7.0.ebuild
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 3202a10beb50..726f741796e9 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,3 @@
-DIST gns3-gui-2.2.11.tar.gz 5240137 BLAKE2B 6601e8477c9d5dadfb04a19d4bb75efad39d23cde1fb4e9bc0698cf59c403f154ea1b46b216e2271da476b42d7d58ecee9ef8acabeae039c4026c1f5ee7325eb SHA512 7cb3b4b8bcae5b6adc6d3637fad9a8e4cf885709f9440f484224c04044960b082d1b7b81ad23b5c128c9e58e6ac23d07101128b96caaa095394c0feedc2a8dc3
 DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B 16501f3f2c9efa3f2bf0305f7af159f91d36000c4850fbcc8bf29afaf204de14d7f0531fc0c63d0e83b7c56a1a26961903852e06254057a4bcc8ff1c900613c8 SHA512 a3871a4d0470917b3bc7b0369ea30eb372cabc72bab1d036653ab94f09d75d5794cc58944905a2b72024c005c96172658a3f14ea081d2d81e7349df10c649045
-EBUILD gns3-gui-2.2.11.ebuild 1339 BLAKE2B 6f583146310feff20f56f007025d35de424a22336c569922082136641a89043cd1604248343bb6605301fe30b922228bdda7fb1c766660e734e2f3a10ddba071 SHA512 b586e650f3ffee47d1f81ab336f0c5cf3a426a2bb5a1e0e7d1a42fb405ab8c97c8d7ff55633fb96b037004f8947a348515254b4127006bb9f7e90c8a139be92d
 EBUILD gns3-gui-2.2.17.ebuild 1128 BLAKE2B 69dd59c79cbde82c113cbd0f9f96978040680a0bd17b4d3374c06e265692c4809e46157be448ce7f3761d49e13f8151de5018ca2a366f9e5bbf0804c014219f9 SHA512 c7f75554ded5a8af7abf70288239686f25f561a013f6c86bdd0ce327548a1655c0e4f8a545355fe52783c4653bb069494caeac63fb91e584836cdebb1c29b419
 MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.11.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.11.ebuild
deleted file mode 100644
index 57e7f1b46b89..000000000000
--- a/net-misc/gns3-gui/gns3-gui-2.2.11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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}]
-"
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-src_prepare() {
-	default
-
-	# newer psutils is fine
-	sed -i -e '/psutil==5.7.0/d' requirements.txt || die "fixing requirements failed"
-
-	eapply_user
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index f1e78f21d914..7d28661f58bd 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,3 @@
-DIST gns3-server-2.2.11.tar.gz 7588877 BLAKE2B 429eb23e44ca0f3f68abba6fa437b80c12fb1e70c02e1c81ce2051a9d9b78f31f6618397dee07e307589c3f9f0ad55a26f22084ffa01b7c42b730bd505979c2e SHA512 6e11c6ae10942bac9f82dc3b5e0bee04c8afbbae8ca6b5d20e42495c15010ba17cddbac83c7c188a565ce8b24ed58ac7c80b4eb5a8f29f2612dce9d0dfa65a07
 DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B 0f3698adeb7cf9daede05c0281a2c324bad0952a9e5774e11ebb9af342da020bac8b7acb05a938cd8df5a8934bed6bd2b56ee0187ea28b8356376e1f1396e944 SHA512 233db2e3bb3d6a071ce3ce24b8c86049f2707863f92ca67c4fdfb763bbdc98d3b78a1c2156d2d05548ee10f84394ab333f1c3404723091dc4e7edeb3df5a4a57
-EBUILD gns3-server-2.2.11.ebuild 1990 BLAKE2B 985f6510da23c8924af22a73faf0c7764b40c05b37964c21eef33ddf0a4546115ebefff79923ae49ff404e0e37480aec4e9017411f0f573884f4a2f2f756da62 SHA512 a0060db7bd91bc00d0313e2041e038d0999e16e542dd016f78e1b271107ca74d360f09b32d8488b45dfd24ac04c04b08cf86ea6088989ffbcdac1a16efbb9cc6
 EBUILD gns3-server-2.2.17.ebuild 2141 BLAKE2B bdf09970f3219a647417c16be639efc24db650957ecc8d1d33b0a782aa428f1499faa34e9e3147fd1ee0359937da6d0cd8714e849eb29246678e8dd4f306bc43 SHA512 9adc66b53022286421d46f591ef79eefb1b186376a5cee802c41b1a89e770e0ac7972c1b748e570da4dedb42473f6d89d032e698c080ff8f96e7fa3b29775507
 MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
diff --git a/net-misc/gns3-server/gns3-server-2.2.11.ebuild b/net-misc/gns3-server/gns3-server-2.2.11.ebuild
deleted file mode 100644
index 13e0e6aec39b..000000000000
--- a/net-misc/gns3-server/gns3-server-2.2.11.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
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-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.7.3[${PYTHON_USEDEP}]
-	~dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	~dev-python/py-cpuinfo-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
-	>=net-misc/ubridge-0.9.14
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# newer psutils is fine
-	sed -i -e '/psutil==5.7.0/d' requirements.txt || die "fixing requirements failed"
-
-	# Remove Pre-built busybox binary
-	rm gns3server/compute/docker/resources/bin/busybox || die
-
-	# Package installs 'tests' package which is forbidden
-	rm -rf tests || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	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:"
-	elog "app-emulation/qemu, app-emulation/virtualbox"
-	elog "app-emulation/docker and net-analyzer/wireshark"
-	elog ""
-	elog "The following packages are currently unsupported:"
-	elog "iouyap and vpcs"
-}
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index c51a69857dc6..d02a479e2d4d 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -3,5 +3,7 @@ AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc16892286
 AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc844128f68f67d2817c6ffd2189b6cd5e40357ed15580f5bdd68a68148faf77c49198040e767af4c57f49163c5903f0 SHA512 53c20d01d60be0d560c5e15f26bbe206bba59ad97df486b8c24409e2a58b13093b09a4601f6d8add9ec4f5f01faf9e5c3ecee00e9818e5de84f7df7d39b5127a
 AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a
 DIST gsutil_4.50.tar.gz 3618295 BLAKE2B bbd8ec13428a9822b1ebe3eea984f3e50abc010a0de4e57e7dc365642ab501f7994a235d778eaa73c8217ae1e69d1569e80ac8a59d94a84a6abb8272ad466a35 SHA512 aa7d68f369ac24c75cbd321d9a1a943fc361e9bf768797327852d0da39d364fa95ac3891367e90a39061b30b331405e2ea8358e0c91e3bdc5cb151d367e0857e
+DIST gsutil_4.59.tar.gz 4024669 BLAKE2B 4317cd3787adae2d7d066d7c8d5c62cfe77749d4efc8b5451e87ac6294de0e6f13c085795de30a891f2d7b58cd7e0724234cf14b4308542c8d050856a868c5cf SHA512 c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48
 EBUILD gsutil-4.50.ebuild 3204 BLAKE2B 1fa9f4720094eecff970a749d2fa33664ef8735d198d4a8f281101196ad500da3d04e9cdf35d3ecacefe1a64fb89d0a383eae5b95a04e8de7e18115944b80775 SHA512 69d23976eec1fe7d87644b336681044a3dcb5dde46fa1a762d7d69f00fc9501797283be68c87e628d5500b94c5abf7d89966d2850382b738a63975130a969771
+EBUILD gsutil-4.59.ebuild 3026 BLAKE2B 579c56d597e1aedb12a872763947c3d1e4eb29edd6768cefea0ba0e1bc435f79a1a2ef495682407ed545fce53cbd71ce4fa5fd166c926ab1c9d9370018d1351a SHA512 82e63ab4bbb1e2b965079fa3268b2c340d909822c9e9b6286239a36a6b10745a45c7dc7ac93706907adc8e2a3a1e1210f19932b6534aa6bd453a65bfba9dca08
 MISC metadata.xml 514 BLAKE2B b37a6acae57aa619dd2adc4722283fbf1f5076ed9b3fa18558fdbe0d9ea39eb9fd1e0a678ce2df59c2c37f444558f9e4d1e913be7c7fdf1b2a16f31e809b7588 SHA512 d97ecaa80d5996fb0bb424681861e552c4f3ee206ec0b5d7a4f703247ea495e0a201757ebe4a5288389cab58208ead2718288107cad173684f37ecb9357bf06e
diff --git a/net-misc/gsutil/gsutil-4.59.ebuild b/net-misc/gsutil/gsutil-4.59.ebuild
new file mode 100644
index 000000000000..48e12ee22074
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.59.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/gsutil-4.41-tests.patch"
+	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
+	"${FILESDIR}/gsutil-4.50-tests.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.md CHANGES.md )
+
+# needs to talk to Google to run tests
+RESTRICT+=" test"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# NB: We don't delete all of boto/ because the tests are imported by the
+	# production code.  The same reason we can't delete gslib/tests/.  We can
+	# delete the main boto library and use the system version though.
+	rm -r gslib/vendored/boto/boto || die
+
+	# failes to compile with py3
+	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die
+
+	sed -i \
+		-e 's/mock==/mock>=/' \
+		setup.py || die
+	# Sanity check we didn't miss any updates.
+	grep '==' setup.py && die "Need to update version requirements"
+
+	# For debugging purposes, temporarily uncomment this in order to
+	# show hidden tracebacks.
+	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
+	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
+	#	-i gslib/__main__.py || die
+
+	# create_bucket raised ResponseNotReady
+	sed -i \
+		-e 's/test_cp_unwritable_tracker_file/_&/' \
+		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
+		gslib/tests/test_cp.py || die
+
+	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
+		gslib/commands/test.py || die
+
+	# IOError: close() called during concurrent operation on the same file object.
+	sed -i -e 's/sys.stderr.close()/#&/' \
+		gslib/tests/testcase/unit_testcase.py || die
+}
+
+python_compile() {
+	2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \
+		gslib/vendored/boto/tests || die "2to3 on boto tests failed"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
+		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
+}
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 0b4b77524100..e664db152e81 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,7 +1,10 @@
+AUX hylafaxplus-7.0.2-tiff-4.2.patch 423 BLAKE2B 73bd76ed5f9b4a80dce322e910f1656d8210fa7f07499519c71c078c64452cce8d9a2c7fc913419328a224107a7b37972d5bd6eae6c20b6026c6c3682e4b2947 SHA512 b3512870ba25a7f896003e68eb56e2288a304351e5bf32a15771c3bc3c39572bd0c833f02694470417aeed8a2938cae6864604e8e40d6303dc05e579a84d1dcd
 AUX hylafaxplus-CVE-2020-1539x.patch 3799 BLAKE2B 017793755bc17224e41541010b9bc46db72aac0c4801f94e86a5bd88ec834db4738aa22747fb3bfaa867a2967acca35ef77f9cfb88d39a0990aef93e12381010 SHA512 7f04ac1af6bb6d2440aeb0b74aab023d47357f8e27a2bffd237e6be3b66277c54947968c7dafac1dd6a6623c833970fe22f5e9ee817582279116ca88ba655e50
 AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb399f35d980d04ed54a5bb961f2fd29dbc8386ef6684fe684a8bcbd21c9cd782490546554ec90e4b2e SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621
 AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-7.0.2.tar.gz 1393586 BLAKE2B cbf99f91a0aa07783dd30e76ce8416b2933240d4bf829220909000519f9c9e14a324163707c14504848ba71e7c1ee7d98455f06bb040c2c50c1493d0138122aa SHA512 ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e
-EBUILD hylafaxplus-7.0.2.ebuild 4236 BLAKE2B 1327ad118d3333313300cab3ce41d1725d4c42e89eb6a6f41e28c6dd53622d04f67c76a44b86fe7f334aade6687827a2afe590e0012ccaf756f4d28fc134c010 SHA512 44dba8d9d8c7096b379b4749f5ef3a7eeb8bb7a08b5b6d866b67388f8281b1375cd0aff73ed5474d35ceb67d1faa3a8a33c9d6f65a7727669a0f9d915596d4cf
+DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
+EBUILD hylafaxplus-7.0.2.ebuild 4277 BLAKE2B 15f47c1c4483d15506a90aad6911f9d49bfdc686c76069debd330e8c64fed59bddff568c5babb13ec53b92a296cd3d283f3a8240ceb89ef89bd2fd1b475ad490 SHA512 22fc577c68bba6d5bde7d4e9e1a75804fb8ad83ac34b2957947782b4557949c70c77a78fd93d2cc0c34a95a983df3ff8d11833a3de293bff7816f665f8122754
+EBUILD hylafaxplus-7.0.3.ebuild 4187 BLAKE2B 7b9632ca64f2a036b0a2af9c084ec60ae05838e5970ac8c52da528bcf9db9b54c217cfb167c5026b3f21384b30794ba23e36e89d88c6157118486c81d77ba134 SHA512 2af3df0e835067784e375e15f9b90a3e7041782c98ee3eddb84e82a1c14ed38682adb3af384c7585bdf9578b057149a1b17833501cd5c9fc1da2a0113dd378a0
 MISC metadata.xml 496 BLAKE2B 778816874c73db0b7958055c119ef88326993ba3dbac35086b6ebcc3f27c95b71abdec098989460e800c25407f0a7781869649639cddd8671f998d3cf9d0d615 SHA512 092154bcc54daa4db847fabc773d588ee09e6c65c540391d4bd78c4856662b348304a0116628b5142381fe9cf76c5caaf25984c1e7449f032f7c20b83b0a0bd5
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
new file mode 100644
index 000000000000..97623b850805
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/706154
+--- a/configure
++++ b/configure
+@@ -2583,7 +2583,7 @@ EOF
+ 				echo '#define TIFFSTRIPBYTECOUNTS uint32'
+ 				echo '#define TIFFVERSION TIFF_VERSION'
+ 				echo '#define TIFFHEADER TIFFHeader';;
+-		4.[01])		tiff_runlen_t="uint32"
++		4.[012])	tiff_runlen_t="uint32"
+ 				tiff_offset_t="uint64"
+ 				echo '#define TIFFSTRIPBYTECOUNTS uint64'
+ 				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
index 78a77fe1f505..6cbf6123a4c4 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.2.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
@@ -9,7 +9,7 @@ MY_PN="${PN/plus/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.net"
+HOMEPAGE="http://hylafax.sourceforge.net"
 SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
 
 SLOT="0"
@@ -44,6 +44,7 @@ CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
 PATCHES=(
 	"${FILESDIR}/ldconfig-patch"
 	"${FILESDIR}/${PN}-CVE-2020-1539x.patch"
+	"${FILESDIR}/${PN}-7.0.2-tiff-4.2.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild
new file mode 100644
index 000000000000..af9072b4758a
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam toolchain-funcs
+
+MY_PN="${PN/plus/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
+HOMEPAGE="http://hylafax.sourceforge.net"
+SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="hylafaxplus"
+KEYWORDS="~amd64 ~x86"
+IUSE="html jbig lcms ldap mgetty pam"
+
+DEPEND="
+	app-text/ghostscript-gpl
+	media-libs/tiff:0[jbig?]
+	!net-dialup/mgetty[fax]
+	>=sys-libs/zlib-1.1.4
+	virtual/awk
+	virtual/jpeg:0
+	virtual/mta
+	jbig? ( media-libs/jbigkit )
+	lcms? ( media-libs/lcms )
+	ldap? (  net-nds/openldap )
+	mgetty? ( net-dialup/mgetty[-fax] )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}
+	!net-dialup/sendpage
+	net-mail/metamail
+"
+
+CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
+
+PATCHES=(
+	"${FILESDIR}/ldconfig-patch"
+	"${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
+)
+
+src_prepare() {
+	default
+
+	# force it not to strip binaries
+	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
+		hfaxd sendfax sendpage ; do
+			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
+				"${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
+	done
+
+	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
+
+	# Respect LDFLAGS(at least partially)
+	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
+
+	sed -i -e "s|-fpic|-fPIC|g" \
+		configure || die
+}
+
+src_configure() {
+	do_configure() {
+		echo ./configure --nointeractive ${1}
+		# eval required for quoting in ${my_conf} to work properly, better way?
+		eval ./configure --nointeractive ${1} || die "./configure failed"
+	}
+
+	local my_conf=(
+		--with-DIR_BIN=/usr/bin
+		--with-DIR_SBIN=/usr/sbin
+		--with-DIR_LIB=/usr/$(get_libdir)
+		--with-DIR_LIBEXEC=/usr/sbin
+		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
+		--with-DIR_LOCALE=/usr/share/locale
+		--with-DIR_LOCKS=/var/lock
+		--with-DIR_MAN=/usr/share/man
+		--with-DIR_SPOOL=/var/spool/fax
+		--with-DIR_HTML=/usr/share/doc/${PF}/html
+		--with-DIR_CGI="${WORKDIR}"
+		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
+		--with-PATH_IMPRIP=""
+		--with-SYSVINIT=no
+		--with-REGEX=yes
+		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\"
+		--with-DSO=auto
+		--with-HTML=$(usex html)
+	)
+
+	if use mgetty; then
+		my_conf+=(
+			--with-PATH_GETTY=/sbin/mgetty
+			--with-PATH_EGETTY=/sbin/mgetty
+			--with-PATH_VGETTY=/usr/sbin/vgetty
+		)
+	else
+		# GETTY defaults to /sbin/agetty
+		my_conf+=(
+			--with-PATH_EGETTY=/bin/false
+			--with-PATH_VGETTY=/bin/false
+		)
+	fi
+
+	#--enable-pam isn't valid
+	use pam || my_conf+=( $(use_enable pam) )
+	use lcms || my_conf+=( $(use_enable lcms) )
+	use ldap || my_conf+=( $(use_enable ldap) )
+	use jbig || my_conf+=( $(use_enable jbig) )
+
+	tc-export CC CXX AR RANLIB
+
+	do_configure "${my_conf[*]}"
+}
+
+src_compile() {
+	# Parallel building is borked, bug #????
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
+	dodir /var/spool /var/spool/fax
+	fowners uucp:uucp /var/spool/fax
+	fperms 0600 /var/spool/fax
+	dodir "/usr/share/doc/${P}/samples"
+
+	emake DESTDIR="${D}" \
+		BIN="${D}/usr/bin" \
+		SBIN="${D}/usr/sbin" \
+		LIBDIR="${D}/usr/$(get_libdir)" \
+		LIB="${D}/usr/$(get_libdir)" \
+		LIBEXEC="${D}/usr/sbin" \
+		LIBDATA="${D}/usr/$(get_libdir)/fax" \
+		DIR_LOCALE="${D}/usr/share/locale" \
+		MAN="${D}/usr/share/man" \
+		SPOOL="${D}/var/spool/fax" \
+		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
+		install
+
+	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	einfo "Adding env.d entry for ${PN}"
+	newenvd - 99hylafaxplus <<-EOF
+		PATH="/var/spool/fax/bin"
+		CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+		CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
+	EOF
+
+	newconfd "${FILESDIR}/${PN}-conf" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+
+	use pam && pamd_mimic_system ${MY_PN} auth account session
+
+	einstalldocs
+	docinto samples
+}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 03579601c363..1f11951b3bef 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -12,7 +12,7 @@ DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a49918251
 DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 EBUILD iputils-20190709-r1.ebuild 4988 BLAKE2B d4085aef19f926db7fe27a22d0bb4589648ee4450d53df43cd3aeab6571d15891ac9b4a363e3d4c4b7efa80f67fc54a0333a9485f386d5bb3e0ea88531df44a7 SHA512 717eb995035729ab0af20c9e48f9ccebba7ca51ce11d076aee708d381474f99311b00e6fed6eb63e1641e6ca4adce9d3178fb369a2516f32f0a260b7b09f7beb
-EBUILD iputils-20200821-r2.ebuild 4414 BLAKE2B ecde92525c14e7db2cc32bc25b3a305872686c15bb179977d952c3e62d157bdf55ad1ccb0ba7e382ba8311f2345f881358489b1fcd8f0f4410cee123cb28490e SHA512 73cc5597dc932e3bbf7db034497a4e4feb17b937a8ff913500b6ed88fb090b544d8553ac62ce614ff862cf3eb87cb7acd4dac2b55e3b0521cc7f1c25dbc2a585
+EBUILD iputils-20200821-r2.ebuild 4413 BLAKE2B 2300d389ad26bbfa745c666ec299fa142aa3364381422f94bc7cf38199f55872b279197e6e8f3d48fb4e508dca7b55959f9e03e47ece932067c95633063ab236 SHA512 56c789ee0a2458350dda5d31790ce28ddf02095130aee6ab5c7ee9723419fc800f720a2a402352c819f7f8ebe1b5e15cb69b296080a1aafc723e515290cd400e
 EBUILD iputils-20210202.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da
 EBUILD iputils-99999999.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild
index 393c3b812973..75a7d14b642d 100644
--- a/net-misc/iputils/iputils-20200821-r2.ebuild
+++ b/net-misc/iputils/iputils-20200821-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.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"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/mstpd/Manifest b/net-misc/mstpd/Manifest
new file mode 100644
index 000000000000..3a26b0e0a314
--- /dev/null
+++ b/net-misc/mstpd/Manifest
@@ -0,0 +1,3 @@
+DIST mstpd-0.0.9.tar.gz 113711 BLAKE2B 93ff0213a634fcbbb613c79227d737c3961f4de669e0ac2c7351fa1c22842669edc652ba0deb24917a44df5a465a4e905a98e46ab7ccc7e4ebfd13039e6acfe0 SHA512 1d4a926d8437b7c41c69d2a047718181ca6245f3150e4aeb631f437edaaafe0c40b29802a6c9ea38c9f1dfb1b94149934b473f550358be10bb796295fa632e1e
+EBUILD mstpd-0.0.9.ebuild 724 BLAKE2B ac89c8db9a9ef8d325045414d5514acbd7640201d6eb937b19205271818eaa2468e55df99870d09ad24ffed78b1e8b9af5cf5d7a5d08b772198de5374b518c00 SHA512 abd8ac4c7cadb4203b4ec0894cb86bf4d96cad7534081f0a819104910b36f50495c8c656cc341095f64d20580ee7cc406f05a444433a9a5eac9c17144b400192
+MISC metadata.xml 444 BLAKE2B 6bbeee7e910599d9bbd586074b2b38f9a84b08d4b6a29961e4d0a9349a4d2a58d672125210eb7e3604a930983a86befe4ba855a75147fc4f507b8a98777785af SHA512 32ca1da084fde5cbcc37b8c474320f7d73db0a33f191c3f3e5d99b8cfd84bc71c6168238d402c0fd2ab00cb9b79faaa62e1ec6a88da75a3a2b2c499b999189c4
diff --git a/net-misc/mstpd/metadata.xml b/net-misc/mstpd/metadata.xml
new file mode 100644
index 000000000000..359cbebb4676
--- /dev/null
+++ b/net-misc/mstpd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mstpd/mstpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/mstpd/mstpd-0.0.9.ebuild b/net-misc/mstpd/mstpd-0.0.9.ebuild
new file mode 100644
index 000000000000..32a39f6deb2b
--- /dev/null
+++ b/net-misc/mstpd/mstpd-0.0.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 systemd
+
+DESCRIPTION="Multiple spanning tree protocol daemon"
+HOMEPAGE="https://github.com/mstpd/mstpd"
+SRC_URI="https://github.com/mstpd/mstpd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)" \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_install() {
+	default
+	dosym ../../sbin/bridge-stp /lib/mstpctl-utils/mstpctl_restart_config
+	dosym bridge-stp /sbin/mstp_restart
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index b9790ec1d7d9..a40aa12881db 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,8 +2,10 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c3
 DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
 DIST nextcloud-client-3.1.1.tar.gz 19440799 BLAKE2B ae6ef7fbff4b7b5c9a5728a30558000cd781348dd07aba068af5b123ec629e1661b52cd63b50bf45c593411866bc607dfcc3112713fa2aea3eabfda7ce969614 SHA512 1f60266ff6d413a614261ae8b6c75ba6bc5cdb534f1906039b47cb7d593d12d72013d277dc12c0bfc5c5919322438543736a7cdff056949d80e093538fd04209
 DIST nextcloud-client-3.1.2.tar.gz 19517295 BLAKE2B 75713a892816be515984cef579e09dfb58165bf1e35e73982bd59fb1cce9a0cdcc76a33a9116b85da99174f0ee4f3c425afb380df5a99d65dba82a9c6d5b3553 SHA512 bad05fab6c6d391ed40e7f9b5869f3ab3231bdba1bbb24b7222d9cace0bd96989b0b24757bf0757053a851312265aec5a4ac6f4d1c71d532152aa20ddee838a6
+DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
 EBUILD nextcloud-client-2.6.5.ebuild 1951 BLAKE2B bbb143e83a235f27cdd65c5cbbeb3b4bf40938a79e9295802f9d892609c5980ccde188d88a1b482295a40be96e856bce9e4d615dbd93cb65aefc4904924216e6 SHA512 0e1567e43e28299f27c633d7c828a1422aeea689f46422fb10a6a80ae02d4b75dec6542460d86d800fdb9c2dfcf4815a2c69575ecc5db8ff9ab3e863ab0120b6
 EBUILD nextcloud-client-3.1.1-r1.ebuild 2040 BLAKE2B 2d84e53fda3603204bd8fd87dfd7a85d5cd878988209438514dfa313853b1f9a131de4590781629ca4cff3436656a4c2dcc831a2cc91ebbea73eb4c3544cf0e8 SHA512 2de9f51dae3e56c1e1e6f1ba9cc0947864061789b5ede9955a751a2f865a7a5675ecb605958e6db77bcec9ebea42e381809af7df1e60d02829f420e410b05134
 EBUILD nextcloud-client-3.1.1.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
 EBUILD nextcloud-client-3.1.2.ebuild 2041 BLAKE2B de96cbe1822decdecfbf053e2931d69dcc471009dd11f3115d1553bbe14595bb90b649700bdbe71cab8f857123c3f35f2aacc4d66326d830904b46bf8844e9fa SHA512 e798d0b179a98f9dda74b4f2d47c2a75517591c6d73597a4826d4b0f12926abcb6aa6e16d041e90ee49f85c744ddac36771cc3e9cbf2b3b17244b7fbe0f41b1b
+EBUILD nextcloud-client-3.1.3.ebuild 2041 BLAKE2B de96cbe1822decdecfbf053e2931d69dcc471009dd11f3115d1553bbe14595bb90b649700bdbe71cab8f857123c3f35f2aacc4d66326d830904b46bf8844e9fa SHA512 e798d0b179a98f9dda74b4f2d47c2a75517591c6d73597a4826d4b0f12926abcb6aa6e16d041e90ee49f85c744ddac36771cc3e9cbf2b3b17244b7fbe0f41b1b
 MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild
new file mode 100644
index 000000000000..fe942c43a65b
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin libressl nautilus test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+	dev-libs/qtkeychain[gnome-keyring,qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+	libressl? ( >=dev-libs/libressl-3.1:0= )
+	nautilus? ( dev-python/nautilus-python )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=yes
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 82d5cf265223..f257af080011 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -5,6 +5,6 @@ AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f
 EBUILD openntpd-6.2_p3-r2.ebuild 1876 BLAKE2B 19b8f6bfaed7a095ff3401fc487877ca0badaa069b37482805e8b50053b701fa1c747894d9fb4c0b6984241f430e6aca442cbf77a2f91ca8b1ff5b7be66ec36b SHA512 8aa659e9a7ebfbd917a7facf394afb552a4eef2c7ab1f248109cfad92d4931a91bc7c38b440721751c013ea5e391b5400464d519cdd16e57eff8bb65b87eafe7
-EBUILD openntpd-6.8_p1-r1.ebuild 1751 BLAKE2B 2189c1af512b47f3e8ed9c4701ae85cd566525c4028114cbb9484ca29da06f700880e05e3cf700a144ad3c55a62487a7f22e47b151eac9790888d63a9045a5cb SHA512 6f1e12df9f923d2b9687439ad1d5255be6639750223704d893bfc2b4d9cbb3de26a7ea3338d123d832eda6a27acf7c1beacd5218677d2f810da2fb393a6cce5f
+EBUILD openntpd-6.8_p1-r1.ebuild 1757 BLAKE2B 2c5cc2cbb75d3858950f48a3bb2c4dcadfe53fca534f42e26d6e8e2e811708e811cc08a093bb9d29be918479050068c8f2c5139e3c6a10f773fa1a82d4aad147 SHA512 4dbd2d9e068bea32494ff38fadf0eac212c0bdedb10cf68c99b6261920d1b23e473973fccc076b74d505fa708c4a4c71d989d1b8067ac13705c512264dd32464
 EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
 MISC metadata.xml 828 BLAKE2B 252026b498239d4105cf5a36f898f7587f046d6f533089d7b52116af656c85d340802f8d6e3b95ccb5263f7795e84248e1fbf2f644213c0fb54b7fdab33df79a SHA512 83fe295d82756146bc8b705e02564553079e0292601b2ef38ba46f05a2388bc77d13a0576de6b30937814a708570247c657f4605767fe93a7ca6c49e0c96cabe
diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
index cdd7e30b03c5..f19f0bd6c07b 100644
--- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="constraints libressl selinux"
 
 DEPEND="
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 806f2544f48e..5930fe9e7e5c 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -3,23 +3,8 @@ AUX openssh-7.5_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1
 AUX openssh-7.9_p1-include-stdlib.patch 914 BLAKE2B 9c7eb79f87ecd657a80821dfa979d8b0cc12a08d385ec085724f20aa6f5332593ffc7481bb9f816e91df3eb4d75d8f7b66383ff473d271270de128c3b2bf92e5 SHA512 7dade73bdafb0da484cbd396b4a644442f8ea12fef54c07e6308ae2e73a587fa4ddf401e8a0c467469b46fe7f00585e047462545182924c157b4d3894c707a70
 AUX openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 977 BLAKE2B b2e28683176c4678f51a9a0be3e29496620ac795c7de4649fb3cc0bd076682e42bc1c606b17a76e140f51319e4c4a1cc890c3a37c4bc3cf9222a88e31b8a773f SHA512 8c2567ae16dccc73e302ba90c1bb03e19d4afc3892dd8e1636d7c8853932662eccbda3957e4db55a21bd37d2e65abe74b0b2c1efb74e31751335eb523759d945
 AUX openssh-8.0_p1-fix-putty-tests.patch 1760 BLAKE2B a1127e8f2275c1e23c956b5041dbc84dbdb2cd6b788fc69bfc1f6b030afe86a827483602ce76577b4101ee2e790b1cfa8c1d2db09da59b89fe7df8083bf4695f SHA512 f544d818bdde628131f1819bf2ffb4007802ee5bf12c5cd5bd398efe0f0f430ed6b3efa7969cb2c4fa49a2bbd773d8fa09f4c927cf998a564b7611443437c310
-AUX openssh-8.0_p1-hpn-14.20-X509-glue.patch 4063 BLAKE2B 30a9b4df889a2ae46b7b0a4f5ab963b9258ed918756e4b05f465af2664b5ec9d149ab496b05ee2a221ffc28c84ce26ff6c3e0bb8da4c59338616c992e1412fb0 SHA512 ed2102af78a4f10dc7ae56edeb3dd94690ba4df5803ec7d68fff76226f54eca5c023d6d87735ed7f33131a0fd0c382a5503d767e91e812bfc1f5f590cf213f34
 AUX openssh-8.0_p1-hpn-version.patch 590 BLAKE2B 1ff20ab17e7e1a20f7a96ded56ff7c059fd509d7773d9abaeac83743102385d9713284c630dc932d40672a9bfc8a894b57c6b073e93a7b024de7490ea54a589c SHA512 37250881f17a44e4a4b0ac164d06961e0731528847d5cbbb263e3f9a286a192c8dae92250b85db3f2e1f280a464c7b3bfc8a7c9e85552375c013e16a6fcf28ed
-AUX openssh-8.1_p1-GSSAPI-dns.patch 11639 BLAKE2B 2bc9e618c0acbf6b85496a33055894471235d01f20b76c9b75302dce58c7d6033984c8471789d2f8095d6231f5f271a4eb2f6099936b1631ec261464bc7a3ada SHA512 722a769da482876f0629e110109f02065e47848ff79395e9e64de39ae066d8c5a207f849c59d95b72e70b874f4bedf4e52a2f7ad1752d9c84b99ccdbfa19c73d
-AUX openssh-8.1_p1-X509-12.3-tests.patch 405 BLAKE2B 1a1c29fea98c4ce277c943709576b5130a573e9786a33c957229d74d0e572ca6e5d0dce68b5b515b5c3f44862f1f4dafe2dad1cd3d3710ca415137f8a4013b86 SHA512 0e80b79d3aa8b7e89cf250b31e6bbc2471990b9a2c0ab8b54e6af4c3de77adff3dc6db83f4f14524f830455b5ce4d586f630d33b4ac4b134d1028e325ab351b3
-AUX openssh-8.1_p1-X509-glue-12.3.patch 1613 BLAKE2B aef1de72da18a2af0fae1793eed5baa1be2af9f26a522e6772f43f1053d263f154db76cf0ebe3ddebbfd9798ffb334100ce5eb3894ad3095b1cd48d1ef5b9839 SHA512 e533175bcabd1ddbb50c6cc605cba0190d2cde24149d5451a807cdc05847fa95a2b72188bc23866876e8ec88073df8039e0e85e703560e90f53a92df6f616572
-AUX openssh-8.1_p1-hpn-14.20-glue.patch 3534 BLAKE2B 13206d78b0e344d4d90aad3f9aa4396cbe270f1004108f52e1b23fc4b106e01f94bdc6e198a42c0bfc9d885408caea890e72f2bd58df893f94dea4452ab11c00 SHA512 ab589f6d9eada3313b87e8e35aa4e3946cd057412336914c90f6266dafb997062f7b8be4ac475e66a8df896f9fb3004f0df6a4f69dc85c468bcb1f4778326f96
-AUX openssh-8.1_p1-hpn-14.20-sctp-glue.patch 737 BLAKE2B b8f93cb197206eb4315c66350ce3e943cd5f1280b5294099320cbc4a611de2a23f5a5c04ed71a394e1bd23a0928df50d754f549d652e53389ceadda2ac9f1636 SHA512 96fa9a317d9cc0a77bf5a8d82d8fa0498fff04309bc4ae546b34939580c4ed945d075f26d8ea16e787d7bf631ea5067543f380ab08167993d713ec1591a346b9
-AUX openssh-8.1_p1-tests-2020.patch 1332 BLAKE2B a400f6859a5d096729c9cb6047dce8612da7fe5f8d06cc891cfb6a4c88b568be3dfc7872d5be78ef349798f501828e1505bbd5ebd49d548dbbdc6bbf987dc843 SHA512 8f4c535d3ab15e4c761f6f5d4efe762ec2bc9b5de49ee369ce9186fe40095d2065418249c89161a8ef53e893079264fd9c95b73cd74937b08fa9f563a4f00290
 AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4
-AUX openssh-8.2_p1-X509-12.4.3-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a
-AUX openssh-8.2_p1-X509-glue-12.4.3.patch 5024 BLAKE2B 96568de2316e50d8390654aecbec7751eb9eb333b30fb30700161c626f93e97c5fb244d96baf32fa12d31760efdb10c80012f872412e90837f8b294082d7b087 SHA512 85c635ed067ec3c829fe4caee6bfe84e0f986f0513d744476e637c1af16af910604b879e6894300be1ce8a6a6e397149329e8fe09246e3654dcdef1ff44da4ed
-AUX openssh-8.2_p1-hpn-14.20-X509-glue.patch 4881 BLAKE2B 899065ef3b781e7e67ea630ff26ac8c3975073e9ef5b0cc345c6cee9fb2e45d2ff549b716a76211c88efb1e540ed7d79c4467e0342cfbea64fef8e6cafddac85 SHA512 d37d4fd8614bed8b1592697b911a04e2ca7d14d24e9c315a6695b4c88cdb5b4ae980e8cb68040fe54b4587675ebb3ac5694ea0d09093f8451aa65e427b6a5d95
-AUX openssh-8.2_p1-hpn-14.20-glue.patch 5294 BLAKE2B 6a778eab95e05d371fd92a02f96b926cec5c6ff90dea36065b4857ddf243b5f95bb25aa339fddb1c662b628f26d0c11858d1ca0badece0a7268d6a51e99a09be SHA512 50289c60df01a59f134a0b283ec21d6a06beccdb68de67a46b4e0e9a9bc47855b0e4dbed47300c2f042f2eb9f63e4d6d0683f3092ee358a82e9d6337a3b173fe
-AUX openssh-8.2_p1-hpn-14.20-libressl.patch 794 BLAKE2B 36e42916a90aeb857eb7b9bc815a2720b4fad82ebcb1b53b7045f5c61f1dadfcdb4478092c5ab514d0d11832696cbb54acc18c01e5daa41eea776962065f7467 SHA512 d41e48a70f6b3b293c07f42f764dea810ed3084e54821004f97e2e5fbc1ce7110e68632fd3492779b1ec62179a3f7e34e92554c735f825952e0ce1a05fd9d474
-AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde
-AUX openssh-8.3_p1-X509-glue-12.5.1.patch 1721 BLAKE2B c67e6ce756d8febea9066ca52d47baff962075610ca87ee8ef9581940db020ab8889f1bb7e2809bac7c521058e835a25823f30bd6ee8b4948cbb19b7459e512c SHA512 bf356de43307cb48fd79427b22fff5bf40ad4fc72c6e906b517209f5f51bddf6a5f81d7617ad01e8434db5703df4fa45f68d4a70fd5869691536b9f82fb18b18
-AUX openssh-8.3_p1-hpn-14.20-glue.patch 6059 BLAKE2B 454178571fbf051fad6edff93c87d96f4fa62c687b03666a27e912e29c9f11d375935d0f830edff779ff73f0de16831bc54d2a7e747ff5e3951933b25f39b452 SHA512 0791c0936b4e316715e691b3ac0fa6dd03495fc30ddb68ba15a73c2f8aafb3892df5fa3c29d91e16d956f9aa3c9fd66ded8ad744834788f2fad08b807efe0a5b
 AUX openssh-8.3_p1-sha2-include.patch 370 BLAKE2B 3d9ee891d9d647f4ff3b42d47cae4c7a32533bce917b35101fd3c5549717a6b285423894b3372ecb6983d4425c712f4b0590fc95799fd521523d9d74860863c6 SHA512 a1edda5dc43af79e9e4e7d3bcd78cc1c2dbf40e94f22189022dcaf1107c8f2cb2a37c949af5955144f6ada210417a695fe0c4d05d52ba2dbafb1dddf6a1bac3f
 AUX openssh-8.4_p1-X509-glue-12.6.patch 1524 BLAKE2B de9de289b7a401726f92df2e23750df1cb26b3cc9595f1f2db7d74ffacbf4ca2a723d270ffbd0a085d44674375247f34efe04bbbd8150e67a82b6b96b8786065 SHA512 7b301e672cea87ecee89ed1eaea44ac35e2d8395696d7456690308ba1dfe671144488c7b9c79f5a238e2242eae54bca6abadd1ae448ac70cab976930f4ad5f4d
 AUX openssh-8.4_p1-fix-ssh-copy-id.patch 1070 BLAKE2B 2928bc4fbef7d70f57d1f77f4e79238dbe4b640ee891aae94ee767de98fbb04a9421bd9e071771c6d1f9818695ba329058284469ce2f01704b05351989274a1b SHA512 d6088a20e3d4cb597ca99c29fd761e06c16b8a54e7e5d0fa63a07f814fd21e831e0e5e4e3c643b99fe10e536ed98ef5f8179cab2ac79bc44e725327b8d5d5dba
diff --git a/net-misc/openssh/files/openssh-8.0_p1-hpn-14.20-X509-glue.patch b/net-misc/openssh/files/openssh-8.0_p1-hpn-14.20-X509-glue.patch
deleted file mode 100644
index 167adfcaefb8..000000000000
--- a/net-misc/openssh/files/openssh-8.0_p1-hpn-14.20-X509-glue.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -ur a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff
---- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-04 15:49:15.746095444 -0800
-+++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-04 15:49:54.181853707 -0800
-@@ -4,8 +4,8 @@
- +++ b/Makefile.in
- @@ -42,7 +42,7 @@ CC=@CC@
-  LD=@LD@
-- CFLAGS=@CFLAGS@
-- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
-+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
-  K5LIBS=@K5LIBS@
-@@ -803,8 +803,8 @@
-  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
-  {
-  	struct session_state *state;
---	const struct sshcipher *none = cipher_by_name("none");
--+	struct sshcipher *none = cipher_by_name("none");
-+-	const struct sshcipher *none = cipher_none();
-++	struct sshcipher *none = cipher_none();
-  	int r;
-  
-  	if (none == NULL) {
-@@ -948,9 +948,9 @@
-  	/* Portable-specific options */
-  	sUsePAM,
- +	sDisableMTAES,
-- 	/* Standard Options */
-- 	sPort, sHostKeyFile, sLoginGraceTime,
-- 	sPermitRootLogin, sLogFacility, sLogLevel,
-+ 	/* X.509 Standard Options */
-+ 	sHostbasedAlgorithms,
-+ 	sPubkeyAlgorithms,
- @@ -643,6 +647,7 @@ static struct {
-  	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
-  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
-diff -ur a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
---- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 15:41:42.512910357 -0800
-+++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 15:56:40.323299499 -0800
-@@ -382,7 +382,7 @@
- @@ -884,6 +884,10 @@ kex_choose_conf(struct ssh *ssh)
-  	int nenc, nmac, ncomp;
-  	u_int mode, ctos, need, dh_need, authlen;
-- 	int r, first_kex_follows;
-+ 	int r, first_kex_follows = 0;
- +	int auth_flag;
- +
- +	auth_flag = packet_authentication_state(ssh);
-@@ -391,8 +391,8 @@
-  	debug2("local %s KEXINIT proposal", kex->server ? "server" : "client");
-  	if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0)
- @@ -954,6 +958,14 @@ kex_choose_conf(struct ssh *ssh)
-- 			peer[ncomp] = NULL;
-- 			goto out;
-+ 			else
-+ 				fatal("Pre-authentication none cipher requests are not allowed.");
-  		}
- +		debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name);
- +		if (strcmp(newkeys->enc.name, "none") == 0) {
-@@ -1169,15 +1169,3 @@
-  # Example of overriding settings on a per-user basis
-  #Match User anoncvs
-  #	X11Forwarding no
--diff --git a/version.h b/version.h
--index 6b3fadf8..ec1d2e27 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,6 @@
-- #define SSH_VERSION	"OpenSSH_8.1"
-- 
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN         "-hpn14v20"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
--+ 
-diff -ur a/openssh-8_1_P1-hpn-PeakTput-14.20.diff b/openssh-8_1_P1-hpn-PeakTput-14.20.diff
---- a/openssh-8_1_P1-hpn-PeakTput-14.20.diff	2020-02-04 15:41:42.512910357 -0800
-+++ b/openssh-8_1_P1-hpn-PeakTput-14.20.diff	2020-02-04 16:02:42.203023609 -0800
-@@ -12,9 +12,9 @@
-  static long stalled;		/* how long we have been stalled */
-  static int bytes_per_second;	/* current speed in bytes per second */
- @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
-+ 	off_t bytes_left;
-  	int cur_speed;
-- 	int hours, minutes, seconds;
-- 	int file_len;
-+ 	int len;
- +	off_t delta_pos;
-  
-  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
-@@ -33,12 +33,12 @@
- @@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
-  
-  	/* filename */
-- 	buf[0] = '\0';
---	file_len = win_size - 36;
--+	file_len = win_size - 45;
-- 	if (file_len > 0) {
-- 		buf[0] = '\r';
-- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
-+ 	if (win_size > 36) {
-+-		int file_len = win_size - 36;
-++		int file_len = win_size - 45;
-+ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
-+ 		    file_len, file);
-+ 	}
- @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
-  	    (off_t)bytes_per_second);
-  	strlcat(buf, "/s ", win_size);
diff --git a/net-misc/openssh/files/openssh-8.1_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-8.1_p1-GSSAPI-dns.patch
deleted file mode 100644
index 6aba6f266945..000000000000
--- a/net-misc/openssh/files/openssh-8.1_p1-GSSAPI-dns.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff --git a/auth.c b/auth.c
-index ca450f4e..2994a4e4 100644
---- a/auth.c
-+++ b/auth.c
-@@ -723,120 +723,6 @@ fakepw(void)
- 	return (&fake);
- }
- 
--/*
-- * Returns the remote DNS hostname as a string. The returned string must not
-- * be freed. NB. this will usually trigger a DNS query the first time it is
-- * called.
-- * This function does additional checks on the hostname to mitigate some
-- * attacks on legacy rhosts-style authentication.
-- * XXX is RhostsRSAAuthentication vulnerable to these?
-- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
-- */
--
--static char *
--remote_hostname(struct ssh *ssh)
--{
--	struct sockaddr_storage from;
--	socklen_t fromlen;
--	struct addrinfo hints, *ai, *aitop;
--	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
--	const char *ntop = ssh_remote_ipaddr(ssh);
--
--	/* Get IP address of client. */
--	fromlen = sizeof(from);
--	memset(&from, 0, sizeof(from));
--	if (getpeername(ssh_packet_get_connection_in(ssh),
--	    (struct sockaddr *)&from, &fromlen) == -1) {
--		debug("getpeername failed: %.100s", strerror(errno));
--		return strdup(ntop);
--	}
--
--	ipv64_normalise_mapped(&from, &fromlen);
--	if (from.ss_family == AF_INET6)
--		fromlen = sizeof(struct sockaddr_in6);
--
--	debug3("Trying to reverse map address %.100s.", ntop);
--	/* Map the IP address to a host name. */
--	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
--	    NULL, 0, NI_NAMEREQD) != 0) {
--		/* Host name not found.  Use ip address. */
--		return strdup(ntop);
--	}
--
--	/*
--	 * if reverse lookup result looks like a numeric hostname,
--	 * someone is trying to trick us by PTR record like following:
--	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
--	 */
--	memset(&hints, 0, sizeof(hints));
--	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
--	hints.ai_flags = AI_NUMERICHOST;
--	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
--		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
--		    name, ntop);
--		freeaddrinfo(ai);
--		return strdup(ntop);
--	}
--
--	/* Names are stored in lowercase. */
--	lowercase(name);
--
--	/*
--	 * Map it back to an IP address and check that the given
--	 * address actually is an address of this host.  This is
--	 * necessary because anyone with access to a name server can
--	 * define arbitrary names for an IP address. Mapping from
--	 * name to IP address can be trusted better (but can still be
--	 * fooled if the intruder has access to the name server of
--	 * the domain).
--	 */
--	memset(&hints, 0, sizeof(hints));
--	hints.ai_family = from.ss_family;
--	hints.ai_socktype = SOCK_STREAM;
--	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
--		logit("reverse mapping checking getaddrinfo for %.700s "
--		    "[%s] failed.", name, ntop);
--		return strdup(ntop);
--	}
--	/* Look for the address from the list of addresses. */
--	for (ai = aitop; ai; ai = ai->ai_next) {
--		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
--		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
--		    (strcmp(ntop, ntop2) == 0))
--				break;
--	}
--	freeaddrinfo(aitop);
--	/* If we reached the end of the list, the address was not there. */
--	if (ai == NULL) {
--		/* Address not found for the host name. */
--		logit("Address %.100s maps to %.600s, but this does not "
--		    "map back to the address.", ntop, name);
--		return strdup(ntop);
--	}
--	return strdup(name);
--}
--
--/*
-- * Return the canonical name of the host in the other side of the current
-- * connection.  The host name is cached, so it is efficient to call this
-- * several times.
-- */
--
--const char *
--auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
--{
--	static char *dnsname;
--
--	if (!use_dns)
--		return ssh_remote_ipaddr(ssh);
--	else if (dnsname != NULL)
--		return dnsname;
--	else {
--		dnsname = remote_hostname(ssh);
--		return dnsname;
--	}
--}
--
- /*
-  * Runs command in a subprocess with a minimal environment.
-  * Returns pid on success, 0 on failure.
-diff --git a/canohost.c b/canohost.c
-index abea9c6e..4f4524d2 100644
---- a/canohost.c
-+++ b/canohost.c
-@@ -202,3 +202,117 @@ get_local_port(int sock)
- {
- 	return get_sock_port(sock, 1);
- }
-+
-+/*
-+ * Returns the remote DNS hostname as a string. The returned string must not
-+ * be freed. NB. this will usually trigger a DNS query the first time it is
-+ * called.
-+ * This function does additional checks on the hostname to mitigate some
-+ * attacks on legacy rhosts-style authentication.
-+ * XXX is RhostsRSAAuthentication vulnerable to these?
-+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
-+ */
-+
-+static char *
-+remote_hostname(struct ssh *ssh)
-+{
-+	struct sockaddr_storage from;
-+	socklen_t fromlen;
-+	struct addrinfo hints, *ai, *aitop;
-+	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
-+	const char *ntop = ssh_remote_ipaddr(ssh);
-+
-+	/* Get IP address of client. */
-+	fromlen = sizeof(from);
-+	memset(&from, 0, sizeof(from));
-+	if (getpeername(ssh_packet_get_connection_in(ssh),
-+	    (struct sockaddr *)&from, &fromlen) < 0) {
-+		debug("getpeername failed: %.100s", strerror(errno));
-+		return strdup(ntop);
-+	}
-+
-+	ipv64_normalise_mapped(&from, &fromlen);
-+	if (from.ss_family == AF_INET6)
-+		fromlen = sizeof(struct sockaddr_in6);
-+
-+	debug3("Trying to reverse map address %.100s.", ntop);
-+	/* Map the IP address to a host name. */
-+	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
-+	    NULL, 0, NI_NAMEREQD) != 0) {
-+		/* Host name not found.  Use ip address. */
-+		return strdup(ntop);
-+	}
-+
-+	/*
-+	 * if reverse lookup result looks like a numeric hostname,
-+	 * someone is trying to trick us by PTR record like following:
-+	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
-+	 */
-+	memset(&hints, 0, sizeof(hints));
-+	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-+	hints.ai_flags = AI_NUMERICHOST;
-+	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
-+		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
-+		    name, ntop);
-+		freeaddrinfo(ai);
-+		return strdup(ntop);
-+	}
-+
-+	/* Names are stored in lowercase. */
-+	lowercase(name);
-+
-+	/*
-+	 * Map it back to an IP address and check that the given
-+	 * address actually is an address of this host.  This is
-+	 * necessary because anyone with access to a name server can
-+	 * define arbitrary names for an IP address. Mapping from
-+	 * name to IP address can be trusted better (but can still be
-+	 * fooled if the intruder has access to the name server of
-+	 * the domain).
-+	 */
-+	memset(&hints, 0, sizeof(hints));
-+	hints.ai_family = from.ss_family;
-+	hints.ai_socktype = SOCK_STREAM;
-+	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
-+		logit("reverse mapping checking getaddrinfo for %.700s "
-+		    "[%s] failed.", name, ntop);
-+		return strdup(ntop);
-+	}
-+	/* Look for the address from the list of addresses. */
-+	for (ai = aitop; ai; ai = ai->ai_next) {
-+		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
-+		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
-+		    (strcmp(ntop, ntop2) == 0))
-+				break;
-+	}
-+	freeaddrinfo(aitop);
-+	/* If we reached the end of the list, the address was not there. */
-+	if (ai == NULL) {
-+		/* Address not found for the host name. */
-+		logit("Address %.100s maps to %.600s, but this does not "
-+		    "map back to the address.", ntop, name);
-+		return strdup(ntop);
-+	}
-+	return strdup(name);
-+}
-+
-+/*
-+ * Return the canonical name of the host in the other side of the current
-+ * connection.  The host name is cached, so it is efficient to call this
-+ * several times.
-+ */
-+
-+const char *
-+auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
-+{
-+	static char *dnsname;
-+
-+	if (!use_dns)
-+		return ssh_remote_ipaddr(ssh);
-+	else if (dnsname != NULL)
-+		return dnsname;
-+	else {
-+		dnsname = remote_hostname(ssh);
-+		return dnsname;
-+	}
-+}
-diff --git a/readconf.c b/readconf.c
-index f78b4d6f..747287f7 100644
---- a/readconf.c
-+++ b/readconf.c
-@@ -162,6 +162,7 @@ typedef enum {
- 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-+	oGssTrustDns,
- 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
- 	oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist,
- 	oHashKnownHosts,
-@@ -203,9 +204,11 @@ static struct {
- #if defined(GSSAPI)
- 	{ "gssapiauthentication", oGssAuthentication },
- 	{ "gssapidelegatecredentials", oGssDelegateCreds },
-+	{ "gssapitrustdns", oGssTrustDns },
- # else
- 	{ "gssapiauthentication", oUnsupported },
- 	{ "gssapidelegatecredentials", oUnsupported },
-+	{ "gssapitrustdns", oUnsupported },
- #endif
- #ifdef ENABLE_PKCS11
- 	{ "pkcs11provider", oPKCS11Provider },
-@@ -992,6 +995,10 @@ parse_time:
- 		intptr = &options->gss_deleg_creds;
- 		goto parse_flag;
- 
-+	case oGssTrustDns:
-+		intptr = &options->gss_trust_dns;
-+		goto parse_flag;
-+
- 	case oBatchMode:
- 		intptr = &options->batch_mode;
- 		goto parse_flag;
-@@ -1864,6 +1871,7 @@ initialize_options(Options * options)
- 	options->challenge_response_authentication = -1;
- 	options->gss_authentication = -1;
- 	options->gss_deleg_creds = -1;
-+	options->gss_trust_dns = -1;
- 	options->password_authentication = -1;
- 	options->kbd_interactive_authentication = -1;
- 	options->kbd_interactive_devices = NULL;
-@@ -2011,6 +2019,8 @@ fill_default_options(Options * options)
- 		options->gss_authentication = 0;
- 	if (options->gss_deleg_creds == -1)
- 		options->gss_deleg_creds = 0;
-+	if (options->gss_trust_dns == -1)
-+		options->gss_trust_dns = 0;
- 	if (options->password_authentication == -1)
- 		options->password_authentication = 1;
- 	if (options->kbd_interactive_authentication == -1)
-diff --git a/readconf.h b/readconf.h
-index 8e36bf32..c9e4718d 100644
---- a/readconf.h
-+++ b/readconf.h
-@@ -41,6 +41,7 @@ typedef struct {
- 					/* Try S/Key or TIS, authentication. */
- 	int     gss_authentication;	/* Try GSS authentication */
- 	int     gss_deleg_creds;	/* Delegate GSS credentials */
-+	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
- 	int     password_authentication;	/* Try password
- 						 * authentication. */
- 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
-diff --git a/ssh_config.5 b/ssh_config.5
-index 02a87892..95de538b 100644
---- a/ssh_config.5
-+++ b/ssh_config.5
-@@ -762,6 +762,16 @@ The default is
- Forward (delegate) credentials to the server.
- The default is
- .Cm no .
-+Note that this option applies to protocol version 2 connections using GSSAPI.
-+.It Cm GSSAPITrustDns
-+Set to
-+.Dq yes to indicate that the DNS is trusted to securely canonicalize
-+the name of the host being connected to. If
-+.Dq no, the hostname entered on the
-+command line will be passed untouched to the GSSAPI library.
-+The default is
-+.Dq no .
-+This option only applies to protocol version 2 connections using GSSAPI.
- .It Cm HashKnownHosts
- Indicates that
- .Xr ssh 1
-diff --git a/sshconnect2.c b/sshconnect2.c
-index 87fa70a4..a6ffdc96 100644
---- a/sshconnect2.c
-+++ b/sshconnect2.c
-@@ -697,6 +697,13 @@ userauth_gssapi(struct ssh *ssh)
- 	OM_uint32 min;
- 	int r, ok = 0;
- 	gss_OID mech = NULL;
-+	const char *gss_host;
-+
-+	if (options.gss_trust_dns) {
-+		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
-+		gss_host = auth_get_canonical_hostname(ssh, 1);
-+	} else
-+		gss_host = authctxt->host;
- 
- 	/* Try one GSSAPI method at a time, rather than sending them all at
- 	 * once. */
-@@ -711,7 +718,7 @@ userauth_gssapi(struct ssh *ssh)
- 		    elements[authctxt->mech_tried];
- 		/* My DER encoding requires length<128 */
- 		if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
--		    mech, authctxt->host)) {
-+		    mech, gss_host)) {
- 			ok = 1; /* Mechanism works */
- 		} else {
- 			authctxt->mech_tried++;
diff --git a/net-misc/openssh/files/openssh-8.1_p1-X509-12.3-tests.patch b/net-misc/openssh/files/openssh-8.1_p1-X509-12.3-tests.patch
deleted file mode 100644
index 67a93fe2a0b1..000000000000
--- a/net-misc/openssh/files/openssh-8.1_p1-X509-12.3-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openbsd-compat/regress/Makefile.in	2019-06-17 10:59:01.210601434 -0700
-+++ b/openbsd-compat/regress/Makefile.in	2019-06-17 10:59:18.753485852 -0700
-@@ -7,7 +7,7 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
-+CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
- EXEEXT=@EXEEXT@
- LIBCOMPAT=../libopenbsd-compat.a
- LIBS=@LIBS@
diff --git a/net-misc/openssh/files/openssh-8.1_p1-X509-glue-12.3.patch b/net-misc/openssh/files/openssh-8.1_p1-X509-glue-12.3.patch
deleted file mode 100644
index 48cce797904e..000000000000
--- a/net-misc/openssh/files/openssh-8.1_p1-X509-glue-12.3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Only in b: .openssh-8.1p1+x509-12.3.diff.un~
-diff -ur a/openssh-8.1p1+x509-12.3.diff b/openssh-8.1p1+x509-12.3.diff
---- a/openssh-8.1p1+x509-12.3.diff	2019-10-14 11:33:45.796485604 -0700
-+++ b/openssh-8.1p1+x509-12.3.diff	2019-10-14 11:39:44.960312587 -0700
-@@ -35343,12 +35343,11 @@
-  
-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
--@@ -339,6 +360,8 @@
-+@@ -339,6 +360,7 @@
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
--+	$(MKDIR_P) $(DESTDIR)$(piddir)
-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
-@@ -83536,16 +83535,6 @@
- +	return mbtowc(NULL, s, n);
- +}
- +#endif
--diff -ruN openssh-8.1p1/version.h openssh-8.1p1+x509-12.3/version.h
----- openssh-8.1p1/version.h	2019-10-09 03:31:03.000000000 +0300
--+++ openssh-8.1p1+x509-12.3/version.h	2019-10-13 09:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION	"OpenSSH_8.1"
-- 
---#define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.1p1/version.m4 openssh-8.1p1+x509-12.3/version.m4
- --- openssh-8.1p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.1p1+x509-12.3/version.m4	2019-10-13 09:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-glue.patch b/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-glue.patch
deleted file mode 100644
index 90fa248fcbac..000000000000
--- a/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-glue.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -ur a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
---- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 14:55:30.408567718 -0800
-+++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 15:16:14.646567224 -0800
-@@ -409,18 +409,10 @@
- index 817da43b..b2bcf78f 100644
- --- a/packet.c
- +++ b/packet.c
--@@ -925,6 +925,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-+@@ -925,6 +925,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-  	return 0;
-  }
-  
--+/* this supports the forced rekeying required for the NONE cipher */
--+int rekey_requested = 0;
--+void
--+packet_request_rekeying(void)
--+{
--+	rekey_requested = 1;
--+}
--+
- +/* used to determine if pre or post auth when rekeying for aes-ctr
- + * and none cipher switch */
- +int
-@@ -434,20 +426,6 @@
-  #define MAX_PACKETS	(1U<<31)
-  static int
-  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
--@@ -951,6 +969,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
-- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
-- 		return 0;
-- 
--+	/* used to force rekeying when called for by the none
--+         * cipher switch methods -cjr */
--+        if (rekey_requested == 1) {
--+                rekey_requested = 0;
--+                return 1;
--+        }
--+
-- 	/* Time-based rekeying */
-- 	if (state->rekey_interval != 0 &&
-- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
- diff --git a/packet.h b/packet.h
- index 8ccfd2e0..1ad9bc06 100644
- --- a/packet.h
-@@ -476,9 +454,9 @@
-  /* Format of the configuration file:
-  
- @@ -167,6 +168,8 @@ typedef enum {
-- 	oHashKnownHosts,
-  	oTunnel, oTunnelDevice,
-  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
-+ 	oDisableMTAES,
- +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- +	oNoneEnabled, oNoneSwitch,
-  	oVisualHostKey,
-@@ -615,9 +593,9 @@
-  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
-  	SyslogFacility log_facility;	/* Facility for system logging. */
- @@ -112,7 +116,10 @@ typedef struct {
-- 
-  	int	enable_ssh_keysign;
-  	int64_t rekey_limit;
-+ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
- +	int     none_switch;    /* Use none cipher */
- +	int     none_enabled;   /* Allow none to be used */
-  	int	rekey_interval;
-@@ -700,9 +678,9 @@
- +			options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
- +	}
- +
-+ 	if (options->disable_multithreaded == -1)
-+ 		options->disable_multithreaded = 0;
-  	if (options->ip_qos_interactive == -1)
-- 		options->ip_qos_interactive = IPTOS_DSCP_AF21;
-- 	if (options->ip_qos_bulk == -1)
- @@ -486,6 +532,8 @@ typedef enum {
-  	sPasswordAuthentication, sKbdInteractiveAuthentication,
-  	sListenAddress, sAddressFamily,
-@@ -1079,11 +1057,11 @@
-  	xxx_host = host;
-  	xxx_hostaddr = hostaddr;
-  
--@@ -422,6 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-+@@ -422,7 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-  
-  	if (!authctxt.success)
-  		fatal("Authentication failed.");
--+
-+ 
- +	/*
- +	 * If the user wants to use the none cipher, do it post authentication
- +	 * and only if the right conditions are met -- both of the NONE commands
-@@ -1105,9 +1083,9 @@
- +		}
- +	}
- +
-- 	debug("Authentication succeeded (%s).", authctxt.method->name);
-- }
-- 
-+ #ifdef WITH_OPENSSL
-+ 	if (options.disable_multithreaded == 0) {
-+ 		/* if we are using aes-ctr there can be issues in either a fork or sandbox
- diff --git a/sshd.c b/sshd.c
- index 11571c01..23a06022 100644
- --- a/sshd.c
diff --git a/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-sctp-glue.patch b/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-sctp-glue.patch
deleted file mode 100644
index 3f5c7a47d9c8..000000000000
--- a/net-misc/openssh/files/openssh-8.1_p1-hpn-14.20-sctp-glue.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
---- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 14:55:30.408567718 -0800
-+++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-04 16:36:51.394069720 -0800
-@@ -1191,15 +1191,3 @@
-  # Example of overriding settings on a per-user basis
-  #Match User anoncvs
-  #	X11Forwarding no
--diff --git a/version.h b/version.h
--index 6b3fadf8..ec1d2e27 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,6 @@
-- #define SSH_VERSION	"OpenSSH_8.1"
-- 
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN         "-hpn14v20"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
--+ 
diff --git a/net-misc/openssh/files/openssh-8.1_p1-tests-2020.patch b/net-misc/openssh/files/openssh-8.1_p1-tests-2020.patch
deleted file mode 100644
index 505e34db9d20..000000000000
--- a/net-misc/openssh/files/openssh-8.1_p1-tests-2020.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
-index 86ea6250..844adabc 100644
---- a/regress/cert-hostkey.sh
-+++ b/regress/cert-hostkey.sh
-@@ -252,7 +252,7 @@ test_one() {
- test_one "user-certificate"	failure "-n $HOSTS"
- test_one "empty principals"	success "-h"
- test_one "wrong principals"	failure "-h -n foo"
--test_one "cert not yet valid"	failure "-h -V20200101:20300101"
-+test_one "cert not yet valid"	failure "-h -V20300101:20320101"
- test_one "cert expired"		failure "-h -V19800101:19900101"
- test_one "cert valid interval"	success "-h -V-1w:+2w"
- test_one "cert has constraints"	failure "-h -Oforce-command=false"
-diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
-index 38c14a69..5cd02fc3 100644
---- a/regress/cert-userkey.sh
-+++ b/regress/cert-userkey.sh
-@@ -338,7 +338,7 @@ test_one() {
- test_one "correct principal"	success "-n ${USER}"
- test_one "host-certificate"	failure "-n ${USER} -h"
- test_one "wrong principals"	failure "-n foo"
--test_one "cert not yet valid"	failure "-n ${USER} -V20200101:20300101"
-+test_one "cert not yet valid"	failure "-n ${USER} -V20300101:20320101"
- test_one "cert expired"		failure "-n ${USER} -V19800101:19900101"
- test_one "cert valid interval"	success "-n ${USER} -V-1w:+2w"
- test_one "wrong source-address"	failure "-n ${USER} -Osource-address=10.0.0.0/8"
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.3-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.3-tests.patch
deleted file mode 100644
index 1c58d0d5d823..000000000000
--- a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.3-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openbsd-compat/regress/Makefile.in	2020-02-15 10:59:01.210601434 -0700
-+++ b/openbsd-compat/regress/Makefile.in	2020-02-15 10:59:18.753485852 -0700
-@@ -7,7 +7,7 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
-+CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
- EXEEXT=@EXEEXT@
- LIBCOMPAT=../libopenbsd-compat.a
- LIBS=@LIBS@
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.3.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.3.patch
deleted file mode 100644
index e73c499d5c4e..000000000000
--- a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.3.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- a/openssh-8.2p1+x509-12.4.3.diff	2020-03-21 11:15:05.939809371 -0700
-+++ b/openssh-8.2p1+x509-12.4.3.diff	2020-03-21 11:23:15.424752355 -0700
-@@ -39298,16 +39298,15 @@
-  
-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
--@@ -378,6 +379,8 @@
-+@@ -378,6 +379,7 @@
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
--+	$(MKDIR_P) $(DESTDIR)$(piddir)
-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
--@@ -386,11 +389,14 @@
-+@@ -386,11 +388,14 @@
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
-@@ -39326,7 +39325,7 @@
-  	$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
-  	$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-  	$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
--@@ -400,12 +406,12 @@
-+@@ -400,12 +405,12 @@
-  	$(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
-  	$(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
-  	$(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
-@@ -39340,7 +39339,7 @@
-  
-  install-sysconf:
-  	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
--@@ -463,10 +469,9 @@
-+@@ -463,10 +468,9 @@
-  	-rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
-  	-rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)
-  	-rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
-@@ -39354,7 +39353,7 @@
-  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
-  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
-  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
--@@ -478,7 +483,6 @@
-+@@ -478,7 +482,6 @@
-  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
-  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
-  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
-@@ -39362,7 +39361,7 @@
-  
-  regress-prep:
-  	$(MKDIR_P) `pwd`/regress/unittests/test_helper
--@@ -491,11 +495,11 @@
-+@@ -491,11 +494,11 @@
-  	$(MKDIR_P) `pwd`/regress/unittests/match
-  	$(MKDIR_P) `pwd`/regress/unittests/utf8
-  	$(MKDIR_P) `pwd`/regress/misc/kexfuzz
-@@ -39376,7 +39375,7 @@
-  
-  regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS)
-  	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \
--@@ -546,8 +550,7 @@
-+@@ -546,8 +549,7 @@
-  	regress/unittests/sshkey/tests.o \
-  	regress/unittests/sshkey/common.o \
-  	regress/unittests/sshkey/test_file.o \
-@@ -39406,7 +39405,7 @@
-  
-  regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \
-      ${UNITTESTS_TEST_HOSTKEYS_OBJS} \
--@@ -618,35 +619,18 @@
-+@@ -618,35 +618,18 @@
-  	    -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
-  
-  MISC_KEX_FUZZ_OBJS=\
-@@ -39444,7 +39443,7 @@
-  	regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
-  	regress/unittests/sshkey/test_sshkey$(EXEEXT) \
-  	regress/unittests/bitmap/test_bitmap$(EXEEXT) \
--@@ -657,36 +641,29 @@
-+@@ -657,36 +640,29 @@
-  	regress/unittests/utf8/test_utf8$(EXEEXT) \
-  	regress/misc/kexfuzz/kexfuzz$(EXEEXT)
-  
-@@ -39501,7 +39500,7 @@
-  	TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
-  	TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \
-  	TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
--@@ -708,8 +685,6 @@
-+@@ -708,8 +684,6 @@
-  		TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \
-  		TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
-  		TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
-@@ -39510,7 +39509,7 @@
-  		TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
-  		TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
-  		TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
--@@ -717,17 +692,35 @@
-+@@ -717,17 +691,35 @@
-  		TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
-  		TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \
-  		TEST_SSH_ECC="$${TEST_SSH_ECC}" \
-@@ -39549,7 +39548,7 @@
-  
-  survey: survey.sh ssh
-  	@$(SHELL) ./survey.sh > survey
--@@ -743,4 +736,8 @@
-+@@ -743,4 +735,8 @@
-  		sh buildpkg.sh; \
-  	fi
-  
-@@ -98215,16 +98214,6 @@
- +	return mbtowc(NULL, s, n);
- +}
- +#endif
--diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.3/version.h
----- openssh-8.2p1/version.h	2020-02-14 02:40:54.000000000 +0200
--+++ openssh-8.2p1+x509-12.4.3/version.h	2020-03-21 19:07:00.000000000 +0200
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION	"OpenSSH_8.2"
-- 
---#define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4.3/version.m4
- --- openssh-8.2p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.2p1+x509-12.4.3/version.m4	2020-03-21 19:07:00.000000000 +0200
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-X509-glue.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-X509-glue.patch
deleted file mode 100644
index 5af4534ce77c..000000000000
--- a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-X509-glue.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff
---- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 13:41:56.143193830 -0800
-+++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 13:46:40.060133610 -0800
-@@ -3,9 +3,9 @@
- --- a/Makefile.in
- +++ b/Makefile.in
- @@ -42,7 +42,7 @@ CC=@CC@
-- CFLAGS_NOPIE=@CFLAGS_NOPIE@
-- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-- PICFLAG=@PICFLAG@
-+ LD=@LD@
-+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
-+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
-  K5LIBS=@K5LIBS@
-@@ -803,8 +803,8 @@
-  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
-  {
-  	struct session_state *state;
---	const struct sshcipher *none = cipher_by_name("none");
--+	struct sshcipher *none = cipher_by_name("none");
-+-	const struct sshcipher *none = cipher_none();
-++	struct sshcipher *none = cipher_none();
-  	int r;
-  
-  	if (none == NULL) {
-@@ -902,14 +902,14 @@
-  
-  /*
- @@ -2118,6 +2125,8 @@ fill_default_options(Options * options)
-- 		options->canonicalize_hostname = SSH_CANONICALISE_NO;
-- 	if (options->fingerprint_hash == -1)
-  		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
-+ 	if (options->update_hostkeys == -1)
-+ 		options->update_hostkeys = 0;
- +	if (options->disable_multithreaded == -1)
- +		options->disable_multithreaded = 0;
-- #ifdef ENABLE_SK_INTERNAL
-  	if (options->sk_provider == NULL)
-- 		options->sk_provider = xstrdup("internal");
-+ 		options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
-+  
- diff --git a/readconf.h b/readconf.h
- index 8e36bf32..c803eca7 100644
- --- a/readconf.h
-@@ -948,9 +948,9 @@
-  	/* Portable-specific options */
-  	sUsePAM,
- +	sDisableMTAES,
-- 	/* Standard Options */
-- 	sPort, sHostKeyFile, sLoginGraceTime,
-- 	sPermitRootLogin, sLogFacility, sLogLevel,
-+ 	/* X.509 Standard Options */
-+ 	sHostbasedAlgorithms,
-+ 	sPubkeyAlgorithms,
- @@ -643,6 +647,7 @@ static struct {
-  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
-  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
-Only in b: openssh-8_1_P1-hpn-AES-CTR-14.20.diff.orig
-diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
---- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 13:41:56.144193830 -0800
-+++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 13:45:36.665147504 -0800
-@@ -382,7 +382,7 @@
- @@ -884,6 +884,10 @@ kex_choose_conf(struct ssh *ssh)
-  	int nenc, nmac, ncomp;
-  	u_int mode, ctos, need, dh_need, authlen;
-- 	int r, first_kex_follows;
-+ 	int r, first_kex_follows = 0;
- +	int auth_flag;
- +
- +	auth_flag = packet_authentication_state(ssh);
-@@ -391,8 +391,8 @@
-  	debug2("local %s KEXINIT proposal", kex->server ? "server" : "client");
-  	if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0)
- @@ -954,6 +958,14 @@ kex_choose_conf(struct ssh *ssh)
-- 			peer[ncomp] = NULL;
-- 			goto out;
-+ 			else
-+ 				fatal("Pre-authentication none cipher requests are not allowed.");
-  		}
- +		debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name);
- +		if (strcmp(newkeys->enc.name, "none") == 0) {
-@@ -1169,15 +1169,3 @@
-  # Example of overriding settings on a per-user basis
-  #Match User anoncvs
-  #	X11Forwarding no
--diff --git a/version.h b/version.h
--index 6b3fadf8..ec1d2e27 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,6 @@
-- #define SSH_VERSION	"OpenSSH_8.1"
-- 
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN         "-hpn14v20"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
--+ 
-diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-PeakTput-14.20.diff b/openssh-8_1_P1-hpn-PeakTput-14.20.diff
---- a/openssh-8_1_P1-hpn-PeakTput-14.20.diff	2020-02-15 13:41:43.834196317 -0800
-+++ b/openssh-8_1_P1-hpn-PeakTput-14.20.diff	2020-02-15 13:45:36.665147504 -0800
-@@ -12,9 +12,9 @@
-  static long stalled;		/* how long we have been stalled */
-  static int bytes_per_second;	/* current speed in bytes per second */
- @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
-+ 	off_t bytes_left;
-  	int cur_speed;
-- 	int hours, minutes, seconds;
-- 	int file_len;
-+ 	int len;
- +	off_t delta_pos;
-  
-  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
-@@ -33,12 +33,12 @@
- @@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
-  
-  	/* filename */
-- 	buf[0] = '\0';
---	file_len = win_size - 36;
--+	file_len = win_size - 45;
-- 	if (file_len > 0) {
-- 		buf[0] = '\r';
-- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
-+ 	if (win_size > 36) {
-+-		int file_len = win_size - 36;
-++		int file_len = win_size - 45;
-+ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
-+ 		    file_len, file);
-+ 	}
- @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
-  	    (off_t)bytes_per_second);
-  	strlcat(buf, "/s ", win_size);
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-glue.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-glue.patch
deleted file mode 100644
index b2163fe5ad56..000000000000
--- a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-glue.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff
---- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 12:50:44.413776914 -0800
-+++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 12:53:06.190742744 -0800
-@@ -3,9 +3,9 @@
- --- a/Makefile.in
- +++ b/Makefile.in
- @@ -42,7 +42,7 @@ CC=@CC@
-- LD=@LD@
-- CFLAGS=@CFLAGS@
-+ CFLAGS_NOPIE=@CFLAGS_NOPIE@
-  CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-+ PICFLAG=@PICFLAG@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
-  K5LIBS=@K5LIBS@
-@@ -902,14 +902,14 @@
-  
-  /*
- @@ -2118,6 +2125,8 @@ fill_default_options(Options * options)
-+ 		options->canonicalize_hostname = SSH_CANONICALISE_NO;
-+ 	if (options->fingerprint_hash == -1)
-  		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
-- 	if (options->update_hostkeys == -1)
-- 		options->update_hostkeys = 0;
- +	if (options->disable_multithreaded == -1)
- +		options->disable_multithreaded = 0;
-- 
-- 	/* Expand KEX name lists */
-- 	all_cipher = cipher_alg_list(',', 0);
-+ #ifdef ENABLE_SK_INTERNAL
-+ 	if (options->sk_provider == NULL)
-+ 		options->sk_provider = xstrdup("internal");
- diff --git a/readconf.h b/readconf.h
- index 8e36bf32..c803eca7 100644
- --- a/readconf.h
-@@ -952,9 +952,9 @@
-  	sPort, sHostKeyFile, sLoginGraceTime,
-  	sPermitRootLogin, sLogFacility, sLogLevel,
- @@ -643,6 +647,7 @@ static struct {
-- 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
-  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
-  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
-+ 	{ "include", sInclude, SSHCFG_ALL },
- +	{ "disableMTAES", sDisableMTAES, SSHCFG_ALL },
-  	{ "ipqos", sIPQoS, SSHCFG_ALL },
-  	{ "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },
-diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
---- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:50:44.413776914 -0800
-+++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:51:19.541768656 -0800
-@@ -409,18 +409,10 @@
- index 817da43b..b2bcf78f 100644
- --- a/packet.c
- +++ b/packet.c
--@@ -925,6 +925,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-+@@ -925,6 +925,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-  	return 0;
-  }
-  
--+/* this supports the forced rekeying required for the NONE cipher */
--+int rekey_requested = 0;
--+void
--+packet_request_rekeying(void)
--+{
--+	rekey_requested = 1;
--+}
--+
- +/* used to determine if pre or post auth when rekeying for aes-ctr
- + * and none cipher switch */
- +int
-@@ -434,20 +426,6 @@
-  #define MAX_PACKETS	(1U<<31)
-  static int
-  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
--@@ -951,6 +969,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
-- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
-- 		return 0;
-- 
--+	/* used to force rekeying when called for by the none
--+         * cipher switch methods -cjr */
--+        if (rekey_requested == 1) {
--+                rekey_requested = 0;
--+                return 1;
--+        }
--+
-- 	/* Time-based rekeying */
-- 	if (state->rekey_interval != 0 &&
-- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
- diff --git a/packet.h b/packet.h
- index 8ccfd2e0..1ad9bc06 100644
- --- a/packet.h
-@@ -476,9 +454,9 @@
-  /* Format of the configuration file:
-  
- @@ -167,6 +168,8 @@ typedef enum {
-- 	oHashKnownHosts,
-  	oTunnel, oTunnelDevice,
-  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
-+ 	oDisableMTAES,
- +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- +	oNoneEnabled, oNoneSwitch,
-  	oVisualHostKey,
-@@ -615,9 +593,9 @@
-  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
-  	SyslogFacility log_facility;	/* Facility for system logging. */
- @@ -112,7 +116,10 @@ typedef struct {
-- 
-  	int	enable_ssh_keysign;
-  	int64_t rekey_limit;
-+ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
- +	int     none_switch;    /* Use none cipher */
- +	int     none_enabled;   /* Allow none to be used */
-  	int	rekey_interval;
-@@ -700,9 +678,9 @@
- +			options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
- +	}
- +
-+ 	if (options->disable_multithreaded == -1)
-+ 		options->disable_multithreaded = 0;
-  	if (options->ip_qos_interactive == -1)
-- 		options->ip_qos_interactive = IPTOS_DSCP_AF21;
-- 	if (options->ip_qos_bulk == -1)
- @@ -486,6 +532,8 @@ typedef enum {
-  	sPasswordAuthentication, sKbdInteractiveAuthentication,
-  	sListenAddress, sAddressFamily,
-@@ -1079,11 +1057,11 @@
-  	xxx_host = host;
-  	xxx_hostaddr = hostaddr;
-  
--@@ -422,6 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-+@@ -422,7 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-  
-  	if (!authctxt.success)
-  		fatal("Authentication failed.");
--+
-+ 
- +	/*
- +	 * If the user wants to use the none cipher, do it post authentication
- +	 * and only if the right conditions are met -- both of the NONE commands
-@@ -1105,9 +1083,9 @@
- +		}
- +	}
- +
-- 	debug("Authentication succeeded (%s).", authctxt.method->name);
-- }
-- 
-+ #ifdef WITH_OPENSSL
-+ 	if (options.disable_multithreaded == 0) {
-+ 		/* if we are using aes-ctr there can be issues in either a fork or sandbox
- diff --git a/sshd.c b/sshd.c
- index 11571c01..23a06022 100644
- --- a/sshd.c
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
deleted file mode 100644
index 69dd22a5eeb6..000000000000
--- a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-04-17 10:31:37.392120799 -0700
-+++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-04-17 10:32:46.143684424 -0700
-@@ -672,7 +672,7 @@
- +const EVP_CIPHER *
- +evp_aes_ctr_mt(void)
- +{
--+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL
-++# if (OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)) && !defined(LIBRESSL_VERSION_NUMBER)
- +	static EVP_CIPHER *aes_ctr;
- +	aes_ctr = EVP_CIPHER_meth_new(NID_undef, 16/*block*/, 16/*key*/);
- +	EVP_CIPHER_meth_set_iv_length(aes_ctr, AES_BLOCK_SIZE);
-@@ -701,7 +701,7 @@
- +		EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
- +#  endif /*SSH_OLD_EVP*/
- +        return &aes_ctr;
--+# endif /*OPENSSH_VERSION_NUMBER*/
-++# endif /*OPENSSL_VERSION_NUMBER*/
- +}
- +
- +#endif /* defined(WITH_OPENSSL) */
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-sctp-glue.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-sctp-glue.patch
deleted file mode 100644
index 2397aad96f2a..000000000000
--- a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-sctp-glue.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
---- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:10:00.321998279 -0800
-+++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:10:21.759980508 -0800
-@@ -1169,15 +1169,3 @@
-  # Example of overriding settings on a per-user basis
-  #Match User anoncvs
-  #	X11Forwarding no
--diff --git a/version.h b/version.h
--index 6b3fadf8..ec1d2e27 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,6 @@
-- #define SSH_VERSION	"OpenSSH_8.1"
-- 
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN         "-hpn14v20"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
--+ 
diff --git a/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch b/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch
deleted file mode 100644
index d1651bc187f1..000000000000
--- a/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Only in b: .openssh-8.3p1+x509-12.5.1.diff.un~
-diff -u a/openssh-8.3p1+x509-12.5.1.diff b/openssh-8.3p1+x509-12.5.1.diff
---- a/openssh-8.3p1+x509-12.5.1.diff	2020-06-08 10:13:08.937543708 -0700
-+++ b/openssh-8.3p1+x509-12.5.1.diff	2020-06-08 10:16:33.417271984 -0700
-@@ -35541,12 +35541,11 @@
-  
-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
--@@ -382,6 +363,8 @@
-+@@ -382,6 +363,7 @@
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
--+	$(MKDIR_P) $(DESTDIR)$(piddir)
-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
-@@ -97028,16 +97027,6 @@
- +int	 asnmprintf(char **, size_t, int *, const char *, ...)
-  	     __attribute__((format(printf, 4, 5)));
-  void	 msetlocale(void);
--diff -ruN openssh-8.3p1/version.h openssh-8.3p1+x509-12.5.1/version.h
----- openssh-8.3p1/version.h	2020-05-27 03:38:00.000000000 +0300
--+++ openssh-8.3p1+x509-12.5.1/version.h	2020-06-07 11:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION	"OpenSSH_8.3"
-- 
---#define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.3p1/version.m4 openssh-8.3p1+x509-12.5.1/version.m4
- --- openssh-8.3p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.3p1+x509-12.5.1/version.m4	2020-06-07 11:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-8.3_p1-hpn-14.20-glue.patch b/net-misc/openssh/files/openssh-8.3_p1-hpn-14.20-glue.patch
deleted file mode 100644
index 4414f9be5331..000000000000
--- a/net-misc/openssh/files/openssh-8.3_p1-hpn-14.20-glue.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Only in b: .openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff.un~
-diff -ur a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff
---- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-05-27 13:52:27.704108928 -0700
-+++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-05-27 13:52:49.803967500 -0700
-@@ -3,9 +3,9 @@
- --- a/Makefile.in
- +++ b/Makefile.in
- @@ -42,7 +42,7 @@ CC=@CC@
-- LD=@LD@
-- CFLAGS=@CFLAGS@
-+ CFLAGS_NOPIE=@CFLAGS_NOPIE@
-  CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-+ PICFLAG=@PICFLAG@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
-  K5LIBS=@K5LIBS@
-@@ -902,14 +902,14 @@
-  
-  /*
- @@ -2118,6 +2125,8 @@ fill_default_options(Options * options)
-+ 		options->canonicalize_hostname = SSH_CANONICALISE_NO;
-+ 	if (options->fingerprint_hash == -1)
-  		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
-- 	if (options->update_hostkeys == -1)
-- 		options->update_hostkeys = 0;
- +	if (options->disable_multithreaded == -1)
- +		options->disable_multithreaded = 0;
-- 
-- 	/* Expand KEX name lists */
-- 	all_cipher = cipher_alg_list(',', 0);
-+ #ifdef ENABLE_SK_INTERNAL
-+ 	if (options->sk_provider == NULL)
-+ 		options->sk_provider = xstrdup("internal");
- diff --git a/readconf.h b/readconf.h
- index 8e36bf32..c803eca7 100644
- --- a/readconf.h
-@@ -952,9 +952,9 @@
-  	sPort, sHostKeyFile, sLoginGraceTime,
-  	sPermitRootLogin, sLogFacility, sLogLevel,
- @@ -643,6 +647,7 @@ static struct {
-- 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
-  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
-  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
-+ 	{ "include", sInclude, SSHCFG_ALL },
- +	{ "disableMTAES", sDisableMTAES, SSHCFG_ALL },
-  	{ "ipqos", sIPQoS, SSHCFG_ALL },
-  	{ "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },
-diff -ur a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
---- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-05-27 13:52:27.705108921 -0700
-+++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-05-27 14:03:57.888683100 -0700
-@@ -409,18 +409,10 @@
- index 817da43b..b2bcf78f 100644
- --- a/packet.c
- +++ b/packet.c
--@@ -925,6 +925,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-+@@ -925,6 +925,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-  	return 0;
-  }
-  
--+/* this supports the forced rekeying required for the NONE cipher */
--+int rekey_requested = 0;
--+void
--+packet_request_rekeying(void)
--+{
--+	rekey_requested = 1;
--+}
--+
- +/* used to determine if pre or post auth when rekeying for aes-ctr
- + * and none cipher switch */
- +int
-@@ -434,20 +426,6 @@
-  #define MAX_PACKETS	(1U<<31)
-  static int
-  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
--@@ -951,6 +969,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
-- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
-- 		return 0;
-- 
--+	/* used to force rekeying when called for by the none
--+         * cipher switch methods -cjr */
--+        if (rekey_requested == 1) {
--+                rekey_requested = 0;
--+                return 1;
--+        }
--+
-- 	/* Time-based rekeying */
-- 	if (state->rekey_interval != 0 &&
-- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
- diff --git a/packet.h b/packet.h
- index 8ccfd2e0..1ad9bc06 100644
- --- a/packet.h
-@@ -476,9 +454,9 @@
-  /* Format of the configuration file:
-  
- @@ -167,6 +168,8 @@ typedef enum {
-- 	oHashKnownHosts,
-  	oTunnel, oTunnelDevice,
-  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
-+ 	oDisableMTAES,
- +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- +	oNoneEnabled, oNoneSwitch,
-  	oVisualHostKey,
-@@ -615,9 +593,9 @@
-  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
-  	SyslogFacility log_facility;	/* Facility for system logging. */
- @@ -112,7 +116,10 @@ typedef struct {
-- 
-  	int	enable_ssh_keysign;
-  	int64_t rekey_limit;
-+ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
- +	int     none_switch;    /* Use none cipher */
- +	int     none_enabled;   /* Allow none to be used */
-  	int	rekey_interval;
-@@ -700,9 +678,9 @@
- +			options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
- +	}
- +
-+ 	if (options->disable_multithreaded == -1)
-+ 		options->disable_multithreaded = 0;
-  	if (options->ip_qos_interactive == -1)
-- 		options->ip_qos_interactive = IPTOS_DSCP_AF21;
-- 	if (options->ip_qos_bulk == -1)
- @@ -486,6 +532,8 @@ typedef enum {
-  	sPasswordAuthentication, sKbdInteractiveAuthentication,
-  	sListenAddress, sAddressFamily,
-@@ -731,11 +709,10 @@
-  			*flags = keywords[i].flags;
-  			return keywords[i].opcode;
-  		}
--@@ -1424,10 +1477,27 @@ process_server_config_line(ServerOptions *options, char *line,
-- 		multistate_ptr = multistate_flag;
-+@@ -1424,12 +1477,28 @@ process_server_config_line(ServerOptions *options, char *line,
-+ 		multistate_ptr = multistate_ignore_rhosts;
-  		goto parse_multistate;
-  
--+
- +	case sTcpRcvBufPoll:
- +		intptr = &options->tcp_rcv_buf_poll;
- +		goto parse_flag;
-@@ -750,7 +727,9 @@
- +
-  	case sIgnoreUserKnownHosts:
-  		intptr = &options->ignore_user_known_hosts;
-- 		goto parse_flag;
-+  parse_flag:
-+ 		multistate_ptr = multistate_flag;
-+ 		goto parse_multistate;
-  
- +	case sNoneEnabled:
- +		intptr = &options->none_enabled;
-@@ -1079,11 +1058,11 @@
-  	xxx_host = host;
-  	xxx_hostaddr = hostaddr;
-  
--@@ -422,6 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-+@@ -422,7 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-  
-  	if (!authctxt.success)
-  		fatal("Authentication failed.");
--+
-+ 
- +	/*
- +	 * If the user wants to use the none cipher, do it post authentication
- +	 * and only if the right conditions are met -- both of the NONE commands
-@@ -1105,9 +1084,9 @@
- +		}
- +	}
- +
-- 	debug("Authentication succeeded (%s).", authctxt.method->name);
-- }
-- 
-+ #ifdef WITH_OPENSSL
-+ 	if (options.disable_multithreaded == 0) {
-+ 		/* if we are using aes-ctr there can be issues in either a fork or sandbox
- diff --git a/sshd.c b/sshd.c
- index 11571c01..23a06022 100644
- --- a/sshd.c
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index c97875b778ec..9b6b7e57d598 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST ownCloud-2.7.4.2934.tar.xz 14151708 BLAKE2B ad6f3d827a2fdcead6fdc2514696e8fbdb75b2d365c9a09602b95b24c669695e3693167f5da305e27e6fb2266f106b50c578def1d1518730926a10f640defbd9 SHA512 7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6
 DIST ownCloud-2.7.5.3180.tar.xz 14154036 BLAKE2B ebee57568b917c1c7dec8f41f172caf53d0bfe4eae5e24ec5c9adbf656bf667769b0ed341a13a899ff6a04cd779d92b145736dce5a4e72055d306b2f08e0a902 SHA512 9e788341c45753eb2d2c62d252cf453259474689fd7d498147e0f4548a9038bd44bdca1539f9617d383853f8f9ca2f24c575667fb96e2a1a4ceec30195d257c2
+DIST ownCloud-2.7.6.3261.tar.xz 14237692 BLAKE2B 914b069b10fa2f169677768e1578c5b8569836eb574889c72c0ea1ca3e16e6b7c65bcdd1f4a5ce4259eab6ec56110e3b45799d010921e47c7f64ccfd0ed545bf SHA512 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd
 EBUILD owncloud-client-2.7.4.2934.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
 EBUILD owncloud-client-2.7.5.3180.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
+EBUILD owncloud-client-2.7.6.3261.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
 MISC metadata.xml 431 BLAKE2B 9b495fdaa517bd56e7333305fbe7a9447fea599b96a3fe92121d4114812c1e6822b0095f65cee2207a0d2a8a667e4b4e9658d2e6a2a1c2563fe58397a9919b20 SHA512 0f8487e586ea6e6580dfcb816e7b17944cf822978b275b2e8e5f7feffc360bc69230236406a8b95aa5bd1342a14cb763fb39b9e1244d524bfea6d8f5ce831f49
diff --git a/net-misc/owncloud-client/owncloud-client-2.7.6.3261.ebuild b/net-misc/owncloud-client/owncloud-client-2.7.6.3261.ebuild
new file mode 100644
index 000000000000..4afe35f947d5
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.7.6.3261.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+MY_PN="ownCloud"
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin gnome-keyring nautilus test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	xdg_pkg_postinst
+}
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index a7e9bd089a2b..31087a9c8ff1 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,5 +1,3 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
-DIST pulseaudio-dlna-0.6.0_pre20200114.tar.gz 709196 BLAKE2B 3113d34eaadf735646f7e421e8271fcac02ea4faed76676d5a70e05c8a26745ffd1ae135d2c5186d9db7ad146d166535a1c901927d24ae2a1a4d08720a4f78d2 SHA512 9c97d160116acf07325b18f35000b58a042243345f98cb1c9e42848e39ef3ef32a9199e31044a758a0a5ec81176be651fa3ef2917a227347017fe375e27385c7
-EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1930 BLAKE2B 604544a600229a79813012483c7ee5e5ddd3281bcf21b63ea028051338b686e8e9b217f84eb630c8a808a2c8b381252378ed61248d9d518deaa183ed63c0bdfd SHA512 8767e4612b60734ba617bfdc59218da3c35350dd7d64d4820f69bb3c6a227c4f3f46a2d330e20540ada211a18f01ec81450b13ee4af9f9398912070bc10111e4
-EBUILD pulseaudio-dlna-9999.ebuild 2047 BLAKE2B 843cd815020ce22692edda72d1a97d9299f52594ff18cf629426d966310d84fc85c629d4c4c88a36b5ff5519f9835a5bb5d74c1ef2c1aaebf165ff3d9d692c40 SHA512 b9fba3cf64f9f574641ef9716b7c6a3243333139c7e4566cb79a24cea210028582b4c85eeac98abf67ab90e71867c5e5dae3f18c51e7a6f1a1ca52ba737e8af9
+EBUILD pulseaudio-dlna-9999.ebuild 2019 BLAKE2B 266ac29d3776ff6aa5e9d933eb7d099812899ebb82874453499816195b5ae51ebe4d14842ec0e2a45fdfaec14bc42e205a419af5851b5cea134104461708a7c8 SHA512 db84789f4eab84be3a43a1cf0047f5d09cd4ff57db495c38c57acc94b7f363415925c1e8239c9bb7b9f2410e6e2ee93c1d00627d77a45caf2691ae5787853e90
 MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
deleted file mode 100644
index b52ffad2c0b4..000000000000
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit desktop distutils-r1
-
-DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
-
-SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/b0db8137224f5a293329a60187365168304c3768.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/pulseaudio-dlna-b0db8137224f5a293329a60187365168304c3768"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	gnome-base/librsvg[introspection]
-	x11-libs/gtk+:3[introspection]
-	|| (
-		|| (
-			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
-		(
-			media-libs/faac
-			media-libs/flac
-			media-sound/lame
-			media-sound/opus-tools
-			media-sound/sox
-			media-sound/vorbis-tools
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-sound/pulseaudio"
-
-python_prepare_all() {
-	sed -i '/dbus-python/d' setup.py || die
-	sed -i '/notify2/d' setup.py || die
-	sed -i '/docopt/d' setup.py || die
-	sed -i '/pychromecast/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 27c53833cce4..d314e16809df 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
-inherit distutils-r1
+inherit desktop distutils-r1
 
 DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
 HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
@@ -42,11 +42,10 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
 	|| (
 		|| (
-			media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
+			media-video/ffmpeg[encode,mp3,opus,vorbis]
 			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
 		)
 		(
-			media-libs/faac
 			media-libs/flac
 			media-sound/lame
 			media-sound/opus-tools
@@ -70,6 +69,5 @@ python_prepare_all() {
 src_install() {
 	distutils-r1_src_install
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}/${PN}.desktop"
+	domenu "${FILESDIR}/${PN}.desktop"
 }
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index 5cc51e85bafb..471abd318940 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,5 +1,3 @@
-DIST pyhoca-cli-0.6.1.1.tar.gz 41893 BLAKE2B 39f695224c64dacf0f2efa449ff3e235f22571647e77dd58ed031a0899991337af8deff5808293b4f1e1932a47dbd7af63ab6b86b1c5373122f4678eefec168a SHA512 b83e584f314df936d09cda25b253bbd5f37aa7f57db084424b2696070963a99776284c827f602321329bd066c6f483f32cd3dd0aa961eea7c79aa217949966c7
 DIST pyhoca-cli-0.6.1.2.tar.gz 41891 BLAKE2B a3183acc8b4a809e5b3894bbcb276972f3bf0178f2a9f596e697866db4217ca4e04d6b3d698b202e124a2e42a3b1f9b2f0fbd595bf0483f55dd7dbe9ea108ef3 SHA512 02bb6a0dcb72bc67e8b8109e554f04fa57d5b2da2682b50a081b60e19c257842ae31aabb7faa945579fb23d0e922befd0678c413b31393d368b4173e0d4315f6
-EBUILD pyhoca-cli-0.6.1.1.ebuild 672 BLAKE2B 39253275c48521acdcc40b104b1f688b1b6277ebd3b7db0bf9444033963a2aa44926fdb4b20045e8ad750c861f687c1a8135b786a053ad5806f5bfe7417fc276 SHA512 3ac4ad59f1e13ea005ea38d481287baab85a669e172873b4872bc904971f8f3cbc20873140050335a1ab415095905847fe5e71daa8913938975b6100cea92b93
-EBUILD pyhoca-cli-0.6.1.2.ebuild 672 BLAKE2B 39253275c48521acdcc40b104b1f688b1b6277ebd3b7db0bf9444033963a2aa44926fdb4b20045e8ad750c861f687c1a8135b786a053ad5806f5bfe7417fc276 SHA512 3ac4ad59f1e13ea005ea38d481287baab85a669e172873b4872bc904971f8f3cbc20873140050335a1ab415095905847fe5e71daa8913938975b6100cea92b93
-MISC metadata.xml 521 BLAKE2B 07e613991af22f75609d554e9c533773fb4ae1b00227c717dde027b16cc14c5a31c0144b8970dc8095e2eabd62d3bff0578b290489eb44787611b860120ed35d SHA512 7be8e7f29191fc70cfb2c9f3482dc536803ba374996c52fb8c7011c60c0f7de0b10ab333792ee59b391d04e8a74bd778a30db7a6722118e612db232567527959
+EBUILD pyhoca-cli-0.6.1.2.ebuild 800 BLAKE2B f1cb3e40f1d54725a8da3f046e6d4187c30b0f19483de9dfc79a692d976d20e8fc4a685296ac94dd01deba7b6bb0ea10a08eb3373421057b94d3c8d225b382be SHA512 0e977e18c80369dbd861b6b3bbc6f26913f4f4bcb126a245d08e9f86165d2d006603f66a86f4eabc6d133554cf66ad2b325e5094ff84705e4ca3b5ee02898b90
+MISC metadata.xml 545 BLAKE2B b4b8181bcc52854b5778f85a18870582acb064a1f1c92ebeb25f5515bf3f127d1f2aebcd57ef050299d11414fb7a03d09620fe314d75894e4f947c268b8699ab SHA512 d1bbb8bb940e60642986183ae9e74e496be42490f144139ee5a8b3140bfd9243aeb2a6d8f0c31f89d213c9baa100e2e35e69dd046361188e83e431f07f18c34e
diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml
index fa439d9e97ee..4a4d62e56a75 100644
--- a/net-misc/pyhoca-cli/metadata.xml
+++ b/net-misc/pyhoca-cli/metadata.xml
@@ -5,6 +5,7 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 PyHoca-CLI is a client implementation for X2Go using the project's Python API (Python module). PyHoca-CLI can be operated completely from the command line and the goal is to reflect the full functionality spectrum of Python X2Go.
 	</longdescription>
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
deleted file mode 100644
index 3f2ee6193450..000000000000
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go command line client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
index 3f2ee6193450..107198b5c85b 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
@@ -3,21 +3,26 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go command line client"
 HOMEPAGE="http://www.x2go.org"
 SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
-LICENSE="AGPL-3"
+LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/setproctitle[${PYTHON_USEDEP}]
 	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# we don't need setuptools at runtime
+	sed -i -e '/install_requires/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
 
 python_install() {
 	distutils-r1_python_install
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index cd4e06167319..50fdba4d4cac 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,5 +1,3 @@
-DIST pyhoca-gui-0.6.1.0.tar.gz 2098973 BLAKE2B fdd145bb8ba67d70571a2244bded2f5c30382725c21747778c7490a98cd85dd7e872aec9ba539d407764a9a3a38d590aed5742268ebc38aa9cfaa3fc5b5a679c SHA512 d2730aa52afd4a835e593f3d8bde84435abb67aa490bb05807353d8d102c1d85564c21decbaf04e5cf54ef4a376247cf4a5ba1f7c9baf96149dbea9e583ea9cb
 DIST pyhoca-gui-0.6.1.1.tar.gz 2099727 BLAKE2B 944ee3cd743d502ce320759b9200c74de13802e23aabc2a5fe5659e123e2bbc368bf8a216c73de2c2ed22408d8fe50b4b945cc0714d05e1cb0faa1e5617dd4b0 SHA512 e7e24d60c1e4ecca2201c2a25bfc8c5552e54e30a5f744c5bc9c36ba4050a64cbb8616ab2e035b34cd14c62702ff88e32c863cac8aef0f8f4cb18db1d2e737b6
-EBUILD pyhoca-gui-0.6.1.0.ebuild 825 BLAKE2B d3604fe2bec0d4a480467ab666c9a4d8051eb12c540e9fe72a29130531ec0f8ca355b5c9ef3ab8aa864f1c084009d07d108eb91df510439624af3984078814ce SHA512 113b32afca4081f98135c51ee3a9fabdcc369a0e7e4a29f33302b9b260dd23402d6584611cc8f3fc6f73250dfea2899cb3ebd43357155ffc5556f2e90c665939
-EBUILD pyhoca-gui-0.6.1.1.ebuild 825 BLAKE2B d3604fe2bec0d4a480467ab666c9a4d8051eb12c540e9fe72a29130531ec0f8ca355b5c9ef3ab8aa864f1c084009d07d108eb91df510439624af3984078814ce SHA512 113b32afca4081f98135c51ee3a9fabdcc369a0e7e4a29f33302b9b260dd23402d6584611cc8f3fc6f73250dfea2899cb3ebd43357155ffc5556f2e90c665939
-MISC metadata.xml 791 BLAKE2B 7f823d058d401072a1e1407391c2eb02c0b70705f5beac53656d582b977455201f0687c3b93653314be45339dfc749a81a06197a3e6e1b0c78205986fbf033ef SHA512 5e05aefac383cb0cc65e2747aa5d9eef23b2f26931196fa544f263a0c0bf2dfc63c026fa606fd910ab589f447d3bd78f42de0bff61a44286964098531000a5cb
+EBUILD pyhoca-gui-0.6.1.1.ebuild 962 BLAKE2B 8218111efda5ecb83ead8dabb2df9a581467e62446006defbdb32af9dcacba3f73f99f517fcb2a56434931d8dde5c92f275ba500cd857ed1916b86e6956d2704 SHA512 4a7996ab9e4e64f166e600cf0f78716344b28e60b499e4d005a9736a6bffd55f2325bdd6fefc2b0fe3efaf98b861c31654c83579358dd3acab68af0be8a1fb1c
+MISC metadata.xml 815 BLAKE2B ffcb075bcca083e1c2dd6f6656f6e194f39cd90ea0262bc2f637ce18cdd5635ac2cfcbc786585a83a08eb75dbe3684a66e0033bcf0ca94098b88017a259cdfd8 SHA512 da1de8ed19734d000cac9f767de16645102842edf58e24dc6fb86b46037fb9d2a5695e0b960eba1e73a3e1c2a4854af8f84a0aa24627c656a32e7712020f7e68
diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml
index b87a98e44d52..e24d4d041e88 100644
--- a/net-misc/pyhoca-gui/metadata.xml
+++ b/net-misc/pyhoca-gui/metadata.xml
@@ -5,6 +5,7 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 PyHoca-GUI is a client implementation for X2Go using the project's Python X2Go client API (a Python module). PyHoca-GUI uses wxPython for rendering graphical desktop elements (menus, dialog boxes etc.).
 
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild
deleted file mode 100644
index 3d05ef2fc367..000000000000
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go graphical client applet"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pycups[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]
-	x11-libs/libnotify"
-DEPEND="${DEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
index 3d05ef2fc367..671e506e1ffe 100644
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
@@ -1,27 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go graphical client applet"
 HOMEPAGE="http://www.x2go.org"
 SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
-LICENSE="AGPL-3"
+LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-python/pycups[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/pycups[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
 	dev-python/wxpython[${PYTHON_USEDEP}]
 	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]
 	x11-libs/libnotify"
-DEPEND="${DEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# we don't need setuptools at runtime
+	sed -i -e '/install_requires/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
 
 python_install() {
 	distutils-r1_python_install
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index 6e8d501ecb04..5d16ec0123e2 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -1,7 +1,3 @@
-DIST python-x2go-0.6.1.1.tar.gz 247188 BLAKE2B c19f1ea39bca647984a21d0100d07c3898dbab894c92d5aa36c297ec277f9f0cd3429e02e6ca7a372b57ba3836d2139018e6d685fe31719549d2d2ddefff483a SHA512 8450ea47d1ec27abd56db0925613bd864a620cde98954f21d1fe8bcbf2a0024d4e8237c8663d04eb67c835f7d9f4a8c0dfc5f8f5671f571b24bb5b48b0a70762
-DIST python-x2go-0.6.1.2.tar.gz 247187 BLAKE2B dacaa406e7f32eb14951e54edd31fc812f7f6c5688a911607f4cf1755c1128eff5f2b77bb78b66f6a49df2267064cc1e8d209bcc1b368abff1b451d69eb63b04 SHA512 29ac73415c11f19e07a919bec99d61ba04f24e98c51bb32b5e4cdd20cbc04c7c6420727c5147b450e0e37931ee77dccc02334c62a8657c11bca6689472446e5d
 DIST python-x2go-0.6.1.3.tar.gz 247754 BLAKE2B 9c5705da9c1656a29ae7382dfaedb1798d8728006dbfcb0ec47441bba63a1c85f9ee60f0d8e5cb040dfec177ab72381518e0756ca5a9374e3ea7f1ab29d54dfb SHA512 3933ad8ee7debd6d643ce12ce06a6a98c7c97fae5a30f99ca147ce57ac7fa8e1b2fd97439a8c3b39ac5c5d0c7cecf4f3571193092e057db536d061f0d1d4accc
-EBUILD python-x2go-0.6.1.1.ebuild 588 BLAKE2B 9f5ae928ff12dd534a8dcfa79bfb574b7cfc9f278b9f6a52ae1e7c6df40815f6e48757bd1b9359f52794ea1c08d9e899541d14e3e990a3afe69607395c95e2a4 SHA512 fc10a9ede20d5afe9a2ed0e90893f357ed26997ee61ce27c6b7791fa2b1a2ed9ffa7ad06e8e9f2c1c6e6d62e2ad722ae2f8b5521d462b7e01e9c001dadf1afe9
-EBUILD python-x2go-0.6.1.2.ebuild 588 BLAKE2B 9f5ae928ff12dd534a8dcfa79bfb574b7cfc9f278b9f6a52ae1e7c6df40815f6e48757bd1b9359f52794ea1c08d9e899541d14e3e990a3afe69607395c95e2a4 SHA512 fc10a9ede20d5afe9a2ed0e90893f357ed26997ee61ce27c6b7791fa2b1a2ed9ffa7ad06e8e9f2c1c6e6d62e2ad722ae2f8b5521d462b7e01e9c001dadf1afe9
-EBUILD python-x2go-0.6.1.3.ebuild 588 BLAKE2B 9f5ae928ff12dd534a8dcfa79bfb574b7cfc9f278b9f6a52ae1e7c6df40815f6e48757bd1b9359f52794ea1c08d9e899541d14e3e990a3afe69607395c95e2a4 SHA512 fc10a9ede20d5afe9a2ed0e90893f357ed26997ee61ce27c6b7791fa2b1a2ed9ffa7ad06e8e9f2c1c6e6d62e2ad722ae2f8b5521d462b7e01e9c001dadf1afe9
-MISC metadata.xml 483 BLAKE2B 556d85d173fd848484a7ede8e26d1b66fcfc95c49c1231b12273a6e8bbc42c4421fbc1933f7aefa846369f474caa25163095774daf6be7680c6b3b79b09c3e67 SHA512 42c6decd895d3cf1097fc1e9a4a8eeeda0fff769a74fe4a74b17ba2943c76b63bc243d200b08d050aa1e778f3ee71f8a504f59384c79a54b220c7a022b23bc6e
+EBUILD python-x2go-0.6.1.3.ebuild 568 BLAKE2B e4a309332ff985b7ea01e8a7bc345864b92031270add0c4dbc2722bc028d41fa8119bf72acac32ad1c95653769e212c36d6575e2e2779f26fc1725049f3383a0 SHA512 f0060f41bd0ea8b2f040cf5c9880dafb7e8be4675ec6544db7046e6429905e7e6d3ae52ea1c65a40f43d09108ad9aa1243f47a6b9efa0ec90d25f5fe987ea8f2
+MISC metadata.xml 507 BLAKE2B e7453f085dfe3e0541f34f157d65d17c4bcf66ea3b44d9f8d9d7653cd52bab3808c1be63782c65cd025916eff1d81bf2e1afd1a6cb48b74a6e0856650fe5c905 SHA512 64912aa4517cb8abefc71a20fcfed3534fe6db892af6fcfb3e0b6ad0d9b06a1354812895e8dcec81dca1debf83cae2c8f286ab86ead4748be9aaaf13a053c9d3
diff --git a/net-misc/python-x2go/metadata.xml b/net-misc/python-x2go/metadata.xml
index 0a75ba291b54..3f61fe249002 100644
--- a/net-misc/python-x2go/metadata.xml
+++ b/net-misc/python-x2go/metadata.xml
@@ -5,6 +5,7 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 The Python X2Go module integrates X2Go client support into your python programmes.
 Python X2Go is used in the headless X2Go client "pyhoca-cli" and by the tiny systray GUI applet "pyhoca-gui"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
deleted file mode 100644
index 27dda838f0d4..000000000000
--- a/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go client-side Python API"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
-DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	net-misc/nx"
-RDEPEND="${DEPEND}"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild
deleted file mode 100644
index 27dda838f0d4..000000000000
--- a/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="X2Go client-side Python API"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
-DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	net-misc/nx"
-RDEPEND="${DEPEND}"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
index 27dda838f0d4..0b9387f66df8 100644
--- a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.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=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
@@ -13,11 +13,10 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
-DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/gevent[${PYTHON_USEDEP}]
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/python-xlib[${PYTHON_USEDEP}]
 	net-misc/nx"
-RDEPEND="${DEPEND}"
diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index 249024a94783..9ba61446145f 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,4 +1,5 @@
+AUX qtm-1.3.19-nomancompress.patch 1286 BLAKE2B 5503035fc1bda4a2043a1152925a3926d542aa94b4ca97d537adc5a0e83e75c904b61ed057c07140b3d2027bd5f5e07f34ae9992846cd910920c45bfd59dd639 SHA512 4f8677c4ba1f22c10aca4c139ec3ca2ead956ab0f880eae7dc3153e90f5fad61035e51987343a91f487bf209ae289c7d9b1896ed9ec52ba91b90910b51bbdea9
 AUX qtm-1.3.19-qt-5.11.patch 757 BLAKE2B f0bc6f3858e7864efa343193d8519a1e83444e69e4532219077f5d3e852bbd4d0bf979023fadbb53d817d41e1632244baf9232434f8b274dcb6d0eec06070ec3 SHA512 c4e886726686ea2fbf785aaaafd1238affbe778f20a0b11cea98360570f52c421a6942b03f27fe57bc08894a93c92427920509a1efac8b23d502464b353e6df0
 DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565
-EBUILD qtm-1.3.19.ebuild 1171 BLAKE2B 48d68f1e6fda9825833f4bf7b796ad12a26b64c063a8bcea4edb6fd4ed39ac8d9ec1d745e8364ee10ee0b465e97708bfd39988d65b68f02e08cf2d478380c4d4 SHA512 c011832aac96c820445ffa24149e26641b8f61bb48e583427ac7ca1d26a97c1c28d4ec56146d7195962a8abbc29a606832a040b7661cbc87fd0b0824b8c2315a
+EBUILD qtm-1.3.19-r1.ebuild 1162 BLAKE2B 89f64148dca8604caaaade233aaf226d06cd37c4b22c00f6a34d2c6d590ddbe5aac5ed3a93e4ca325363eb5ea6d4c0488e4b7b520568e5e6278dfd1b60f85beb SHA512 b0ceb5c708479ebee99e4055179888708adb28319dcbb9f9de7fbf0427823f5ca86967a3f9dc492f29c8a3669b6d85d0b001297ab8efc309ff113e7d40f21072
 MISC metadata.xml 323 BLAKE2B 9a2acba00a78ae523e8e0911a81237371b07ad64a6c9c508cb3bf8a7e092143cd512ea33a5ca5825edc81ee7d312a47385bb566bbbb876f8ca3c54592ee392a0 SHA512 f84bcb5a622eaf479bae92f367748cfb749b633fe3c5089db7a2dc6193a5ca103195ad12bc894fe2b05c5bb1de4eb3baee5bbcda8c018ca6968add97719748e2
diff --git a/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch b/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch
new file mode 100644
index 000000000000..a98ef2446003
--- /dev/null
+++ b/net-misc/qtm/files/qtm-1.3.19-nomancompress.patch
@@ -0,0 +1,34 @@
+--- a/CMakeLists.txt	2017-06-12 12:28:32.739628202 +0200
++++ b/CMakeLists.txt	2021-02-28 12:43:44.143779118 +0100
+@@ -123,20 +123,17 @@
+     set( MANPAGE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/man/man1 )
+   endif( NOT MANPAGE_DIRECTORY)
+ 
+-  add_custom_command( OUTPUT qtm.1.gz
++  add_custom_command( OUTPUT qtm.1
+     COMMAND touch qtm.1
+     COMMAND sh ${QTM_SOURCE_DIR}/qtm-manpage.sh ${QTM_VERSION} >${QTM_BINARY_DIR}/qtm.1
+-    COMMAND gzip -9 ${QTM_BINARY_DIR}/qtm.1
+     DEPENDS qtm-manpage.sh
+     COMMENT "Generating manpage"
+     )
+   add_custom_target( MANPAGE_FILE ALL
+-    DEPENDS qtm.1.gz
++    DEPENDS qtm.1
+     )
+ 
+   set_directory_properties( ADDITIONAL_MAKE_CLEAN_FILES 
+-		qtm.1
+-		qtm.1.gz
+ 	  qtm_version.h
+ 	  qtmico.o )
+   
+@@ -367,7 +364,7 @@
+ if(UNIX AND NOT APPLE)
+   install(FILES ${QTM_BINARY_DIR}/${DESKTOP_ENTRY} DESTINATION ${DESKTOP_ENTRY_PATH})
+   install( FILES ${APP_ICON} DESTINATION share/icons )
+-  install( FILES ${QTM_BINARY_DIR}/qtm.1.gz DESTINATION ${MANPAGE_DIRECTORY} )
++  install( FILES ${QTM_BINARY_DIR}/qtm.1 DESTINATION ${MANPAGE_DIRECTORY} )
+   if( UNITY_LAUNCHER )
+     install( FILES ${QTM_SOURCE_DIR}/qtm-new.py DESTINATION bin RENAME qtm-new )
+     install( FILES ${QTM_SOURCE_DIR}/qtm-choose.py DESTINATION bin RENAME qtm-choose )
diff --git a/net-misc/qtm/qtm-1.3.19.ebuild b/net-misc/qtm/qtm-1.3.19-r1.ebuild
index 24f10c68555e..27e97c211aa7 100644
--- a/net-misc/qtm/qtm-1.3.19.ebuild
+++ b/net-misc/qtm/qtm-1.3.19-r1.ebuild
@@ -1,10 +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
+EAPI=7
 
-# CMAKE_IN_SOURCE_BUILD="1"
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt blogging client"
 HOMEPAGE="http://qtm.blogistan.co.uk"
@@ -17,7 +16,8 @@ KEYWORDS="amd64 x86"
 IUSE="dbus debug"
 RESTRICT="strip"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -27,17 +27,23 @@ RDEPEND="dev-lang/perl
 	dbus? ( dev-qt/qtdbus:5 )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
-	virtual/pkgconfig"
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( Changelog README )
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) # TODO: upstream
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch" # TODO: upstream
+	"${FILESDIR}/${P}-nomancompress.patch" # bug 740784
+)
 
 src_prepare() {
-	# bug 463810
-	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed'
+	cmake_src_prepare
 
-	cmake-utils_src_prepare
+	# bug 463810
+	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die
 }
 
 src_configure() {
@@ -50,6 +56,5 @@ src_configure() {
 		-DDONT_USE_DBUS=$(usex !dbus)
 		-DQDEBUG=$(usex debug)
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index bd6b704fd371..4134d4e5c9c8 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -9,5 +9,5 @@ EBUILD radvd-2.17-r1.ebuild 1563 BLAKE2B 3d700ee7f07141534734ad387a018014453a66a
 EBUILD radvd-2.17-r2.ebuild 1618 BLAKE2B 05259d6d5c99d5cc261e750a99dbaa42bbc96f40cb9e7d601ad0795dfab99fc345910d1be7462704f7c190bcfeb37dec3ffe5439f46cb4c27fe3770f986fe5f7 SHA512 d08531d71eb7129ad205104fa2dd3ef6fbaae3ecc309beab55affbaca4974a6b1b90c3db4891852970fe7260be7d9a8b1d5c816fe4b3dc303d2b118d6802e83f
 EBUILD radvd-2.18-r1.ebuild 1647 BLAKE2B 364c3fedeeae8a531fd53dfbb7590901c202cf9bd13d36e29301ffc52c93bf2f1bdfaa05936de43b4578ef02a8728a100915af0f04b4639bc435ddc2be195933 SHA512 06a1d255577bfa41b2cf3e56ecf6eeb848c040677c6a47d5f5f34590f211a70b057a77dcd1631ccd21af7301283a2a5d7891d7079916ea548d2d8cdb30feeffc
 EBUILD radvd-2.18.ebuild 1582 BLAKE2B 9ef9bf5052600be82f8f37378dd11f7097a97056d4bc9fab37b0fa5855f54a225c7b8abdf6a64199d25f927bc04b7b75b091eea3e20938f892631eb0a16b52db SHA512 434ff0f3cd7c313860cbefb866633010f4219811ac501673280180ec7aa3c515b90484e3266b109dc0a37869d8458570a3af2d50e0a15e4174b71500a4eba43f
-EBUILD radvd-2.19.ebuild 1658 BLAKE2B a64093343538b9f5ab20290ea8d2820141d33a73f383b9cc4b9db1511f2d34819bbd199d37122543b5518a32c59d80e14822b8d85622de4daf546106c97606bf SHA512 231a220b3cdcf1e83af237a45a598e7d48590ba586d7f23197ea921c00b2503423472ea52d8052a1a706b46ff168bb6ccc492848f05d832fc1d64100f76ebd15
+EBUILD radvd-2.19.ebuild 1658 BLAKE2B 9e1f0771425e709d7aabda25cbeee74b8823b1aebb65da7a10a3ed7c7940bc8ac00e7845fb86e60fbbfe9cf1e1b1af1baa9a23eca2b316b438e644097602a63a SHA512 089611403b2ba9e7c6b52f57bc53e40523cb2f91a4431fd8a8f189c4e92793b087cf22ea08562d5512b6a847e0be377d9c8e9ff86e6fc5b56da7a51f5c2b9293
 MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/radvd-2.19.ebuild b/net-misc/radvd/radvd-2.19.ebuild
index 5c4981d40e93..395a4d261913 100644
--- a/net-misc/radvd/radvd-2.19.ebuild
+++ b/net-misc/radvd/radvd-2.19.ebuild
@@ -47,8 +47,8 @@ src_compile() {
 src_install() {
 	default
 
-	insinto /usr/share/doc/${PF}/html
-	doins INTRO.html
+	docinto /usr/share/doc/${PF}/html
+	dodoc INTRO.html
 
 	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index b358b296bb03..305e89835a28 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,6 +1,8 @@
 DIST Remmina-v1.4.10.tar.gz 2072202 BLAKE2B 38b6a3cca9b5956a252d4d4433910d46d0d36a2232a2a107b1e556f118f3b1a6d3c02b0bea26a39a52d572c1380dbb5bdac1acd8d6ba07c97b9acc9a64a9142f SHA512 89fed0b0ed17ac1db57a1d9ad33b80f4d17f6cfb4ff7db9b6434d9d4dabf708971e4d93dd573dbf606d1899311e564f159a656223d66bc4a9d7a15a29b5b5963
 DIST Remmina-v1.4.11.tar.gz 2176470 BLAKE2B 1d0923e520716f1cf0d1d153dab6eb3d22ef2fb53b8b51f8cd65672c9a92e7bbcc254915a0a7e269dc478aa2d39a15ab388056dc8c435997c2f0a8f257e589bd SHA512 9b26002451d297e49c63e6ce39a51d434eb18f78b3c2ef8770e2ded319ead4478a4f1ad4d4fefa19ddf3390d740bc34ce27d0c0eb0c24e39a2d792f6f66079b5
+DIST Remmina-v1.4.12.tar.gz 2338965 BLAKE2B 86ec07a2c5ff0957cc3d855a4cc86c9675aa474110d7d40d202817f01c4d5815c008a5f0f78802e9b3ef14b3590d58ccbb124e2b6c6f0b14ea8c8592a4d8bd50 SHA512 7ae8031ff64c113b0ed792c6ba56c42918ccce5a30fe0255f730ef7a5a712dc500495e591598fd6cc553c09c6d5a2457e33f4dc1019403e89b25cc02e491515d
 EBUILD remmina-1.4.10-r1.ebuild 2532 BLAKE2B 8f81ab82ed4a7376650ffb1f58aa3c585200fdb035c0f45932703d7fa35ddb91bf1d8885825d8938d094429a18f7ff393b7b335d3c2ae7addeaeb409d46f29e8 SHA512 a70677a1ff8074fc13cd340a9ffcdc7569ac8b5fad6cdb77c4c26ab9a323408a4f2a024d1684ae9fde318044cfd1c74439c14af4299122876ab07abf3ce64dfd
 EBUILD remmina-1.4.10.ebuild 2500 BLAKE2B 966b7a8753277b7b2494582eda605c337a13456afdb907195f730f5cddbbde7701edb6edfadd08383a8cb32134be815fa67bc62ab93628e980bcbef8658189fb SHA512 52b13e1bc91d55a991eb3967b5a676ee82debe3856153058d5ec222d1bc5c59ff04b772ae1439a2b9cbc890d3d9ebdb19ab3cbe7c0086a77d86c392bafa33fc5
 EBUILD remmina-1.4.11.ebuild 2652 BLAKE2B 0103f7a9d0b75622b40d5daeff43e20ccd679bcc6ccaacf2d5772f8b3ea5d70a5c57b534d30437d6123dcbcf08ac1924e24396ea904698f0a6a7836a93ad76f2 SHA512 23caa92477f40deb41e0265625545aaa4797a26b3700007cebcee783af9cb9ec1f30c2afd5dbdb2bf15946660e8ced7b0f324dcfc73ab1875832ac619caf41ff
+EBUILD remmina-1.4.12.ebuild 2652 BLAKE2B 0103f7a9d0b75622b40d5daeff43e20ccd679bcc6ccaacf2d5772f8b3ea5d70a5c57b534d30437d6123dcbcf08ac1924e24396ea904698f0a6a7836a93ad76f2 SHA512 23caa92477f40deb41e0265625545aaa4797a26b3700007cebcee783af9cb9ec1f30c2afd5dbdb2bf15946660e8ced7b0f324dcfc73ab1875832ac619caf41ff
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.4.12.ebuild b/net-misc/remmina/remmina-1.4.12.ebuild
new file mode 100644
index 000000000000..3ce94b27c5dc
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.12.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
+
+DEPEND="
+	app-emulation/spice-protocol
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libsodium:=
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex appindicator)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=OFF
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
index 20b47dab2a15..eb44e0eebcd0 100644
--- a/net-misc/sipp/Manifest
+++ b/net-misc/sipp/Manifest
@@ -1,4 +1,6 @@
 AUX sipp-3.6.0-parallel-build.patch 309 BLAKE2B e5c790cae99c31ba4cc79800f2991787401865b41bc270ecb648a9534da0322ef0b0a4f029146c7fca013f295565bc18c8c424139782a42de779b75e775e3b3c SHA512 41b052b3612cc3cd4afbd0a1437a4502c27e3cd948d800a4229c99561a88d1dc488f1feb06aa68faae83d9acec0977e3f4be2b65fef4cd5c541e2b4a023a9ff1
 DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e0f20c6c3cf9b72ebcd65cb12cf4cab2b90e010d16e17b9bb4832f42915b104ea9bd1253242d304ab4f3cb32 SHA512 eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12
+DIST sipp-3.6.1.tar.gz 744407 BLAKE2B a201ecce624c15c51a66c3cb5ac467522755085419c2980b1f76340e7ffca5996516f34d7e52776a8aa0a2170ca2b7301030ecb50272a1c0a8e86aaf18a6de16 SHA512 58504c56ca0c14363fafc5d0598fd93857ef33cc5856f579a225fd0e38238f7d2c409127a18a368e22355cc3912758d4dba07bac7eaa3e8a0d2943ea5fdec602
 EBUILD sipp-3.6.0.ebuild 960 BLAKE2B aff654d4ba7a2a4bf00b5151242e9fe57f711ac6fe67e2d7e6746955f4d55f2226b6181fc423f61ca115ac95228be64b232326d8d4c4a8950e5c601171cac430 SHA512 1a4585f9b910b5e67f2abf71409c09515af2713b0199456a34be6a23bee89a24fec66f6840790593bd29c980ca02f5fd613c5292c23604e7ae6e921d2fc57728
+EBUILD sipp-3.6.1.ebuild 1103 BLAKE2B f6ab8fea4e1b96626b5e80fcf8f8b8fce2a927d7585e2d12dfdbda47c9910301d9c994c02377e21ec7a489ac5a1802f0189ffc531adacb8460c5f5f045467d16 SHA512 7a6525943a713873a3602a818099255f682bd56193c186ffe2c62d275f406f59c726e07bd199260c5026faa5b68b5582647a9188b831b6ab17ed0c2a23484b6c
 MISC metadata.xml 456 BLAKE2B f7dff8c7cdc43d043f5a84c590e084a0ad39f973738a58a991f9971794c4ea904df0e95d47b7669ab0f76c193586aa8feea6b1414111d374af301dcd44ee055b SHA512 0268164af9c3e0e1558549021c47b9374f5f565996a730335d5ff7c8132f7e8bd2685c36db74dd9ab7be2029ddbb56250519b7b0bf85d54997d247a4bb26365a
diff --git a/net-misc/sipp/sipp-3.6.1.ebuild b/net-misc/sipp/sipp-3.6.1.ebuild
new file mode 100644
index 000000000000..3145570a2b56
--- /dev/null
+++ b/net-misc/sipp/sipp-3.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
+HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases"
+SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${PF}.tar.gz"
+
+LICENSE="GPL-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl +pcap sctp +ssl"
+
+DEPEND="sys-libs/ncurses:=
+	gsl? ( sci-libs/gsl:= )
+	pcap? (
+		net-libs/libpcap
+		net-libs/libnet:1.1
+	)
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# version.h is in ${S}, and needs to be in ${S}/include for cmake to work.
+	ln -s ../version.h "${S}/include/" || die "Error creating version.h symlink"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GSL=$(usex gsl 1 0)
+		-DUSE_PCAP=$(usex pcap 1 0)
+		-DUSE_SCTP=$(usex sctp 1 0)
+		-DUSE_SSL=$(usex ssl 1 0)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	insinto /usr/share/${PN}
+	use pcap && doins pcap/*.pcap
+	dodoc CHANGES.md README.md
+}
diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest
index f40cc25ee67c..1b78d1c7245b 100644
--- a/net-misc/socket-burst-dampener/Manifest
+++ b/net-misc/socket-burst-dampener/Manifest
@@ -1,3 +1,7 @@
 DIST socket-burst-dampener-1.2.1.tar.gz 4438 BLAKE2B 5fc8a52370c3314f625f71f1ddf816300c4aa423b09c2ec8501372246dd982d4166dbe47260c5a44675c26afb1f83f0ae9d696950b4c754c17303481a5d536a0 SHA512 297c4371700508091850e7022f8a1f245fb90720ec5fb2b482dc8bc2aa2a47a0c9087c91827cc4a95ef1cbd546cdf005e61a160c9f78ec2d7849ec83f79ac77f
+DIST socket-burst-dampener-1.3.0.tar.gz 4607 BLAKE2B 460e02407b5da2c4fc3d0377d4b585267a83998d5a4fda7270f36d2a7c94966b91a313fea636a6cb4f114f42bdcebda39421b63b2a0ef3e199a72c56ac98274c SHA512 74c5b1588d5c958e0256cc08e61911e39884dad9971020abcdd48f3229496d490c2de6f31b1bb39f59cde742957483a2f1eec33c9d3c2098eb707ecb5a292e95
+DIST socket-burst-dampener-1.3.1.tar.gz 6248 BLAKE2B 1aa80e64d72eb76c46b7212f3cccc35d13de35390702e71f8f9599bd1d502591f33da0ba139d47870c68e74102fed03d83d1636d21cb07a2f33ab8798465fcc7 SHA512 18b9ea1e7879c5ccea8ae531ab349516ec018bac3f07b6b491a7595bae490c8de96b2cf637f94603dd552374e09c5927abcaf605dc363137d7ff6cd0244eab6d
 EBUILD socket-burst-dampener-1.2.1.ebuild 651 BLAKE2B 28d8677d549b90b511237a8ad65c00c9b634d39988d76e6b181460f198e99929d780fe726444d29615c1d02625f9c0ab70400b4d567a3f9f251f85b827940d05 SHA512 53d73a5078b8472cb82411598ac6f8da388c4a97c213c5d8b3a20846ff4c8a55a5a0472244133dfd591b090d2b1b733d2d5830f1435d34717183361f16bc1d61
+EBUILD socket-burst-dampener-1.3.0.ebuild 651 BLAKE2B 37143c5e51950d69f0dfe3b0d7a3eeb416580aa8243d73116bd65164502e3e62debf4116fd8ad622f7d884945ee34f46aae92e9b549de26c62559d548864323d SHA512 eff0675fb1cd6073dab3df2332f9012849ca96c32bda11213dfae019b774f28482fa322676fb4b1212a3ef3820578b7415b0934ea05c3005c775705e4b06f12a
+EBUILD socket-burst-dampener-1.3.1.ebuild 820 BLAKE2B 21733c66ac747b10a9c1bfd4f3c1c75448b65e4e70e61d1abb1e97ff32a57e5ee64532cf1dc0470a8cae448ab10cabf8fb05d7f8e853a99f4371ec465fbbe5c5 SHA512 c36f9bd27d0815f52fc32aa00bc2f1949dca800deef6fd5ec276496a7f121d5e15dcca277468e098bd97fe1a74a15cee113d768a90b6f559bcf98ddba4306330
 MISC metadata.xml 312 BLAKE2B af48a35f7fa9f645522293faddb615bea586daf209350d9697863ddc979f489863cbad923786c8dde79284d103110347f095ca0dfe8913ea328dbd9d142255bc SHA512 ba8571dd5e13df29810fdc4fc852da5bc40fc5e4c6b58fe94b85801b678c768ed2c0a7908303a46307351ee282705fd547e4b0e92b3ab8fd18338d819a0cf4b1
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.0.ebuild
new file mode 100644
index 000000000000..afe18fc2ea83
--- /dev/null
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts"
+HOMEPAGE="https://github.com/zmedico/socket-burst-damener"
+SRC_URI="https://github.com/zmedico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN//-/_}.py || die
+	distutils-r1_src_prepare
+}
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild
new file mode 100644
index 000000000000..8135e65af851
--- /dev/null
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts"
+HOMEPAGE="https://github.com/zmedico/socket-burst-damener"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN//-/_}.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test || die "tests failed for ${EPYTHON}"
+}
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index f47bd1581583..f7fc09d6046e 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -3,6 +3,9 @@ DIST teamviewer_15.14.3_amd64.tar.xz 13216052 BLAKE2B d5fa55609a2bb6257c1fc95ec9
 DIST teamviewer_15.14.3_i386.tar.xz 13733488 BLAKE2B 14def908b2c2e86b49649264b0eab4b15594e15425b98333720f0025a0530cf3e2c350f54b996f6d48a6f44dd368899fec95c38ddeb6b909992fecf80a2bdc46 SHA512 02a2843424a19252546ce0598f0ec52dd4a0d02148e379c944b7976bba794858cc1ca58724bf5b9828b6dd38e3f3989bab8b17d7ca9285596fd450d2ce753668
 DIST teamviewer_15.14.5_amd64.tar.xz 13224544 BLAKE2B 2cefeebce0a4c31ba84e554882400ee65b6a44d7c335125cd25dfd4e9e4aa02b34708d679873a52b31e46c5157ac7d6a89d8b77848453fc7733f8931964202fc SHA512 723a63d9490df367c3f072da9ed79d84e38de60c67ca78c10b01612f48fe1afe0d379b414f898f342ddab336b9689d2f38b76d9ff83654a789e8059b2da886ad
 DIST teamviewer_15.14.5_i386.tar.xz 13724612 BLAKE2B 09558e5bc3b5db9ac57a038af14eb56816a5f272a637cfb3f73bfe072836a3011ff14f5e8acdd50889d66a9422fdc0d14f50eccfa908c6e796544d93f30961ed SHA512 5c38cd3106adf69c6b27d8696ff6c3d49a1a1450e317b07af20e7b2c2351102fcd6a0d61a9e1ce1f75968db048461adcb3dd5d5b0cf98b3de94719ccfed93586
+DIST teamviewer_15.15.5_amd64.tar.xz 13264432 BLAKE2B 8f23c036b79c7ee7cbef1181825b5605afd77f22d0565e5359c928bd4014759c3ad56255d8e76ba75d3084c8a9bed98fcdd08f20e502c2906e6eaf6dd952a7b4 SHA512 e42cccb74c08ef1badcd4b78016078a9f6f3b69b700e4c64d6eae927fa4b748c11288ef5cc50aa962eabd17679479ececf8750e8c34f6361758da903e555a334
+DIST teamviewer_15.15.5_i386.tar.xz 13751236 BLAKE2B 32d8f6494c72b51feef54e2d5dd1096aee83c283a1d07680f428bd4321ede9975d1ee4e7cd55718f9250d54304d17887b98ae6e62617e7022ec78384fdde5a16 SHA512 315e6fcaa6d40aab17c47ac4eee6d894be3731ae7d0242e2b11bae279627de04540f8d46908826d53b6a6d275769c19a420c6f30e9869a734e87cb7d6832bfba
 EBUILD teamviewer-15.14.3.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
 EBUILD teamviewer-15.14.5.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
+EBUILD teamviewer-15.15.5.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/teamviewer/teamviewer-15.15.5.ebuild b/net-misc/teamviewer/teamviewer-15.15.5.ebuild
new file mode 100644
index 000000000000..4636957e3f98
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.15.5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop systemd xdg
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+	!sys-auth/consolekit
+"
+
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "Please note that parallel installation of multiple versions of"
+		elog "TeamViewer is currently not supported at runtime. Bug #621818"
+		elog ""
+		elog "Before using TeamViewer, you need to start its daemon:"
+		elog "OpenRC:"
+		elog "# /etc/init.d/teamviewerd start"
+		elog "# rc-update add teamviewerd default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start teamviewerd.service"
+		elog "# systemctl enable teamviewerd.service"
+		elog
+		elog "To display additional command line options simply run:"
+		elog "$ teamviewer help"
+		elog
+		elog "Most likely TeamViewer will work normally only on systems with systemd"
+		elog "or elogind. See this thread for additional info:"
+		elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956"
+	fi
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 8c011f63b71b..d7be663e4904 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,4 +9,4 @@ DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdc
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD tigervnc-1.11.0-r2.ebuild 4180 BLAKE2B 51b7ddb2c27200ccffe618f70c54dc6947b28948e5688450bd6ead4d1b0e822fb6adc4c4a400571f58f288c76080b1e210e6d88ba6573238debd7e1e85313166 SHA512 84e8878f281c23162689290ab4af514df1bb34898cdf770321fa33e83e5fbfe8390fd37ac7b47a390af3ca8327203a7b8cce218a7d5f7b5a8284f7b6c1ec36de
 EBUILD tigervnc-1.9.0-r1.ebuild 4542 BLAKE2B c0448931c65b8de3669cde0b0ebb24b57539c08c17ef6cac48a0ee81f92e3a89640b57e15d561a3a2399fc37a8521a67ec058a83007cec65b99d4f5aad7fc4b9 SHA512 9c13f09e7cf4df13a2857af86c23462eba0ddaceb098de6640419d8d6758d0b879d8d415e480f24ac5bc7863817918ef8b972b39f9be6fc7c2b6184f7dff1eaf
-MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
+MISC metadata.xml 470 BLAKE2B de3d7d8fab83908aa664760afe1d401f016be431c67eee547127f3ee94f290d0127cc972e2d27f31b9adc0d48786f755a94ac8d1e605ce3e8e02fcf7144b7af3 SHA512 b31d1126757d68a177817cfa7069e07277742222c02dbb0e0a26ed5a144f68eeda94db5cdaec760a2b8abb491fe420867dbf06d89b6a4c1a3edfdbb1461999c3
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 8568ca4fefbc..96e68f4f33b4 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>otakuto.gentoo@gmail.com</email>
-        <name>Tact Yoshida</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <use>
-        <flag name="drm">Build with DRM support</flag>
-        <flag name="server">Build TigerVNC server</flag>
-        <flag name="xorgmodule">Build the Xorg module</flag>
-        <flag name="dri3">Build with DRI3 support</flag>
-    </use>
-    <upstream>
-        <remote-id type="github">TigerVNC/tigervnc</remote-id>
-    </upstream>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="drm">Build with DRM support</flag>
+		<flag name="server">Build TigerVNC server</flag>
+		<flag name="xorgmodule">Build the Xorg module</flag>
+		<flag name="dri3">Build with DRI3 support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">TigerVNC/tigervnc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
new file mode 100644
index 000000000000..0ea4a6882155
--- /dev/null
+++ b/net-misc/turbovnc/Manifest
@@ -0,0 +1,3 @@
+DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7
+EBUILD turbovnc-2.2.6.ebuild 2196 BLAKE2B 281b187822a2f5631891f86caa7c137110cc8747aebae4ef16f925afc19531dc9e877e7503f236b33022ea24744dbb34a0a8f61c1839917d6c8fce9b7feff4f0 SHA512 398a0b53b23d3ea0e136f7cd0ee79c509c58b4502e2e687f045c67b740871aac6c27e418b720efd767986c89c9afe68dd4bcc98b70960172112c0cb0381e1fef
+MISC metadata.xml 753 BLAKE2B 5b335db811d3f4ab42d3da0f98529351319dfa60e6f63058bccd11c8e2d498ef79f2edbb818eedebe51f0164eb937406310fd7fe6eb6084a66e1b237a9aa2598 SHA512 fe815b3a4289a2ddb0122b0a1191fffaaf38a22a6894b2a841a8a6fc7f9f19999fd912b4ed62591d0866921f36603687e36c2a7e43dc74ce538eb7562211eb37
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
new file mode 100644
index 000000000000..f4404f5503c4
--- /dev/null
+++ b/net-misc/turbovnc/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads.
+		By The VirtualGL Project.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">TurboVNC/turbovnc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild
new file mode 100644
index 000000000000..a8390bb0b57c
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake java-pkg-opt-2
+
+DESCRIPTION="A fast replacement for TigerVNC"
+HOMEPAGE="https://www.turbovnc.org/"
+SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ssl gnutls"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/freetype
+	>=media-libs/libjpeg-turbo-2.0.0[java?]
+	sys-libs/zlib
+	virtual/jdk:1.8
+	virtual/opengl
+	x11-libs/libfontenc
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfont2
+	x11-libs/libxkbfile
+	x11-libs/pixman
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	!net-misc/tigervnc
+"
+RDEPEND="
+	${DEPEND}
+	x11-apps/xkbcomp
+"
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTVNC_SYSTEMX11=ON
+		-DTVNC_SYSTEMLIBS=ON
+		-DTVNC_BUILDJAVA=$(usex java)
+		-DTVNC_BUILDNATIVE=ON
+		-DXKB_BIN_DIRECTORY=/usr/bin
+		-DXKB_DFLT_RULES=base
+	)
+
+	if use ssl ; then
+		# We prefer OpenSSL, so default to that if SSL is enabled
+		if use gnutls ; then
+			mycmakeargs+=( -DTVNC_USETLS="GnuTLS" )
+		else
+			# Link properly against OpenSSL to ensure
+			# we catch e.g. ABI change
+			# (i.e. don't dlopen it)
+			mycmakeargs+=(
+				-DTVNC_USETLS="OpenSSL"
+				-DTVNC_DLOPENSSL=OFF
+			)
+		fi
+	else
+		mycmakeargs+=( -DTVNC_USETLS=OFF )
+	fi
+
+	if use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+
+		mycmakeargs+=(
+			-DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar"
+			-DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use java ; then
+		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+	fi
+
+	# Don't install incompatible init script
+	rm -rf "${ED}"/etc/init.d/ || die
+	rm -rf "${ED}"/etc/sysconfig/ || die
+
+	find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die
+	einstalldocs
+}
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index d8cb201d1b08..8a45f865f6b0 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -1,5 +1,4 @@
 AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c159808594dce0fc60c735757148a315c87d02d110695b343eaffa28b067668b2f874ad1f88516fe9cee4f98621ecbb15396b1b4f SHA512 52a0b30aa8a2beee0056112b49cfe6ef6021f682f7ba1ba38173d227f5e103f34fdded8c61b7b399cc548ca5e182b47d320af6dffe617673aa873f08c20e1bc4
-AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
 EBUILD wakeonlan-0.41-r4.ebuild 620 BLAKE2B d143f032a58a7eee805b2172bd7234f24edb2a59ef73cc5dd0a2c2f79666a4e5553a92047bad51df89116dcd40de1d1dd143f309fbefe175c7516593f7af4e3c SHA512 5d61763a8596a4a94bf3ed2c849a2fac5b9ecb9f0ae7df37301f92c94fc478afe3132c02cf3b09c26b075c0d092f1c644f95f223fb2f9dabade8beb4768a0573
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup.patch b/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup.patch
deleted file mode 100644
index 6cbc355e2854..000000000000
--- a/net-misc/wakeonlan/files/wakeonlan-0.41-ethers-lookup.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- wakeonlan-0.41.orig/wakeonlan
-+++ wakeonlan-0.41/wakeonlan
-@@ -5,6 +5,7 @@
- #########################################################################       
- 
- use strict;
-+use Net::hostent;
- use Socket;
- use Getopt::Std;
- use vars qw($VERSION $opt_v $opt_h $opt_i $opt_p $opt_f);
-@@ -44,19 +45,64 @@
- 
- sub wake
- {
--	my $hwaddr  = shift;
-+	my $host    = shift;
- 	my $ipaddr  = shift || $DEFAULT_IP;
- 	my $port    = shift || $DEFAULT_PORT;
- 
- 	my ($raddr, $them, $proto);
--	my ($hwaddr_re, $pkt);
-+	my ($hwaddr, $hwaddr_re, $pkt);
- 	
--	# Validate hardware address (ethernet address)
-+	# get the hardware address (ethernet address)
- 
- 	$hwaddr_re = join(':', ('[0-9A-Fa-f]{1,2}') x 6);
--	if ($hwaddr !~ m/^$hwaddr_re$/) {
--		warn "Invalid hardware address: $hwaddr\n";
--		return undef;
-+	if ($host =~ m/^$hwaddr_re$/) {
-+		$hwaddr = $host;
-+	} else {
-+		# $host is not a hardware address, try to resolve it
-+		my $ip_re = join('\.', ('([0-9]|[1-9][0-9]|1[0-9]{2}|2([0-4][0-9]|5[0-5]))') x 4);
-+		my $ip_addr;
-+		if ($host =~ m/^$ip_re$/) {
-+			$ip_addr = $host;
-+		} else {
-+			my $h;
-+			unless ($h = gethost($host)) {
-+				warn "$host is not a hardware address and I could not resolve it as to an IP address.\n";
-+				return undef;
-+			}
-+			$ip_addr = inet_ntoa($h->addr);
-+		}
-+		# look up ip in /etc/ethers
-+		unless (open (ETHERS, '<', '/etc/ethers')) {
-+			warn "$host is not a hardware address and I could not open /etc/ethers.\n";
-+			return undef;
-+		}
-+		while (<ETHERS>) {
-+			if (($_ !~ m/^$/) && ($_ !~ m/^#/)) { # ignore comments
-+				my ($mac, $ip);
-+				($mac, $ip) = split(' ', $_, 3);
-+				if ($ip =~ m/^$ip$/) {
-+					if ($ip eq $ip_addr) {
-+						$hwaddr = $mac;
-+						last;
-+					}
-+					next;
-+				} else {
-+					my $h2;
-+					unless ($h2 = gethost($ip)) {
-+						next;
-+					}
-+					if (inet_ntoa($h2->addr) eq $ip_addr) {
-+						$hwaddr = $mac;
-+						last;
-+					}
-+				}
-+			}
-+		}
-+		close (ETHERS);
-+		unless (defined($hwaddr)) {
-+			warn "Could not find $host in /etc/ethers\n";
-+			return undef;
-+		}
- 	}
- 
- 	# Generate magic sequence
-@@ -68,7 +114,7 @@
- 
- 	# Allocate socket and send packet
- 
--	$raddr = gethostbyname($ipaddr);
-+	$raddr = gethostbyname($ipaddr)->addr;
- 	$them = pack_sockaddr_in($port, $raddr);
- 	$proto = getprotobyname('udp');
- 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index e487b101bc84..5802417f87b9 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,12 +1,8 @@
-DIST youtube-dl-2021.01.16.tar.gz 3275243 BLAKE2B 970bfff5db0aca7e386027e20f2b4d7e6b7209037820f3e0960f2e19b3b8e0aaf0f62bacb1794a15f359108533cbc396dddea99c84a8c88c13891329d2685326 SHA512 01b73f2e626df69249057ddc205d49dc7d6d16c66f4349fcdde5990615d1d13e0b5db15d65fb35e0c1328f7dc67d1473183228778614ccb7a3c9d27e80a0a38d
-DIST youtube-dl-2021.01.24.1.tar.gz 3288395 BLAKE2B f0adc4ed7627cfda3b7729afd0e4617c1d78b44b5cb84186251eacdfb54bdd0ad2395253899a1aed1ba708856e872ca0537baf316f08b289140bdacb3976e9d6 SHA512 b5ab1e03f38b5628487fdfa22febd594f87d42c228fcc0b03966205ca3fbc6fa6103388f8736ad22e7d517359823d8ca6cc61aeb80fdd69db06a82d55437bacb
-DIST youtube-dl-2021.02.04.1.tar.gz 3274333 BLAKE2B 46f5c332f7346db589cd6d5c0fe649b547e948903f90851d6ead0322ec516300dd65189d781ffd24711336dc1f310920a4c5a6f9d6a1944046e900bcd22ee675 SHA512 b1050ace3adf1811adaa336d5b3574c938bf6fde1163e50b35c8a11bb5c251cf272ca5de3ff8132a44417ea2ced7b611c19e4aaf4dfd12adfeac03afe14df0dc
-DIST youtube-dl-2021.02.04.tar.gz 3274222 BLAKE2B 6ec6b4031b8fff7630bbbebcef5795962d7bc6c12a04799f0a04d8b14023e651a06757f918dc6d3c3b6833b7662c742c26dbe68e3f1a35159c0dda49ef6c2f32 SHA512 44dab7016d625235aab244161bfcc959d6fd22cb176ca0fb59f60eb31229da343f0a40c162c37a7e829bfa82fed541b66266d28cd859fc18a78bb1936f3fde22
-DIST youtube-dl-2021.02.10.tar.gz 3277828 BLAKE2B f3bd3874784ada041c86872621a8f5c9e6e2de7ef266fee1962bf4a609b5361baca0e77eed97624fd2f856748fa826ba361bbf242acafdd6b89bc3a36d5f295e SHA512 84de569e5fb691af84e0dca6de5912b99912df2d88b5933740dfa76ce57027b21e1648dd7c8fe71f40839297d670f1a0cefaa3c1fc4d0c6d9beddbd22d0e93ec
-EBUILD youtube-dl-2021.01.16.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
-EBUILD youtube-dl-2021.01.24.1.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
-EBUILD youtube-dl-2021.02.04.1.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
-EBUILD youtube-dl-2021.02.04.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
-EBUILD youtube-dl-2021.02.10.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
+DIST youtube-dl-2021.02.22.tar.gz 3293733 BLAKE2B 83c3d53624a5e2dd1e901fbdbf90e95dc43c632c8bb263e25121c7a68beffe495e481c52d35b822a82a885eb4c4836c1567fd174ac57cedbc18bbb9768f43dc0 SHA512 eaecddf40759777c00abc1b456d8f55dd2ef242a8445970dd655a21dd148459c2c538a4b04fafddbdd295911a96e432a926c5f26e5a29c993fb3bc10f0ca1b9b
+DIST youtube-dl-2021.03.02.tar.gz 3302162 BLAKE2B c1ccc5822061f0d815ada19827cada576817acd1ec7d18410a021fc599b7ebd456a4d913475b7649eae8c75d757860d5bb1a76a51be740ba880746ff585700e4 SHA512 1318434c009a9eb41231bb7897b16fd72fde5d3165f6a24ff97031ed89b4d6408520242c71270f12b4f55dfa97ca48d42c6f167ad036eca74241e61cb950c298
+DIST youtube-dl-2021.03.03.tar.gz 3303114 BLAKE2B f63f2aedb6494b22156df08b5aaa2c4438614fd99a7e2d45baaa754c71a278a2c22051086f578f54b4cfa6384aaf5e08e61d42b8023a754805a65e6b6a79ea58 SHA512 0a554ee6805ceaa1c68eab83be3bd6046bc56a26658c705e231f907c2970cdeb441e0ae57d5013385810b5bbee7e4de3ac7f6df36c3eef76a6fa9c5424b921a2
+EBUILD youtube-dl-2021.02.22.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
+EBUILD youtube-dl-2021.03.02.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
+EBUILD youtube-dl-2021.03.03.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild
deleted file mode 100644
index d787a3f3be53..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.10.ebuild b/net-misc/youtube-dl/youtube-dl-2021.02.10.ebuild
deleted file mode 100644
index 9b024e43dbba..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.02.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild
index d787a3f3be53..d787a3f3be53 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.01.16.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.02.22.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.04.1.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.02.ebuild
index 9b024e43dbba..9b024e43dbba 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.02.04.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.02.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.04.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
index 9b024e43dbba..9b024e43dbba 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.02.04.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /net-misc
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)