gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /net-misc
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
106 files changed, 2166 insertions, 1108 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a1fbd6c30acf..1b4a6459983c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 81ddcd22000e..4ff43d1572a5 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,10 +5,12 @@ DIST curl-7.71.0.tar.xz 2379056 BLAKE2B 50d7369e4335823c3032b8801b270f7d8e687b05
 DIST curl-7.71.1.tar.xz 2387660 BLAKE2B 47b3a4704ae8b09b37f7a9d8850fd7d692d91db3dd4ad776aad9a57d0162e0f4091e0387a850eb048f834e6dfee5bcb36da56493a106696c72072c612b47f623 SHA512 631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b
 DIST curl-7.72.0.tar.xz 2390040 BLAKE2B 8f20efe7255ffe6d68619645b634b9cb10557ba0ca458904e99105133fb54cfafe4cafa0e7a1c5e20bbf5b5d24c8c44670cb5ddc1a2035ca43eadd24899ea953 SHA512 e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107
 DIST curl-7.73.0.tar.xz 2394228 BLAKE2B 33ce983878dd3154d5e3e44b2b64a02e47a3faac77615db1c67cc6617495c16f40a36406e1627e2cef62bc1a01cdd0c5ae47ccc6cc4265257fc47b2f34eaac65 SHA512 95330bac2d6bc5306d47723b3c7bdb754fabe2ba2df7b2a8027453a40286f1c7caaee69333f0715e59fbc7fdf09080968ea624398c995cabf3d57493973867bd
+DIST curl-7.74.0.tar.xz 2400972 BLAKE2B bef9e01493994afc933549a78b41065708aeaa9f6f5cdd1dbf2f43bbb03bbc97b17308b8bda5f11599c3cc0c6c77903e6fa6f1310ff874fad902a59566b51e8a SHA512 5d987f0b4d051c9e254f14d4e2a05f7cda9fb0f0ac7b3ca3664a25a51ee5ffe092ee072c0d9a613fcd3f34727d75bba14b70f5500cb110ca818591e071c3e6f4
 EBUILD curl-7.71.0.ebuild 7692 BLAKE2B a2114c226d010472ced5ed0a4d25feeba6d820defc786c49022c74dd0eb72a56015086fb549d3187dcd01f6cead02da6f9668a3442c833a6f52b8e76419d5bae SHA512 0d10f62aeb9a91c6199034060295064621ece66181019b7530b98d38bd36d31c0d404d1a92a4245cab7386363c84c6bf3c054b977ea07e3a8fb5aa541b877f28
 EBUILD curl-7.71.1-r1.ebuild 8734 BLAKE2B 748f1f1564ee84bd716679a8b336f324d325c51e74efe8db34797a9deecbc153a4158fb5c563076f5b8459798b9a3ebd4f2a6851ea71d9fa2f5da40de716d5cc SHA512 dbf4dc6fcb9ca884d36373661242558ba2240f6d9b88c1cf1a4285cebd06425d3fce7c38f52eb3b1cbf832e3cd3712d76d214824fefb6040168f9475081a00a6
 EBUILD curl-7.71.1.ebuild 7695 BLAKE2B d47481a0edef1362479059a346768e2c2ad9a9059591e8f73c69bb545cf5c825b04a7049ba36849a34dbf8ecb8d8d41fd2da8ebc5e497b9b8b8da2568abc34a7 SHA512 8a7cf22108e3bffdc3f89adcf3d292f62200e562596253c920890356ff82f697a391f17f8a18f02bda4678e224d2927b42e969887975253245af5a7d972375a2
 EBUILD curl-7.72.0-r1.ebuild 8807 BLAKE2B 812d527d58295be590bb46afa53de21e1623945f8885ba308c0421d6938d27551ec6a7ad7e1a6c0238bc46e7dd0846e1d592910394298f457d1eb0ce254710ea SHA512 c421c48d772108e62a1809ac01b5984f741c3ff5ce20c57f8f2558721a426e23bac8ea10772f18adadb7d40b40bcdab675abbcc6837315c2afd4ed47847f09a0
 EBUILD curl-7.72.0.ebuild 8725 BLAKE2B be5a57258f10186d79ca54ee4dcd1eaa2475ec35bcd5cb5120fb526b71a3cef87706cc152259ab871efaea6fe32313cdc960bcc33119bffa8009906982242405 SHA512 b52bd92c3703eaefdaee0b1fa55ae0e3bc1ca602c78cf052811c88118442f9677245f89fa839aff00c36966dcc46e29c266620f9e311c82f4ade117b0134f2ca
 EBUILD curl-7.73.0.ebuild 8865 BLAKE2B fcad66ef5b64d166dc3a10eff742d97a4f33cb4da004f922df8b21db55aec687450c7c92cbe3374d76637aa3671257145aa6f9610ede9fd0896be5fa431011d4 SHA512 c1ad8d29b8f692d17ed455b822a8efbd7a848d798209dd155fbec1753ba72aa64ec7480d270afcedc0b018531af0e4a253e4fe78b9f50739422d6ad9abfe0e12
-MISC metadata.xml 1967 BLAKE2B ff6f524ed3c1865cfde9d3859ae4de39040a0218bd0222ec9d7e9bc58b2e1166bc3f424c47287a20bb474638d19c2b5e15092d80b1b8088cc23f2cb5e3a900ad SHA512 556278cde5d59379985db113f33fb3f20370080cb2ae387d186cd5547380df2014632f37b2df0f153c810dfa4b5c3bd383b73158fd466cfab363bb68fecd0c37
+EBUILD curl-7.74.0-r2.ebuild 8813 BLAKE2B 0acdcb86225afe12a2eb65df925f28c15764f5f0e2738be4cbf13a9d43026c4a4fc7f72f8c266dd5e1df13b024cf5e3f7639ce88bdab8179ad8556b9c4900bac SHA512 ca1ac677e0f1c7e79b270ca69fc4fa14e27aeadedd79b22e3f6a5e28cf0a683b4932bc2ff76101d086412f32f1c12098632f8960bac8c6b19a311abfc770284a
+MISC metadata.xml 2032 BLAKE2B b9406f27a492123f45151d54e34056f26aac11aed12c8c69230f0a41602b42198d102edcdb36d6b890c818fc0b0ccce82b459e376f102d39a096646a17462475 SHA512 c33c12443b4489d36b9506b1a361547d5691bc0a6d997d5ae68869dc8f7936a6418b209bf80f61502c74e6722907c241d269089cb49b7c43a3c086dd52c8c16d
diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild
new file mode 100644
index 000000000000..fdeb3b561d5f
--- /dev/null
+++ b/net-misc/curl/curl-7.74.0-r2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] )
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+	winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES.md docs/INTERNALS.md \
+	docs/FAQ docs/BUGS.md docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use winssl || use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_libressl; then
+			einfo "Default SSL provided by LibreSSL"
+			myconf+=( --with-default-ssl-backend=openssl )  # NOTE THE HACK HERE
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_winssl; then
+			einfo "Default SSL provided by Windows"
+			myconf+=( --with-default-ssl-backend=winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable alt-svc) \
+		--enable-crypto-auth \
+		--enable-dict \
+		--disable-ech \
+		--enable-file \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		$(use_enable hsts) \
+		--enable-http \
+		$(use_enable imap) \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		$(use_enable pop3) \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		$(use_enable smtp) \
+		$(use_enable telnet) \
+		$(use_enable tftp) \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-bearssl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		--without-libpsl \
+		$(use_with nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		$(use_with zstd) \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 27424bfe2249..aeae03a29a9c 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="ftp">Enable FTP support</flag>
 		<flag name="gnutls">Enable gnutls ssl backend</flag>
 		<flag name="gopher">Enable Gopher protocol support</flag>
+		<flag name="hsts">Enable HTTP Strict Transport Security</flag>
 		<flag name="http2">Enable HTTP/2.0 support</flag>
 		<flag name="imap">Enable Internet Message Access Protocol support</flag>
 		<flag name="mbedtls">Enable mbedtls ssl backend</flag>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 2ac1313f9700..2c855fa0cb49 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -3,10 +3,10 @@ AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8
 AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
-DIST dhcpcd-9.3.2.tar.xz 254476 BLAKE2B 86cbb02564474e8ec6809315db10ec06c072ab3e4a563b2a0f1df21d1c02ed3a97b816ed190803910f0cfe39de6420b82cc37ff81e29b67806b250c877b0db34 SHA512 f7e5b060e8b5cd65e6d1660a79d444e066dd8a6c492cc44b9522577687a93d944227ad3ff840ac0f65a9aa725ca1a79a7178330d8445b808409e215ba7f042b0
 DIST dhcpcd-9.3.3.tar.xz 254972 BLAKE2B 6f808d08059ca93fd2af14b9b6efbcece08634a72c8f06bb31a49ee5c6a7f52af6bfeb43e007710b466bd70d4005416d7882fc93ac5b28e1a019f06b9b0afe15 SHA512 1ff58107fe7e45a42c8da32ce6554244c1cac289e0c207f7dd29f5fcab1a2aadd66434604cd35e979e0aa138de9d968e9360b5339d3f233e6c1a83d7a20799c4
+DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517
 EBUILD dhcpcd-8.1.9.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
-EBUILD dhcpcd-9.3.2.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9.3.3.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
+EBUILD dhcpcd-9.3.4.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 MISC metadata.xml 646 BLAKE2B 80de0aeee2dbf33f6bebf9a64be5b13a8eb078e7693157ede4e31bc2ab86b9588b40949af7c9dc511e679202640a7c053689a5c562dadcedf9216d9dce25b1e6 SHA512 5917c153c5fa048bdca17cbcd0b5ce81a152635de166fa140ced7e46bffacc9e2335092d8c4454fd33515a8d28cb8b1f114dcef8465526837477a90dd20e980d
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.2.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
index 092c6e4a1dda..092c6e4a1dda 100644
--- a/net-misc/dhcpcd/dhcpcd-9.3.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 04f651c870e6..a34cb2433b30 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,7 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-109.4.517.tar.gz 98336166 BLAKE2B 6c8e59b6640d83c9f4a36a700d9471b2c4b97618126b78fabccc031ee6ba2c8b94122b273d01b21d6762020aae904c284a3d335dac70259692fbd045cbc0d7b2 SHA512 308e2d837a761d8bae02ef38cc9724fc6a411b1cdbd89c2bb0e3e2b4ee512755c859579fcb8cf1ea34b1e75becbe9910f878f8b019ce3b74c59a15a92e44df4f
-DIST dropbox-lnx.x86-110.4.458.tar.gz 98543766 BLAKE2B 85c1e2d23436a8a48587a8d50a5d44c7a8f6e6de571f7a7eaa2cd54da45a7f3721f23a9ab1769353536d50c93f40d35635f228342888ba4509de9c9130d5f0a5 SHA512 e913cac34c1934818d5ac1478f3b723d34f5a196451a8b652a7bdbef552f94258b36323cd3ae77bfdb2a85caf0006b6fbf0ef6997a4d616f25c0bed18c844393
-DIST dropbox-lnx.x86_64-109.4.517.tar.gz 102381526 BLAKE2B 915d8901e88597c456d507e70ba4026cb41d110ac08a902f10a02490e272e61cc81b67f04769e44746883e1f6064eb4ee034d74aa6b4ed4e6d6ee0a7d785efb2 SHA512 502149b0d20d47ed6af3e073d2e54b3888fa093084e8c45fb5c36aef56d47a2d4280daf8dd586ad95b55db9435b45acca4b25140840a786d1c1a101011210de4
-DIST dropbox-lnx.x86_64-110.4.458.tar.gz 102601668 BLAKE2B b9614d7880dab101ff12812b78e26b269ad1e82505d4a02fc284dcf0c72256062b65bcb29598a45268b41eaa7567f6d13cfa8e264df805bbe434039852094b90 SHA512 f8107e4335adce49f3eca742b0517777aa84d35a60657c92dcf155f55fecef3bbcb01e4c1bddb43eb96568f9f296245e57e6af0c799e2cd5fd9c900bd98e0ccf
-EBUILD dropbox-109.4.517.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
-EBUILD dropbox-110.4.458.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
+DIST dropbox-lnx.x86-111.4.472.tar.gz 98640604 BLAKE2B 326c5290857bc511116f4375a1900570843ae0d50575ca8025ef3e431dafba7059a9952e8742d37ef0a297ac967ab115ebe4edc80f7f86a07aa04c6541ef2648 SHA512 4411f4f261bf4cde4d1d23c50696414119f13c5a18cb3e9cadec823570eed30c3f277b770068656d73e3a36e710c1554a58d51498ca1d2433905a2c03eae63a0
+DIST dropbox-lnx.x86_64-111.4.472.tar.gz 102674853 BLAKE2B 13255b9737859b9594901955d3819499173b43f12a0eaf476a402bf4bbfe3f1ca5881bf3fda5bdf47d0936e2e9d4bed58abc89c58feeb907074d965739e75021 SHA512 f70a37e0a6fa4f56353d1482b8621b526ecba31a9fdc6da337f3c01e075c87c28728cfd80f7f1a1f74286e294652684e2b7e671c7a6b195cd96eee64f785b3c4
+EBUILD dropbox-111.4.472.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-110.4.458.ebuild b/net-misc/dropbox/dropbox-110.4.458.ebuild
deleted file mode 100644
index 7286be94a2dc..000000000000
--- a/net-misc/dropbox/dropbox-110.4.458.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-109.4.517.ebuild b/net-misc/dropbox/dropbox-111.4.472.ebuild
index c4fb56f770ad..c4fb56f770ad 100644
--- a/net-misc/dropbox/dropbox-109.4.517.ebuild
+++ b/net-misc/dropbox/dropbox-111.4.472.ebuild
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index a0d3e6c81300..d9fb3822e1bc 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,4 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
 DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a
-EBUILD electron-cash-4.0.2-r2.ebuild 3568 BLAKE2B a462278cf1c8bdf62c3722dad69a183e3fe32758da7f0c2a9ff27a926ce5a783e0aecfcdf5c5a181cdcbef99197819b0c6072c4855f6e6c93c73018268bebe7a SHA512 e55892b13afd1362ed1fe6c4c435b2dc4e0ed6772d2b7718d93da4419f6a5809506fced280627c9888fc4d9c8e7244cd3a29a9d46c0378ec87e353dbfe13abc3
+EBUILD electron-cash-4.0.2-r2.ebuild 3564 BLAKE2B 6d992c28a65cde8f810179a78627b05ebf100b9ce55edf39c1fb0e26484a1dd1950f3bab35c7922c134aa9afde9e91d7c695cff163f67b66b05058725be2ec30 SHA512 b4038abdcec57205fc7b4913f19cd0a219e998e3cc769adcd6169c8da09677ec074d1be63424afbf438c89748c9ba6e093a9196f5446314f9a63274f45e527c7
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
index c1e564a5b3e2..5af410c2a3d0 100644
--- a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 gnome2-utils xdg-utils
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 76fd417b780b..3998c0ba3e58 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -2,6 +2,10 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
 DIST electrum-4.0.4.gh.tar.gz 4415688 BLAKE2B 1811b3a5534c343b6bc1efccfab822e2550e0b19563837ee69d93006c081acb116b96a2bfe812420cfd7694190d66eb5e5bb01e5d0271262b714a06979ff053e SHA512 1b4fc9f0ac9624ac271ba65989524f902a465ae50465fd7e9f90366a59e17e6938ab0f58cf9ec8e40c10ee99074e1f800cae080d37da60359091be698957ecda
 DIST electrum-4.0.5.gh.tar.gz 4429965 BLAKE2B 1aad8c0407f1dbe085f7cef580785335823fc773296c040a7ce118b0e3edd4a1972ad0712b98754cc548df841fda6df0c854797557c2a2f57a37bd4f3cc2cdb8 SHA512 a0f2eeb57020dc16b568a4d4fce37522f212036455b4e79abf1d44bc20065e896a861bf1a5547fbcae87c2659720d7937c9c0c817e787209c119a06c05549e76
+DIST electrum-4.0.6.gh.tar.gz 4430258 BLAKE2B 883e74d5224c24012d38b3730ef2138abd397500c0271b98938802d55d4ca50075e2e171779868ef4c789fc1feba5bfdecb295e032c2bec92da2d0d34e21987e SHA512 ae8caa827456a75a0e84e35477edf4b0ba28862438571ad54807062e54c673023b3767dd5bbe63f8bead8dc5a8b19a1e3fb1dbeee0c2141d59b8454eafb03965
+DIST electrum-4.0.7.gh.tar.gz 4431614 BLAKE2B bd0d0c4b52492ab439f5e5b6879edeafc0a9c45c3aa7b5fad340a702203a09da858fe7165c89e8c2e788d6e3f26002007012ea8f377f432d189018f9ac7c7e2e SHA512 2a036d19140b56947d374d1d64b6c51e12aba2eca7ad992d38305c884572ef7cf06c7bfa3bc89fa20e22e249cfda6de76dc006f86490e1af1d580c23406cb6f1
 EBUILD electrum-4.0.4.ebuild 2400 BLAKE2B c579900e61c708b2f721fde772889488f0b43579517c34b21d24c1d665b1d7097a4cf367a52ea561bcd3856c2b7565dbd3c9044a3454ca04a3c1d5e198e94d38 SHA512 c45735ed759d721775892f5126a11038a7df85e616259c5627e6bade3654d85f1396bada52a240d1a02509ddfaa2b3711f0c4ad1c62b7c4e25b980dfb04f51d3
 EBUILD electrum-4.0.5.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
+EBUILD electrum-4.0.6.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
+EBUILD electrum-4.0.7.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
 MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6
diff --git a/net-misc/electrum/electrum-4.0.6.ebuild b/net-misc/electrum/electrum-4.0.6.ebuild
new file mode 100644
index 000000000000..0ed6a75d3617
--- /dev/null
+++ b/net-misc/electrum/electrum-4.0.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.14[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${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-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+	|| (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.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
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/electrum-4.0.7.ebuild b/net-misc/electrum/electrum-4.0.7.ebuild
new file mode 100644
index 000000000000..de86b6ef7b46
--- /dev/null
+++ b/net-misc/electrum/electrum-4.0.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${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-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.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
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
new file mode 100644
index 000000000000..9bd543432ae4
--- /dev/null
+++ b/net-misc/frr/Manifest
@@ -0,0 +1,6 @@
+AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
+AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
+AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
+DIST frr-7.5.tar.gz 6730659 BLAKE2B 12c915e7564b8f0157b20b0714b1efd8c2ad0c51dbaeb1eb3ef2d5ea50406c297d7f4bd854d9246b515d42f3fa326b2b3c7a30d83f35b64c374947b26709f6fe SHA512 d0d3c0bc0d30e2ebb93e20906768a996d21db23b23118c8e3c50d238e7bfdee7a789b4a90c9d7dbdc842d857f60bd44f0922b01b0c2c8b289ac860f008a430a9
+EBUILD frr-7.5.ebuild 3371 BLAKE2B 4540d279f5b9816cd9abfe404928d335e6792df572e154a10302d53fb661892ea068c04ab160c841d7d6b8a3faa2de3bf39e6acfac50816c9d787a1f7dddd83c SHA512 fbe577b9cacd4e29ced2c035c3d26d627c2cd969c110717577cec59371fcd3f4de84879a49b45f84b422c28c7bf150fd1cfb1ded85580f1f8cc6ce7195128dde
+MISC metadata.xml 701 BLAKE2B 69812cc3ccd29487acd06afe28dbc936c671ee20741790045e39546720c1745311cae6dbba2bf612311e7ae27a708039006f0f92f04f512b724d291ebb33398a SHA512 4979d8ec46e7a874f9cff76f5b06b98692db749764d649bcbd8a06a51265cacdd466004ca4b7c5f7cabc7a4969908eb4840da2b85fd1dde3ee19815819b4a66a
diff --git a/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch b/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch
new file mode 100644
index 000000000000..f6b726b591f7
--- /dev/null
+++ b/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch
@@ -0,0 +1,22 @@
+Fix for missing definitions on some Hardened configurations
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292
+
+diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c
+--- quagga-0.99.16.orig/zebra/ipforward_sysctl.c	2010-03-11 12:11:32.000000000 -0500
++++ quagga-0.99.16/zebra/ipforward_sysctl.c	2010-03-11 12:11:39.000000000 -0500
+@@ -31,6 +31,15 @@
+ 
+ #define MIB_SIZ 4
+ 
++/* Fix for recent (2.6.14) kernel headers */
++#ifndef IPCTL_FORWARDING
++    #define IPCTL_FORWARDING       NET_IPV4_FORWARD
++#endif
++
++#ifndef IP6CTL_FORWARDING
++    #define IP6CTL_FORWARDING      NET_IPV6_FORWARDING
++#endif
++
+ extern struct zebra_privs_t zserv_privs;
+ 
+ /* IPv4 forwarding control MIB. */
diff --git a/net-misc/frr/files/frr-openrc-v1 b/net-misc/frr/files/frr-openrc-v1
new file mode 100644
index 000000000000..9e2f1ab914fd
--- /dev/null
+++ b/net-misc/frr/files/frr-openrc-v1
@@ -0,0 +1,300 @@
+#!/sbin/openrc-run
+#
+# FRR OpenRC init script.
+#
+# Copyright (C) 2020 Rafael F. Zalamena
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; only version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+description="FRR initialization script."
+
+# FRR variables.
+frr_dir="/usr/lib/frr"
+frr_state_dir="/run/frr"
+config_file="/etc/frr/frr.conf"
+daemon_file="/etc/frr/daemons"
+daemon_db="/run/frrdb"
+vty_config_file="/etc/frr/vtysh.conf"
+frr_reload="$frr_dir/frr-reload.py"
+frr_reload_log="$frr_state_dir/reload.log"
+
+# Don't change profile here, use $daemon_file. This is the default.
+frr_profile="traditional"
+
+# watchfrr variables.
+watchfrr_daemons=''
+watchfrr_pidfile="$frr_state_dir/watchfrr.pid"
+
+#
+# Helpers.
+#
+_check_daemon_binary() {
+  local daemon=$1
+
+  [ -x "$frr_dir/$daemon" ] && return 0
+
+  eerror "No binary found for $daemon in $frr_dir"
+  return 1
+}
+
+_load_daemon_list() {
+  # Load FRR daemons configuration file.
+  while read line <&3 ; do
+    case $line in
+      ""|"#"*)
+        # Skip empty/commented lines.
+        continue
+        ;;
+
+      *d=*|*_instances=*|*_options=*|*_wrap=*)
+        # Load daemon options.
+        eval "$line"
+        ;;
+
+      MAX_FDS=*|frr_profile=*|vtysh_enable=*)
+        # Load misc configuration.
+        eval "$line"
+        ;;
+    esac
+  done 3< $daemon_file
+
+  # `zebra` and `staticd` are mandatory.
+  _check_daemon_binary 'zebra' || return 1
+  _check_daemon_binary 'staticd' || return 1
+  watchfrr_daemons='zebra staticd'
+
+  # Create the watchfrr command line.
+  for daemon in \
+    babeld bfdd bgpd eigrpd fabricd isisd ldpd nhrpd ospfd ospf6d pbrd \
+    pimd ripd ripngd sharpd vrrpd \
+  ; do
+    # Trick to read variable name with variable.
+    cdaemon=$(eval echo \$$daemon)
+    cdaemon_instances=$(eval echo \$${daemon}_instances)
+
+    # Add daemon to command line if specified.
+    if [ ! -z $cdaemon ] && [ $cdaemon = 'yes' ]; then
+      _check_daemon_binary $daemon || return 1
+
+      # Multi instance daemon handling.
+      if [ ! -z $cdaemon_instances ]; then
+        for instance in $(echo $cdaemon_instances | tr ',' ' '); do
+          watchfrr_daemons="$watchfrr_daemons $daemon-$instance"
+        done
+      fi
+
+      # Single instance daemon handling.
+      watchfrr_daemons="$watchfrr_daemons $daemon"
+      continue
+    fi
+  done
+}
+
+_frr_start() {
+  # Apply MAX_FDS configuration if set.
+  if [ ! -z $MAX_FDS ]; then
+    veinfo "  Setting maximum file descriptors to ${MAX_FDS}"
+    ulimit -n $MAX_FDS >/dev/null 2>/dev/null
+  fi
+
+  # Save started daemons to state database.
+  rm -f -- $daemon_db
+  for daemon in $watchfrr_daemons; do
+    echo $daemon >> $daemon_db
+    veinfo "  Starting $daemon..."
+  done
+
+  veinfo "  Starting watchfrr..."
+
+  # Start watchfrr which will start all configured daemons.
+  eval $all_wrap $frr_dir/watchfrr -d -F $frr_profile $watchfrr_daemons
+
+  veinfo "  Loading configuration..."
+
+  # After starting the daemons, lets load the configuration.
+  if [ $vtysh_enable = 'yes' ]; then
+    vtysh -b -n
+  else
+    veinfo "  Configuration loading disabled (vtysh_enable=$vtysh_enable)"
+  fi
+}
+
+_get_pid() {
+  local daemon=$1
+  local pid_file="$frr_state_dir/$daemon.pid"
+
+  # Test for file existence.
+  if [ ! -r "$pid_file" ]; then
+    eerror "Failed to find or read $daemon pid file"
+    return 1
+  fi
+
+  # Get PID if any.
+  pid=$(cat $pid_file)
+  if [ -z $pid ]; then
+    eerror "$daemon PID file empty"
+    return 1
+  fi
+
+  return 0
+}
+
+_stop_daemon() {
+  local daemon=$1
+  local pid_file="$frr_state_dir/$daemon.pid"
+
+  # Get daemon pid.
+  _get_pid $daemon
+
+  # Ask daemon to quit.
+  kill -2 "$pid"
+
+  # Test if daemon is still running.
+  attempts=1200
+  while kill -0 "$pid" 2>/dev/null; do
+    sleep 0.5
+    [ $((attempts - 1)) -gt 0 ] || break
+  done
+
+  # Tell user about our situation.
+  if kill -0 "$pid" 2>/dev/null ; then
+    eerror "Failed to stop $daemon (PID=${pid})"
+    return 1
+  else
+    rm -f -- $pid_file
+  fi
+}
+
+_frr_stop() {
+  local failures=0
+
+  # Stop watchfrr first so it doesn't restart anyone.
+  veinfo "  Stopping watchfrr..."
+  _stop_daemon watchfrr || failures=1
+
+  # Read started daemon database.
+  while read line <&3 ; do
+    case $line in
+      ""|"#"*)
+        # Skip empty/commented lines.
+        continue
+        ;;
+
+      *)
+        # Get daemon name.
+        veinfo "  Stopping $line..."
+        _stop_daemon $line || failures=1
+        ;;
+    esac
+  done 3< $daemon_db
+
+  # Remove daemon database file.
+  rm -f -- $daemon_db
+
+  return $failures
+}
+
+_check_watchfrr() {
+  _get_pid watchfrr || return 1
+  return 0
+}
+
+#
+# Main.
+#
+depend() {
+  # We need root to write logs.
+  need localmount
+  # Optionally wait for network to start.
+  use net
+  # Expect /run to be ready.
+  after bootmisc
+}
+
+start_pre() {
+  # Check configuration file readability.
+  checkpath -f -m 0640 -o frr:frr $vty_config_file
+  checkpath -f -m 0640 -o frr:frr $daemon_file
+  checkpath -f -m 0640 -o frr:frr $config_file
+
+  # Check run state directory.
+  checkpath -d -o frr $frr_state_dir
+
+  # Load daemon list and peform checks.
+  _load_daemon_list
+}
+
+start() {
+  # Load daemon list.
+  _load_daemon_list
+
+  # Handle restarts.
+  if [ "$RC_CMD" = 'restart' ]; then
+    ebegin 'Reloading FRR configuration'
+  else
+    ebegin 'Starting FRR'
+  fi
+
+  # Start FRR.
+  _frr_start
+
+  # New daemons and watchfrr started, apply new configuration.
+  if [ "$RC_CMD" = 'restart' ]; then
+    "$frr_reload" --reload "$config_file" 2>/run/frr/reload.log
+    [ $? -ne 0 ] && ewarn "  Failed to reload (check $frr_reload_log)"
+    # NOTE: we can't return bad status otherwise OpenRC will think we
+    # failed to start, lets print a helpful message instead.
+  fi
+
+  eend 0
+}
+
+stop() {
+  local failures=0
+
+  # Handle restarts.
+  if [ "$RC_CMD" = 'restart' ]; then
+    # Load daemon list.
+    _load_daemon_list
+
+    # We must restart 'watchfrr' in order to start new daemons.
+    veinfo "  Stopping watchfrr..."
+    _stop_daemon watchfrr
+
+    # Stop daemons that are no longer in configuration file.
+    for daemon in $(ls -1 /run/frr/*.pid | cut -d '.' -f 1); do
+      # Filter daemon name.
+      daemon=$(basename "$daemon")
+
+      # Skip watchfrr.
+      [ "$daemon" = 'watchfrr' ] && continue
+
+      echo "$watchfrr_daemons" | grep "$daemon" >/dev/null
+      if [ $? -ne 0 ]; then
+        veinfo "  Stopping $daemon..."
+        _stop_daemon $daemon
+      fi
+    done
+
+    return 0
+  fi
+
+  ebegin 'Stopping FRR'
+  _frr_stop || failures=1
+  eend $failures 'some daemons failed to stop'
+}
+
+status() {
+  _check_watchfrr || return 1
+}
diff --git a/net-misc/frr/files/frr.pam b/net-misc/frr/files/frr.pam
new file mode 100644
index 000000000000..5cef5d9d746e
--- /dev/null
+++ b/net-misc/frr/files/frr.pam
@@ -0,0 +1,26 @@
+#%PAM-1.0
+#
+
+##### if running frr as root:
+# Only allow root (and possibly wheel) to use this because enable access
+# is unrestricted.
+auth       sufficient   pam_rootok.so
+
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth       sufficient   pam_wheel.so trust use_uid
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth       required     pam_wheel.so use_uid
+###########################################################
+
+# If using frr privileges and with a seperate group for vty access, then
+# access can be controlled via the vty access group, and pam can simply
+# check for valid user/password, eg:
+#
+# only allow local users.
+#auth       required     pam_securetty.so
+#auth       include      system-auth
+#auth       required     pam_nologin.so
+#account    include      system-auth
+#password   include      system-auth
+#session    include      system-auth
+#session    optional     pam_console.so
diff --git a/net-misc/frr/frr-7.5.ebuild b/net-misc/frr/frr-7.5.ebuild
new file mode 100644
index 000000000000..425a59944037
--- /dev/null
+++ b/net-misc/frr/frr-7.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	>=net-libs/libyang-1.0.184
+	sys-libs/libcap
+	sys-libs/readline:0=
+	grpc? ( net-libs/grpc )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
+	snmp? ( net-analyzer/net-snmp )
+"
+
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	sys-devel/flex
+	virtual/yacc
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
+	!!net-misc/quagga
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.5-ipctl-forwarding.patch"
+)
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-pkg-extra-version="-gentoo" \
+		--enable-configfile-mask=0640 \
+		--enable-logfile-mask=0640 \
+		--prefix=/usr \
+		--libdir=/usr/lib/frr \
+		--sbindir=/usr/lib/frr \
+		--libexecdir=/usr/lib/frr \
+		--sysconfdir=/etc/frr \
+		--localstatedir=/run/frr \
+		--with-moduledir=/usr/lib/frr/modules \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--enable-user=frr \
+		--enable-group=frr \
+		--enable-vty-group=frr \
+		--enable-multipath=64 \
+		$(use_enable doc) \
+		$(use_enable fpm) \
+		$(use_enable grpc) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 rtadv) \
+		$(use_enable kernel_linux realms) \
+		$(use_enable nhrp nhrpd) \
+		$(usex ospfapi '--enable-ospfclient' '' '' '') \
+		$(use_enable rpki) \
+		$(use_enable snmp) \
+		$(use_enable systemd)
+}
+
+src_compile() {
+	default
+
+	use doc && (cd doc; make html)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	keepdir /etc/frr
+	fowners frr:frr /etc/frr
+	fperms 775 /etc/frr
+
+	# Create logs directory with the correct permissions
+	keepdir /var/log/frr
+	fowners frr:frr /var/log/frr
+	fperms 775 /var/log/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/vtysh.conf
+	doins tools/etc/frr/frr.conf
+	doins tools/etc/frr/daemons
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/vtysh.conf
+	fowners frr:frr /etc/frr/frr.conf
+	fowners frr:frr /etc/frr/daemons
+	fperms 640 /etc/frr/vtysh.conf
+	fperms 640 /etc/frr/frr.conf
+	fperms 640 /etc/frr/daemons
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}/frr.pam" frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}/frr-openrc-v1" frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${D}/usr/share/yang/ietf-interfaces.yang" || die
+}
diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
new file mode 100644
index 000000000000..043dceace198
--- /dev/null
+++ b/net-misc/frr/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<use>
+		<flag name="grpc">
+			Enable gRPC plugin
+		</flag>
+		<flag name="nhrp">
+			Build Next Hop Resolution Protocol daemon
+		</flag>
+		<flag name="fpm">
+			Enable Forwarding Plane Manager support
+		</flag>
+		<flag name="rpki">
+			Enable RPKI
+		</flag>
+		<flag name="pam">
+			Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Virtual Terminal Interface Shell (vtysh);
+		</flag>
+		<flag name="ospfapi">
+			Build OSPFAPI support
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index f97b743f9294..af44cf898aeb 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,6 +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
 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
+EBUILD gallery-dl-1.16.0.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
 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.16.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.16.0.ebuild
new file mode 100644
index 000000000000..458d0edf5edc
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.16.0.ebuild
@@ -0,0 +1,45 @@
+# 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/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index d2a65bb02f67..37f0200c106f 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-0.1.7.tar.xz 25636 BLAKE2B 00e389bc8887c3d43f9221a45c6c7154e4140fab560c5c568fe92f06794b736efcf2265c763d0d9d57d5343dd2f71b7a3a2c45b0466cdae608f0a609af53175d SHA512 dd20e5e6fd724ff03d8a32319c7145f1fef4331439e52921b812f087e6b83185bf318bb2fb9758fe083ec3cfea30448b601da4ed1aba85fa892ef7fbb794b9ed
+DIST gnome-remote-desktop-0.1.8.tar.bz2 28565 BLAKE2B 8c14200eb17503eb92c7a7db51d487f17bca7616848aa8f555d2c31a5b758b500d6bbcb78a4a75cebbe0220281079848517c58813783497b463b0a771f07229b SHA512 1e433a95c303ce82782c27412c4f4456f0ecf33eb1e63b61b11f1cde68b6113a765a0f7d7871f73af8a253f1d7b3d3d4dafd36c3e5e9fa6d6c97279747f584ab
 EBUILD gnome-remote-desktop-0.1.7.ebuild 957 BLAKE2B ec9d93ae7954028f8a9ae96ea530418845e4a8ad8b9c8357bd70ae47ce092d18cb35ee7af6dcf3ac45bf90e3c70540b8780fd2219e71257baa59650ef1c8bf57 SHA512 04bd0aab7298411081b13fe1ee96cc3b27543472776cacee50a65d94e90acbbbe5198478ad023062a6733f2fc00437dec1bc17c3512fdcfd3559ce8a8df3f27c
+EBUILD gnome-remote-desktop-0.1.8.ebuild 917 BLAKE2B 36c0cf9e37dc9442fd00876254e93ea27ea5866df69ef4c67238945c2b556de6157e1b33f306c3c21f5b436428f324b0a44554520baa98cb9f239d8a3b34c9ec SHA512 97d1c72cdc13ecf6dcdacfa2fec232449e075b3ef5d0b0d9f9e4102955194df3cfc2cd621532efd1f6c0a7de851180031945f7201b1971ddec3f15c1321733f6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild
new file mode 100644
index 000000000000..dcbc76e70e20
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=media-video/pipewire-0.3.0:0/0.3
+	sys-apps/systemd
+	net-libs/libvncserver
+	app-crypt/libsecret
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index 4e64bc2c9920..0813bf2e022d 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -1,6 +1,4 @@
-DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc07716f8ec2322f8ff60f6098b89727b6c08d8d0c810974a8f046c0487910073db3390b803802820453d9b7 SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d
 DIST ipcalc_0.42-2.debian.tar.xz 6144 BLAKE2B 7fa1e32f9c713b4f3dfa8636f9bb4b0bd70e09e3d02e71f1f2186e8e2ab381638eb33e63c24f41dfa948db11b7e877a147d22363d105ac26e98ff509d1cd0aa2 SHA512 6b7049bc5e27e22dbbca12913716757cb3f5b91d0a8f729d35a67971c763b0bea8ab65c24fe31ad43755aedb68650c1d8b3f3e770228ed6517b43e83735086ec
 DIST ipcalc_0.42.orig.tar.gz 25903 BLAKE2B 5abff0f234829ef84345645634f1b12287456c26a42cb65856f26ac12699d5f100a2ef432a6d19627f72d800e65257d46bc0edd8ec1bf4054dcdf843d2ee158f SHA512 4e67ccdbb7e42ced39ee8ac83e47585d400c1b0a26e74a909c2e29e7f2256e37b06855cc29f0272b71c5ff6bdd8252e2563ad89562cd8d04ce0fa032f6f3fb34
-EBUILD ipcalc-0.41.ebuild 527 BLAKE2B 667a37107ed4f346d4a4f7b9f9c2b909a38dd90855ed336ffe7766668bba206229a856c2aba26f6edb36e474ecb00a509fc04185f238d72cdb788d6d5f0c75f4 SHA512 10133935b6510c91944acd7ff5b43e5dfce8eda29fc7ebd46aad529537da2d2d9414ddacb0b86d7451e9bfebbc8b8eeb577dbfe7a8631d79e3cc07a7f97101d2
-EBUILD ipcalc-0.42_p2.ebuild 760 BLAKE2B 41ea2eced52303ff39d7d3414805ac3a44ba1a5047f16eb6960b7094e8f879cc71df12983702ddb0c8080e724293f13bad52c2095a393fb8cd75cb50ce906161 SHA512 bea4f5a4f01b9ce31bd42f8e5035e39cf7a0a48b7545cd3c9fdb4c00b4a5905af7d7c65c64fe96a66e4a996448a984eac9a48346941808fc9ee3549f2ae9d8d1
+EBUILD ipcalc-0.42_p2.ebuild 753 BLAKE2B 2f202b2e1203728a3f1d6f260279c2f2f6a598a027905d73e5a53808dbf28f8a0b493c1acfa9150c957ef02169dbb67dc5ae18b3fbf6901c4aa41222149b8784 SHA512 99d3cdcca4a9cbe1f6f7dca094278c6803fc7607f1b669f0b8eae2378e24e506b43d1874a615b399507b8a3bd78614d9129d0597bad81c1da4d9e162b8d2ce99
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
deleted file mode 100644
index d316b75bd459..000000000000
--- a/net-misc/ipcalc/ipcalc-0.41.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="IP Calculator prints broadcast/network/etc for an IP address and netmask"
-LICENSE="GPL-2+"
-HOMEPAGE="http://jodies.de/ipcalc"
-SRC_URI="http://jodies.de/ipcalc-archive/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-RDEPEND=">=dev-lang/perl-5.6.0"
-
-src_install() {
-	dobin ${PN}
-	dodoc changelog contributors
-}
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index bac7f1cb48fb..6a8a6b1dc40f 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
 "
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index 395837962ce2..75200bf2d171 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,5 +1,5 @@
 AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
 AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
-DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B 915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766 SHA512 17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
-EBUILD ipmiview-2.17.0.200505.ebuild 2050 BLAKE2B f7e27ae0b780324bdc6b07e065739eaad96807daecc3c296f42c21a22684233def5954dfad4d79062c48ceedc205f64ccd057f0c115e1108637fb4f04b49e00a SHA512 dad201c2af7ed264b5ef8a504720173d146dfffdb3b91db9520130a45b4fa901e84a895c0cd4939c3959cee8f9250cb32906cbf383d2c1acbbd22caaa09cf750
+DIST IPMIView_2.18.0_build.201007_bundleJRE_Linux_x64.tar.gz 108315796 BLAKE2B 5ffbe555245a6fce04bd53ad7f91f8a7aef3b645b0f9affa0aaa7fbaa221cc7259d0de2ee7bf9a3d6e79f5525190314435c4553c785c1b345030edd7b46126d8 SHA512 bda6116f59776b93c449711ad890160238b53ec93aabc669b2c5938eaee7f594e3b91a11f8c293110874fb13c2ed94692257c16fbffe7f86c1d2ee757d30b948
+EBUILD ipmiview-2.18.0.201007.ebuild 2050 BLAKE2B f7e27ae0b780324bdc6b07e065739eaad96807daecc3c296f42c21a22684233def5954dfad4d79062c48ceedc205f64ccd057f0c115e1108637fb4f04b49e00a SHA512 dad201c2af7ed264b5ef8a504720173d146dfffdb3b91db9520130a45b4fa901e84a895c0cd4939c3959cee8f9250cb32906cbf383d2c1acbbd22caaa09cf750
 MISC metadata.xml 702 BLAKE2B 094fd116b6c0d306d68106f78b867450fdb4a48b321a69f2169dac1737b6f8b93df2740e4f04b0671b61e01d872542411a22773f043ffefa8adbeb64cfc43ce3 SHA512 ee1eb3a7497345d7f7d8c55d25dd6d8f2b0353e1d785ee496cde69c2a1b386ebc96aaf70d5a70eee8d6294b5b072dfe97882254d3f42d4f69d238dde78aec6ce
diff --git a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild b/net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
index e6d9549403ff..e6d9549403ff 100644
--- a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
+++ b/net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index b06a6906d81c..0b3cffae2d33 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,5 +1,3 @@
-DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb82e6ea9b434c0901f2310161fdc504ba9ed728c942c93b21069954e0ab87319f949cd96fb135c2e4991b8cefa SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
-EBUILD keychain-2.8.1.ebuild 658 BLAKE2B cb87e182b942a54e13f39f673f72af5d025a6730eef80cc727e1d28dc1618c73bded8c51ab93ead81b2194b41cfbedd11f3676406333f4053ac9519f7d9d38c1 SHA512 817595d5e64edb26378fc3319050f655169c2bfbdb40df6d7faf9177d0e15b84068f6ec131f4dbbd3359633e7e16bd100889b79f23422ec5035f5d3233ab896f
-EBUILD keychain-2.8.5.ebuild 657 BLAKE2B 2d137854bae6eb59fefc55da476013dc164a2dd66f99284932d784cf099e141155773b16069a55f19218f12d837c31936dd2c0023e50a4d31ad3aac855ac767e SHA512 d3106e36aa8195fc7abbc7fb93f649923ab933a2ce4816b2c445d27a2fdee0edc902af92a621abb5d71532a397775da39e2764a54e6b0c16b3284761358bf080
+EBUILD keychain-2.8.5.ebuild 655 BLAKE2B 0e495a1aac5b5f30e445e475915b0dddb01e9bde809e72917192963f173c10d733eabc92efd31d8d8b36dbe68d91a28494f7fff800a4f3e8f194a4bf2ae3dd6e SHA512 e87863bac3464d9e069829211cf9a23428a69c4ff70269bd9adc5e10a6d1c19749e704d2d853d9c78bf11ca5fe6a2006f42e0570b4d277cdc04d45aad6c78644
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild
deleted file mode 100644
index a09036502f84..000000000000
--- a/net-misc/keychain/keychain-2.8.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner"
-HOMEPAGE="https://www.funtoo.org/Keychain"
-SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README.md
-}
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index 4de9af19d8cf..a33bf131577b 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/lcr/Manifest b/net-misc/lcr/Manifest
deleted file mode 100644
index 5aee612567fc..000000000000
--- a/net-misc/lcr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD lcr-9999.ebuild 1236 BLAKE2B 5d6c662fbdf4e1b65e506717056b7b8ae1da3b74a4fd9565e5cf249997cddf6b408ff13540db52c5ed2763bbe5a6e6c56cb22c16788c5cbc0806370e811980a4 SHA512 25870cb4aff0fd585e32ca746f7a2c3f13f2a2f4b81af110cce50bb12169a67fdd33887d6a9036702a724db40c3cd05701402051d5e16d04eb6579065376024d
-MISC metadata.xml 650 BLAKE2B 3677cdb22a18b446b167eb122d2a81efd44505977a23e72a87d52ec813e6efe100d9a88ce04ec8205cac80bdf0076569275346ae723ca8a8f68148f1ca449a86 SHA512 12497b4e4d2b11a3f2fe6aba4ee440419fb217a7df6a56da837384e7a4a16db7a2b62b2f88e5aef462305676081e94475fab15b43581e08136a63eb8439f7a70
diff --git a/net-misc/lcr/lcr-9999.ebuild b/net-misc/lcr/lcr-9999.ebuild
deleted file mode 100644
index 8330ca2effc7..000000000000
--- a/net-misc/lcr/lcr-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="Linux Call Router"
-HOMEPAGE="http://isdn.eversberg.eu/"
-EGIT_REPO_URI="git://git.misdn.eu/lcr.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="asterisk +ssl +gsm-bs +gsm-ms ss5 +sip gsmhr misdn"
-
-DEPEND="
-	media-libs/opencore-amr
-	asterisk? ( net-misc/asterisk )
-	ssl? ( dev-libs/openssl )
-	gsm-bs? ( net-wireless/openbsc )
-	sip? ( net-libs/sofia-sip )
-	gsm-ms? ( net-wireless/osmocom-bb )
-"
-	#mdisn? ( net-misc/misdn )
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:' "${S}"/libgsmhr/fetch_sources.py
-	eautoreconf
-}
-
-src_configure() {
-	CXXFLAGS="$CXXFLAGS -I./include" CFLAGS="$CFLAGS -I./include" econf \
-		$(use_with asterisk) \
-		$(use_with ssl) \
-		$(use_with gsm-bs) \
-		$(use_with gsm-ms) \
-		$(use_with ss5) \
-		$(use_with sip) \
-		$(use_with misdn) \
-		$(use_enable gsmhr)
-}
-
-src_compile() {
-	emake -j1
-}
-
-pkg_postinst() {
-	use gsmhr || return
-	ewarn "You have enabled the gsmhr use flag, for the GSM half-rate"
-	ewarn "codec. This is strongly discouraged, except for testing,"
-	ewarn "because of extremely high CPU usage."
-}
diff --git a/net-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
deleted file mode 100644
index b1d1e33aef3d..000000000000
--- a/net-misc/lcr/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="asterisk">net-misc/asterisk channel driver</flag>
-		<flag name="misdn">net-misc/misdn driver</flag>
-		<flag name="gsm-bs">net-wireless/openbsc driver</flag>
-		<flag name="gsm-ms">net-wireless/osmobb driver</flag>
-		<flag name="ss5">CCITT No. 5 support</flag>
-		<flag name="sip">SIP support</flag>
-		<flag name="gsmhr">Support for GSM HR codec using reference code (very slow)</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 40f1e4324a6b..2ac7989e5336 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,6 +1,4 @@
-DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b
 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e
-EBUILD libteam-1.22.ebuild 1278 BLAKE2B 760afca7072e722f981b8a492accd81ca33907389f601a6baa8b74c025c8011c69d5f2ad67d7db1682a6cc9f52edc6158d79743df2090bdd972c2563198e3420 SHA512 b041b9a44a39c69947febd1747d238cc38ebddd4ca55e2032523875d388edbf0d41744d9dab2b6c3a78d76e6c3d286e28ed98fcc325889f770f147224e0f676a
-EBUILD libteam-1.31.ebuild 1373 BLAKE2B 36c7791e28110fce03efb8e4f812c42ef8ce56d10556e27d2d4b4f1546568f4684415146ed0fee2b5c42600e5835d2b0babe1669924bb3c6e06a2985a0e26007 SHA512 eee04cd5ee120125476697b1f6e8eb1ca29f17366d2853c729e19337d1f3e78c239b2f5fb91ffa92343e8158936d710979645051361daa3b02ed006ec222009d
+EBUILD libteam-1.31.ebuild 1369 BLAKE2B ef5a6fdd4cebde91bd1fa689e5f77f5de7c91330238e39da9d0e838bbad9be729e2cf224ae2c3b06c290f9048e14e95928e11264799efa1d571bce844b7e857e SHA512 81ec2bc440cc88c3f8a6f6968e3674ff7f0df39c676982048a471bb7d009fe221d3cffd8c818e9578f0386b42f087563985beab79a1906f08f8c0987c5814f11
 EBUILD libteam-9999.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653
 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4
diff --git a/net-misc/libteam/libteam-1.22.ebuild b/net-misc/libteam/libteam-1.22.ebuild
deleted file mode 100644
index 67f37cc9413f..000000000000
--- a/net-misc/libteam/libteam-1.22.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils linux-info
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-SRC_URI="http://libteam.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4
-	dev-libs/libdaemon
-	>=dev-libs/libnl-3.2.19[utils]
-	dbus? ( sys-apps/dbus )
-	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
-RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable syslog logging)
-		$(use_enable dbus)
-		$(use_enable zmq)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	insinto /etc/dbus-1/system.d
-	doins teamd/dbus/teamd.conf
-
-	if use examples; then
-		docinto examples
-		dodoc teamd/example_configs/*
-	fi
-}
diff --git a/net-misc/libteam/libteam-1.31.ebuild b/net-misc/libteam/libteam-1.31.ebuild
index 48dbecbb6983..a009a1c3b29e 100644
--- a/net-misc/libteam/libteam-1.31.ebuild
+++ b/net-misc/libteam/libteam-1.31.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library and tools set for controlling team network device"
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 02e8f8400a44..a012cc9e7e43 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,11 +1,8 @@
 AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336bb70ba3457b3b61790e1800d453168aaed981c15776fa92353149d17c6c5eeafb70033727fb0aa838e4422d SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8
 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
-AUX minidlna-1.2.1-fno-common.patch 1209 BLAKE2B 51994c0cfafd354745ddf83fa3a134a661459bdbc9661007f1ed3e056e6b9b89a44649496f83841ee83e454b1664594d34bae3757f2af582811e2ca2c8c4a77a SHA512 67ee0b86dc639b65d912cef96c617652d349d49e32a89538c2dd7a340e58a657b471cd6155aca8656cca44599d75ca96016d29a9a8107501870e511251782384
 AUX minidlna-1.3.0-fno-common.patch 602 BLAKE2B dca6dff5dd0d2b7eafa5d58b8879d4f0f28ff8cbe7fe8d31d97a3078c5c6eecbf0462b10fb646f57ecc734e0102a9010f6f66142774f32d69d9b6a7c09b5d17c SHA512 a02c78cdac03884115f5fffc85cedf92c13687fad002a82c9497b63d394d53020bb4ab5e04e2d6a27b662b93153c6244576559a425ed67de849cecb7f7e5a9b8
-DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.2.1-r1.ebuild 2785 BLAKE2B 313911fc6b289e4912d7d431ff14ed26ccc657d298241df4229c6fb462ea7aa848e72bbfcdfaf1bd2a7c20e5617c8b6f07476c5535f65796bae430a32170b7e9 SHA512 ae59f442bac0748275b767239be6ccc216ce33bfdde623b3daadb09dce08a7825f9ad1747195cd21ae8b44c205398c2d968f7ee3074a0275f7abda3f95aa3347
-EBUILD minidlna-1.3.0.ebuild 2096 BLAKE2B 9d6f7ba17228d9e7938feced57fd436798d751015c1ab1583862d49813df801551c0532281a1636e15f8fbfee1376272825709957f6377d704b74e9f1a61f264 SHA512 c61018f7d289af8604e61f5d15cf136140796add1c831ff99bf3de497765612a1f7a2bc24d14fd5e8ae05c02256c6f0eb657250b3116fb1d266a8c1380b0bd46
+EBUILD minidlna-1.3.0.ebuild 2094 BLAKE2B ba308dfb550d7dc3ec8a12caf956d2588f8dc4a132860c5d14aeeba81b45d1dbb51bb1f0101a57786f93c6d0d32e3d75b69177efa273a1a66b592b7544d3e54d SHA512 9ad2a164f5f0734c19952ca78b68ccce5b8e32026132003d2ed2277d864ee927def4e9cd8d64ae8704ada88ff88e54ab410a8d3fb072fdc5d9be2554f414a19f
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
deleted file mode 100644
index 5cca89b52db2..000000000000
--- a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/image_utils.c
-+++ b/image_utils.c
-@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf
- 	src->pub.bytes_in_buffer = bufsize;
- }
- 
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- /* Don't exit on error like libjpeg likes to do */
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
---- a/metadata.c
-+++ b/metadata.c
-@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
- }
- 
- /* For libjpeg error handling */
--jmp_buf setjmp_buffer;
-+static jmp_buf setjmp_buffer;
- static void
- libjpeg_error_handler(j_common_ptr cinfo)
- {
---- a/tivo_utils.c
-+++ b/tivo_utils.c
-@@ -27,6 +27,7 @@
- #include <sqlite3.h>
- #include "tivo_utils.h"
- 
-+struct sqlite3PrngType sqlite3Prng;
- /* This function based on byRequest */
- char *
- decodeString(char *string, int inplace)
---- a/tivo_utils.h
-+++ b/tivo_utils.h
-@@ -30,7 +30,9 @@ struct sqlite3PrngType {
-   unsigned char isInit;          /* True if initialized */
-   unsigned char i, j;            /* State variables */
-   unsigned char s[256];          /* State variables */
--} sqlite3Prng;
-+};
-+
-+extern struct sqlite3PrngType sqlite3Prng;
- 
- char *
- decodeString(char *string, int inplace);
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
deleted file mode 100644
index 9d6ba5c94f4b..000000000000
--- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils linux-info systemd tmpfiles toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="https://sourceforge.net/projects/minidlna/"
-SRC_URI="
-	https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="elibc_musl netgear readynas zeroconf"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/flac:=
-	media-libs/libexif:=
-	media-libs/libid3tag:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	media-video/ffmpeg:0=
-	virtual/jpeg:0=
-	elibc_musl? ( sys-libs/queue-standalone )
-	zeroconf? ( net-dns/avahi:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=(
-	"${WORKDIR}"/minidlna-gentoo-artwork.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \
-		-e "/db_dir/s:/var/cache/:/var/lib/:" \
-		-i minidlna.conf || die
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--with-db-path=/var/lib/minidlna
-		--with-log-path=/var/log/minidlna
-		--enable-tivo
-		$(use_enable netgear)
-		$(use_enable readynas)
-	)
-	use zeroconf || myconf+=(
-		ac_cv_lib_avahi_client_avahi_threaded_poll_new=no
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	#bug 536532
-	dosym ../sbin/minidlnad /usr/bin/minidlna
-
-	insinto /etc
-	doins minidlna.conf
-
-	newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna
-	newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna
-	systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service
-	newtmpfiles - minidlna.conf <<-EOF
-		d /run/minidlna 0755 minidlna minidlna -
-	EOF
-
-	keepdir /var/{lib,log}/minidlna
-
-	doman minidlnad.8 minidlna.conf.5
-}
-
-pkg_preinst() {
-	local my_is_new=yes
-	[[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no
-
-	enewgroup minidlna
-	enewuser minidlna -1 -1 /var/lib/minidlna minidlna
-
-	fowners minidlna:minidlna /var/{lib,log}/minidlna
-	fperms 0750 /var/{lib,log}/minidlna
-
-	if [[ -d ${EROOT}/var/lib/minidlna && ${my_is_new} == yes ]]; then
-		# created by above enewuser command w/ wrong group
-		# and permissions
-		chown minidlna:minidlna "${EROOT}"/var/lib/minidlna || die
-		chmod 0750 "${EROOT}"/var/lib/minidlna || die
-		# if user already exists, but /var/lib/minidlna is missing
-		# rely on ${D}/var/lib/minidlna created in src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
-	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
-	elog "cache is moved to /var/lib/minidlna."
-	elog "Please edit /etc/conf.d/minidlna and file ownerships to suit your needs."
-
-	tmpfiles_process minidlna.conf
-}
diff --git a/net-misc/minidlna/minidlna-1.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0.ebuild
index c5e9ef5fa6b4..06bcef995db2 100644
--- a/net-misc/minidlna/minidlna-1.3.0.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="elibc_musl netgear readynas zeroconf"
 
 RDEPEND="
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index a803df4a5ae6..7e0e2c539b5f 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -1,9 +1,6 @@
 AUX netifrc-0.7.1-dhcpcd_args_tempfile.patch 2079 BLAKE2B 443a4a9e68b63cb85060ade03f916b827ae9708714bb6ba6beac19568b3dcab66bebfca450381c394478168c3e857ffc91b566b792a9d9b4c84d620ca94ed0b4 SHA512 04cbe1c525f0a81883c0058625a629929f1904ba97e41629f0c3ef4d1a3998daeff65b98fa37e03443159c9d9392a848f1c754499c1b2033d8f4789a2c9d14e4
 AUX netifrc-0.7.1-dhcpcd_pidfile_location.patch 1580 BLAKE2B c1fa6aeedf5964b41a0629985633085c8aef6812b6f5ce09dc9901f1687a05de5962ab14cd7ed53d0d9e200dd4f20cdf31439921185f314c27f61bada2294658 SHA512 b1134c2dc7d3b99d200d3314905446482af8dcd8cf53775978665c8ea930d04b10f36804f4d5ef1d3e020db450114800494fdbfb076ce98e76759e78d53bdb26
-DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
 DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057
-EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B fa748e43c948521df151189006cb9a45db49e1904074dcf71941aeb98aa878155dc5a0a341800c6bb27155caf4342b3fefe9a18edecd9b397244e7b293a5842a SHA512 bf1e0d20256138853b3508f2c88c67c33c14301325492542c3c7497d343c02b2a8ae0095bb0d0e4c0e33199b350429147349f231bdc2d1f1a3ad106e5fbf6a7e
-EBUILD netifrc-0.7.1-r1.ebuild 2170 BLAKE2B b22bfbaf233e1a0d3661b13a9ded17f5ff8e3eb1090ad4f40c652f64657d46ac512a5ce5790a5b2efa0c102f2e0adfce7ac7cdc3fe142b9c36e04b0d9aa39692 SHA512 ea41b89123dec35c40836ef56768357dfaf0274a786db66c594b4774a2edb85694da8c95e7396777c39e2d60d825e64e24b64494823876b8588282d1f531f670
-EBUILD netifrc-0.7.1.ebuild 2099 BLAKE2B a8469f41f1feb23313425d4f4224fe4c93a73d226667bfb2965940491b71bb9d7272a0feaf76eaf820a56b4e69c2d2975833d55aa715e5f8e9365e38c641d4d0 SHA512 4d344118f4d6878a3e6b2461ce013457b211103248b8d8945e76559300e29544012c28d087a0f2f855a8f6bff960b9cc1b99fd0216d945e228770c2c7b6196ba
+EBUILD netifrc-0.7.1-r1.ebuild 2162 BLAKE2B 0cfb264306fdbc6e395db9f7ad812bf4d641ca171b5d03a35075ae42f4088f5792d2ac8774a44e541f6bf5adcddf9638b03c3e793aac032f4385428bbf0779e6 SHA512 4704087f4945899e1e729f12f8517b9e17e9eaf626ba6ef17b28dea54702b759a41b133f49d0f6aef9e782e2a2a84b3b13ef977addb28722c3fd997f3347d2ec
 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild
deleted file mode 100644
index 032ac9cfd402..000000000000
--- a/net-misc/netifrc/netifrc-0.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-	>=sys-apps/openrc-0.15
-	!<sys-fs/udev-init-scripts-27"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
index 4fc9c170622c..41edf1341cce 100644
--- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.7.1.ebuild b/net-misc/netifrc/netifrc-0.7.1.ebuild
deleted file mode 100644
index 6e2ab1bd5d2c..000000000000
--- a/net-misc/netifrc/netifrc-0.7.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-	>=sys-apps/openrc-0.15
-	!<sys-fs/udev-init-scripts-27"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 4d9d33619a4e..82d47ecaa6d8 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -3,5 +3,5 @@ AUX netkit-telnetd-0.17-cflags-gnu_source.patch 828 BLAKE2B 947bb4a47a9e032ab896
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
-EBUILD netkit-telnetd-0.17-r12.ebuild 2502 BLAKE2B df7618f701486383af55a3185cc71ec2e7118ee542e9131db8db61b35a1368c409c74c7ed8a667efb78ac50a0ec9718e637d63a848350ecfb326ce367b9b05e8 SHA512 a01e0cf2f2a84eb0462e5ea082e426a1f9fa9b969eeb308325a3ae149ad2fcf1dd042e4913e0a1242b5416457f1c78f015c06341649417a5d20964a2727a9889
+EBUILD netkit-telnetd-0.17-r12.ebuild 2502 BLAKE2B 86e28c97d5f03e336d993aee1d3a52ca82eec6621e57c2166ff70296bf558ea27083b4334053b5a8fb89f2ce67c49af53b3d2f52938c484d66cfadd126d893a7 SHA512 a695301316abb0bbead010be0df8ee4e1078e0cb5cb66a9cdc192adace3cfd2a64273e740f1bdcbd897330e4ab049291505915e5a7832e058f6917cdff8f5410
 MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
index c2f66be105d3..defc1918c5c0 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
@@ -36,17 +36,17 @@ src_prepare() {
 	# better to just stay in sync with debian's own netkit-telnet
 	# package. Lots of bug fixes by them over time which were not in
 	# our telnetd.
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}"/debian/patches
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}/debian/patches"
 
 	# Patch: [1]
 	# after the deb patch we need to add a small patch that defines
 	# gnu source. This is needed for gcc-3.4.x (needs to be pushed
 	# back to the deb folk?)
-	eapply "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
+	eapply "${FILESDIR}/netkit-telnetd-0.17-cflags-gnu_source.patch"
 
 	# Fix portability issues.
 	sed -i \
-		-e 's/echo -n/printf %s/' \
+		-e 's@echo -n@printf %s@' \
 		configure || die
 	default
 }
@@ -58,9 +58,9 @@ src_configure() {
 	./configure --prefix=/usr || die
 
 	sed -i \
-		-e "s/-pipe -O2/${CFLAGS}/" \
-		-e "s/^\(LDFLAGS=\).*/\1${LDFLAGS}/" \
-		-e "s/-Wpointer-arith//" \
+		-e "s@-pipe -O2@${CFLAGS}@" \
+		-e "s@^\(LDFLAGS=\).*@\1${LDFLAGS}@" \
+		-e "s@-Wpointer-arith@@" \
 		MCONFIG || die
 }
 
@@ -81,9 +81,9 @@ src_install() {
 	dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
 	doman telnetlogin/telnetlogin.8
 	dodoc BUGS ChangeLog README
-	dodoc "${FILESDIR}"/net.issue.sample
+	dodoc "${FILESDIR}/net.issue.sample"
 	newdoc telnet/README README.telnet
 	newdoc telnet/TODO TODO.telnet
 	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/telnetd.xinetd telnetd
+	newins "${FILESDIR}/telnetd.xinetd" telnetd
 }
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index f597bb46749c..772da49d801f 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -8,8 +8,10 @@ DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d
 DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d
 DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517
 DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328
+DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64
 EBUILD networkmanager-1.22.10-r12.ebuild 8550 BLAKE2B 2bc90b456b46a5240e05c52a6afe59b4320d905363a3bad0ae4d0f41e3d0584d2743a76c255be198cc0dffacfd29109deb59d67749b06423e3155c1f624c9150 SHA512 00e785287a1ff4cf9260b8cb5d342ead2c1e3568095d5a7074b72df8269940a46e257b95f36a335055ec3de17de8fae527b99434253dd06d1bc04e0108b0e1f0
 EBUILD networkmanager-1.26.0-r1.ebuild 11208 BLAKE2B f69905ebe2031f6e707c9c1907e03f0c80fdb2546bec7964a9b21b3a8a6008c023a630e9cfbca5cef00ff937056d816755d62884428fc972814ac67cee755a51 SHA512 40009fa98e7a6317d87a22e8ab559e70d229bdbd0bfc91e49cfcff36f5bc551d86d16f9fdd2e52e3e2821123dd47eb4e3efb0a79d873a91d34eefcbaf9c50e2d
 EBUILD networkmanager-1.26.2-r1.ebuild 11214 BLAKE2B b9bf75442380146f2b7eb73f8022cbd30eaecb47e9f48ab96300e26471ecfa1949f076749b23604cc8c5b34264858788cf638c74221bbc5bef2d04e0f219e19d SHA512 eb92e2db85fb28e961494c6425eab2f3a03d61c4efa94d5cdbf1393b7f4d90e55b6cc958f2ec7c0079250f8a51827d42a477ec459bffaa508e6817f4ab8c0d12
-EBUILD networkmanager-1.26.4.ebuild 11359 BLAKE2B f129d1aa0f60a115786e6833fd6cfa43f7b28174fd83cf74c09db9fb69222235e2a424ea8a0993bf4ca14dd24f5e942961f2780a1fdb6806a0ead0f616a6fae7 SHA512 2568a02a564e5be9135880e6e80d587eae81fccbf1469c78830f3580da69ab02d6090a0371697919d39082da6ef50c6a35aeb1318fa7c25a1159c321767a677c
+EBUILD networkmanager-1.26.4.ebuild 11356 BLAKE2B 05fca4bb3321bdebbcda5d8ea7cdcf798ef6c084b61c072e801e474da42ab6c2845559ce481fab70b3a3a0052464fab7947160e5562a72959b96a52cc122465a SHA512 fe1e531eedaafd43bb0eda3800edfb30ebe8a44508431ecd6523637e1d38433b82dd56745d8ad627b1b78165e093a4d6197249272a0bbfb0e8ef65663fcdfe8c
+EBUILD networkmanager-1.26.6.ebuild 11359 BLAKE2B f129d1aa0f60a115786e6833fd6cfa43f7b28174fd83cf74c09db9fb69222235e2a424ea8a0993bf4ca14dd24f5e942961f2780a1fdb6806a0ead0f616a6fae7 SHA512 2568a02a564e5be9135880e6e80d587eae81fccbf1469c78830f3580da69ab02d6090a0371697919d39082da6ef50c6a35aeb1318fa7c25a1159c321767a677c
 MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/networkmanager-1.26.4.ebuild b/net-misc/networkmanager/networkmanager-1.26.4.ebuild
index 97f5b8ad96b3..1473c05de994 100644
--- a/net-misc/networkmanager/networkmanager-1.26.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.4.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/networkmanager/networkmanager-1.26.6.ebuild b/net-misc/networkmanager/networkmanager-1.26.6.ebuild
new file mode 100644
index 000000000000..97f5b8ad96b3
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.26.6.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.26.4-iwd-fixes-pr640.patch )
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index dfe76fb50596..48934221d174 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,7 +2,9 @@ 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.0.2.tar.gz 19114545 BLAKE2B a6aa041708d110fbdca082476e65ccc8fec189948aa64020a27beabe2d7b3df474ae3313b5aef0e15f3498cf974cf414eb4934417cea206b021e4e212351a088 SHA512 188f878457baba14f01ca6c0f83100bcc64feaf5e3da86903d59d8b7c553c89f88252c1410cd153952950f91429af680b1901f3f9de951bfd06a06c176d44e7d
 DIST nextcloud-client-3.0.3.tar.gz 19202718 BLAKE2B b5e09be514ede6e323e9624df38aad10969c0fdae7bc7baaeb9da4628dfa1c44a4fb6b5f6b4b83ff92b0eedbbe1ffbcf54da43d5e71923979b8649db54b05d7c SHA512 aa9e9897dae74919f11817f8aad139378a2a26df6663f3c9ee9c9e1d229b537daa9e9ed9f3ba292f8e299017f7ef5d863257a26858af159e7e76c7247d7c244d
+DIST nextcloud-client-3.1.0.tar.gz 19265221 BLAKE2B a065c1498d20b3b7ae3ca1c6b85cf81685b237a5c469aa2e01a1e0c0365c1e64db89758d7cba204035a034fb1357b7644545345fd4b98a6a88f0e5458357c206 SHA512 26c886f933fbed944b5a587dff43f3e56edfa7d36f4b0200ea1a77b0e1c28db22794ac00dbe5577d2299d733dc23c2ff7061d6a8a679bd0948431aaacd40d5f5
 EBUILD nextcloud-client-2.6.5.ebuild 1951 BLAKE2B bbb143e83a235f27cdd65c5cbbeb3b4bf40938a79e9295802f9d892609c5980ccde188d88a1b482295a40be96e856bce9e4d615dbd93cb65aefc4904924216e6 SHA512 0e1567e43e28299f27c633d7c828a1422aeea689f46422fb10a6a80ae02d4b75dec6542460d86d800fdb9c2dfcf4815a2c69575ecc5db8ff9ab3e863ab0120b6
 EBUILD nextcloud-client-3.0.2.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
 EBUILD nextcloud-client-3.0.3.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
+EBUILD nextcloud-client-3.1.0.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
 MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.1.0.ebuild
new file mode 100644
index 000000000000..a3dd780f6e5f
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.1.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 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.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	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/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	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
+	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/ofono/Manifest b/net-misc/ofono/Manifest
index 19edd1e47175..85e39b1e10b3 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -4,5 +4,5 @@ DIST ofono-1.30.tar.xz 1030428 BLAKE2B 94248b7eb7b48000333fdee38eaecf13c259adf2c
 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
 EBUILD ofono-1.30.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
-EBUILD ofono-1.31.ebuild 1641 BLAKE2B 9fc5e13784d35b164610244212e2e6db2c83be8d97ec0cad2c9f81fb3d1f017231139c1b8e938f6d94f2ce9fc1de6bded261eff9723cec3cb911b1e3702b4894 SHA512 4a78a5d43969746fb4f577b7ab42d67b14c88294dbe8eda7cad9d744bb1ecf756ac91059443868f7e7842741d4dd591293c42db0d88e9cadc6ed6ba25647f878
+EBUILD ofono-1.31.ebuild 1635 BLAKE2B 76c8b68bd663de2e0ef75eb111fd931a709c638dcd759c826dd3ecbc911873dc0efd9e6fc8845bf600ca83b7897764db938d3abab27c4036cac54b775f17bcbe SHA512 8618347d9b2609698ed832dd8428c14c498e66a747a0987a087044d8bee3b407113e381639ebf62d6f3828bb91f47d0a9c70bf773b91c1c2e9d7231f66256e93
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild
index f668af5ddef8..444df24a6f59 100644
--- a/net-misc/ofono/ofono-1.31.ebuild
+++ b/net-misc/ofono/ofono-1.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 97314019114c..bdf446390f73 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -55,5 +55,5 @@ DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f4
 EBUILD openssh-8.1_p1-r4.ebuild 16480 BLAKE2B a5e5d62c92081c5295cbbe035a83da2def0cdf22bd13da5621108d642f5537fd8c0c88849639267b0ee345c67926b6de44dd195e51bd56fdab15200eb5be7081 SHA512 a62ac99608dd98656ccf03834026af28f279eb635d7852fe2b0aea42f0d83ee0c776b63e48b14f09aa5c746ef7647ab2069edd151384ab8a2c260580ebc70873
 EBUILD openssh-8.2_p1-r7.ebuild 16906 BLAKE2B 8cd3c1a0712ebc989497e7f45b39551d07ee29928f5c64719c96cd4d1ea460259fdf437d828827954961596c4255041a65a0965db48e62b63bdf4d48c313e882 SHA512 ce10e972fa022f40ed1800eedf9f946322a993d1183a22ddd636f819da6a000594d1602a89bb4bbc7788dffce2d4a366013ac29a2ac09f1c09588ccd62965f90
 EBUILD openssh-8.3_p1-r5.ebuild 17637 BLAKE2B 53dcc07031b2379c21ad59ab66f118a048b3b2a3843ae024e473c334e4ba2975caf5756340a77a9ea7989bc040e6b3b1edddde9ecb7b3f6f1cea2e37a7406e35 SHA512 54ea55d5e87cf9beaeee2f9e8d289117200c841581ee7372eb6f0acb8c84c4d81bfc265eb7d15186494c19c3f700b87208d5a9ecbc6d41e57a0aa785239daae2
-EBUILD openssh-8.4_p1-r2.ebuild 17700 BLAKE2B faeeca3536a0640f46b7301e74737fce9e52aa9e7ac1c6715de2d0eda9f3d6cba356544da746d4bdd4c9f2c73758b20dd74bf9849f036218489deb75cd6b6105 SHA512 8bb9056d40334598037a9053c610cbd618f89adf2133012e8d0bb65f2497195c375815ea94deb1c1f9605e820003ffb25d968e64c23fa608370175de15d5c926
+EBUILD openssh-8.4_p1-r2.ebuild 17719 BLAKE2B feb6c19e23a349ec91fbaf67100ce7082ecc301cc42ec3bde1c261faf9dabe5c73909c6f5995f5014310a37ebce9450f6c0cbdc93a3303faa5a16701189f04f1 SHA512 24171029f311b15f4a10207300d997dc80b3105bed039aaf45e042f684fd5cdf3f14884b9e8ac76d2599174596fbb42ad20efd4bebdce7142bc8502e71c3588c
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
index 4122763052b2..b2de02f38d42 100644
--- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
@@ -85,7 +85,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/os-headers
-	kernel_linux? ( >=sys-kernel/linux-headers-5.1 )
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
 	static? ( ${LIB_DEPEND} )
 "
 RDEPEND="${RDEPEND}
diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
index d49e3ef4d45d..8892b530d409 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -1,12 +1,5 @@
-AUX packETH-1.7.3-libs-and-flags.patch 241 BLAKE2B a3818b1a8d59b17356ad1bb5efa6ed8655e6bc9dd88002dda83a02034db61afc2e054a0c6fe0cd623abc7ea3b478e97e379e0afc1013c63e417757f3dd6a51b9 SHA512 ec4daf8f0b13fe65273ccfa92237f9578fba332516ffba5b55e60b4c2888f8f620b93de28449dbca02da9fe0b106023d5ba2623cd2f73c142680d3e4894443b1
 AUX packETH-1.8.1-libs-and-flags.patch 249 BLAKE2B 039c2c8329ad4ba7dde845c34c1de353a5e6e3ac82629675d8f183295946572eabc13da376775c4759e5b00d026efd4ee2b415f61c2da96acda67f44e857630f SHA512 2db5774cf4a3747a2f06cda925269929fdf6895557206c5bd02356de57d85b8868b850494a544089c3b1334f150e729070f652206ec0bd690cecd7adbc68c570
 AUX packETH-2.1-fno-common.patch 1050 BLAKE2B 37b96926309c9ee1fa9654941f0f18b9edebea98397128e32550601f7e0a75068c5eca6ae7c5498c99601703519016967e5aeb6614b0237251097fad256ee9bd SHA512 1f51f5746e2fb9405b11e6b64e0e30ba426459d892f3f60e62c879f8ff0276167ab37f630e828b3648e04774aeca9e716962bc936ca5b6d497a6b87d0dad4fd9
-DIST packETH-1.7.3.tar.gz 395666 BLAKE2B e3ca7e727900a85cf3a8fa1e88b2763cecb6d284342e123932f5d19ae1c324d93045372386026940e4b1eeefa71ee52b380a5aab5eeab1aab70cf749a8626bf4 SHA512 349fd579bbbbbbbe2ca96374c8083ecf047a1c5f51626341bd7f98b4c8a29b74342311e45950a3f2628ba53dba250135c3802556b6aa5c49181e72313a7256d5
-DIST packETH-1.8.1.tar.bz2 321624 BLAKE2B 3360240cde8c3dea41ea0e226cd648dc4599b5e838281a3d6b731c6d095a1d0db32373fd20096a16fd04390cc5bed11e94d05789b9ad7c97a79d2df6c0e3fcc2 SHA512 caca26d3a0e9a175cdcaccc21f8d0038fd4c3dc0939b52ae6e16109d0e42b882b4de95524d35bfe7bafc131203ba23aac5f3baf825b2c55ab18022edadb04a4d
-DIST packETH-1.9.tar.bz2 450837 BLAKE2B 38eee3092be49ffffe7af23c30059d723e566d572c6a8dda6af5b44e8bc5b3c17d76cdccbdb4b4664ac245e1e7a41eb43e49eafc09a7e56b3f9d1ded93ba9239 SHA512 f322130a5981412f109555c52f9ae0b1c92e4f2a4c9a0ec2a62abeef368ade1ef08d5152724a6351fd626ef1dee4b5b98a61b250efd2391e4d61976d4ae4c50d
 DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd7745eac0f16fbd515c6b5f72c7b9f7575fd215a3a1d0b69d6ae1f08427e5d145abbc83b9cbfeb6c6657d28b35 SHA512 55be4a2eb517c1d040664ea1a16d59dab20b06edbbd073cbf709deb4dfcec8d8eb12b88dfbd578f9bdb0ca614036ac4bbb00be6f865b774da2aa62ce8d3d767e
-EBUILD packETH-1.7.3.ebuild 560 BLAKE2B 27a2ace9442a787bd95f72e6714ad49a92c73d630ff3920b1052fac4689a51bcc90ea51511e672688174b24fe36fc2a1bf682a99085905cec06c5718e45a011d SHA512 c07a137b43016c4b8f7ba290e1e639324bf3e637212ec6a58f2e9c883998eec0a90f92c1532763a0445c90aba79182bef1669cf3d87ea9c97f4651d70e85440e
-EBUILD packETH-1.8.1.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
-EBUILD packETH-1.9.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
-EBUILD packETH-2.1.ebuild 1057 BLAKE2B 258ad14950f81de4baaeb54e0b3a5257aaa32a30503c59c78dcd0cbd842b7c2073af9f60ac7a7e7b81ece454e8acafabcbc5252d2c90e64af042a7b09febd054 SHA512 028f717ed52e7f7843fa3e3b2cbbcd8ddd6faabdd88154412d2a75c9a9fb9af06d68371da13bd52bf90947172671c1701b70c0c7d07cd00ad60ec5d7d8212150
+EBUILD packETH-2.1.ebuild 1056 BLAKE2B 27137a90eae39926a4fe2692047b440e26032fda032ac0f16e1c76a718ca9bdf97c8db38849c4ffcd462846125114d08c8683fa5db8022cb476d01c8beae84a2 SHA512 976cad3aaf4c1bdfc15ac71bb4e6e3e57658c121e547687d40f1cd073eb1484bbdd52b3a64e0948acff9e0f67a0e26409f0fae83506587fdaf86c9585c8de4b2
 MISC metadata.xml 413 BLAKE2B 8d0f984cc4740f606b9dd7633dc126f2dc57a7f07930a8a6f554e254df9f54eee1405179f61b14dec8ecf02bcd13019575c55abeccf404011b97b9aacdd4d7e3 SHA512 5dd67301ca215d9f3d0695d530e137cadec338c90996c0119deea631ac1d3a2219320229556b265fda561e02aba43d9cdf2169725559f95dc40de15951fa6adb
diff --git a/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch b/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch
deleted file mode 100644
index fc0efb7e309a..000000000000
--- a/net-misc/packETH/files/packETH-1.7.3-libs-and-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -30,11 +30,9 @@
- DEFS= \
-   -DPKGDATADIR=\"$(pkgdatadir)/\"
- 
--LIBS=$(DEPS_LIBS)
-+LIBS+=$(DEPS_LIBS)
- 
- AM_CPPFLAGS = \
--  -g \
--  -O2 \
-   -Wall \
-   -Wmissing-prototypes \
-   -Wmissing-declarations \
diff --git a/net-misc/packETH/packETH-1.7.3.ebuild b/net-misc/packETH/packETH-1.7.3.ebuild
deleted file mode 100644
index f02957b48ad9..000000000000
--- a/net-misc/packETH/packETH-1.7.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Packet generator tool for ethernet"
-HOMEPAGE="http://packeth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/packeth/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libs-and-flags.patch
-	eautoreconf
-}
diff --git a/net-misc/packETH/packETH-1.8.1.ebuild b/net-misc/packETH/packETH-1.8.1.ebuild
deleted file mode 100644
index e8027e732b99..000000000000
--- a/net-misc/packETH/packETH-1.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Packet generator tool for ethernet"
-HOMEPAGE="http://packeth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/packeth/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch
-)
-
-DOCS=( AUTHORS CHANGELOG README )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/net-misc/packETH/packETH-1.9.ebuild b/net-misc/packETH/packETH-1.9.ebuild
deleted file mode 100644
index e8027e732b99..000000000000
--- a/net-misc/packETH/packETH-1.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Packet generator tool for ethernet"
-HOMEPAGE="http://packeth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/packeth/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch
-)
-
-DOCS=( AUTHORS CHANGELOG README )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/net-misc/packETH/packETH-2.1.ebuild b/net-misc/packETH/packETH-2.1.ebuild
index 83d236e26bd6..1d4deb15c02e 100644
--- a/net-misc/packETH/packETH-2.1.ebuild
+++ b/net-misc/packETH/packETH-2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cli +gtk"
 REQUIRED_USE="
 	|| ( cli gtk )
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
index 6ddd05fe909c..5c81c91a48ad 100644
--- a/net-misc/pipes/Manifest
+++ b/net-misc/pipes/Manifest
@@ -1,5 +1,4 @@
 AUX pipes-1.16.1-execlp.patch 603 BLAKE2B fb36b8f00c05b8f0fef930757da458d1f571ecda4487cf5641417d9a79548e28212c1a12599b69a068d55a2e5cb991de0c37b787e13516965122e949bac5db40 SHA512 ad28dab392c962fc476ca6596a0609dbee2a3f6300b27daaaae5b5e44c3c94154b682bc749697be20373b530b228d45170193e085e96bbcbfeff7190746767d7
 DIST pipes-1.16.1.tar.bz2 21642 BLAKE2B c5725244f7ac0b77ff3ac3d753ff96ac7d853cd1e7cb0ab82a14decc6ad6ec94503426be712e1b9117a6e95a95939c5d9e91d9f31eb397c96182fac8f7148100 SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3
-EBUILD pipes-1.16.1-r1.ebuild 653 BLAKE2B c85189119d410fc1a6ccb8a1cb8d6e0334c78de0f4860542322b52ffdbdf83b6ce95424d6b61c95100b859aacba6915dd65bc9249de95a0b85363da28d1c13c4 SHA512 7ca3efd197ecc1178046d8cd0266df1ac657f8d123ffcb242d89e1b631de441ac466b9766e5712f2479d2567c18bd0bb85f939b711d19dedb9af733d80cb5d5f
-EBUILD pipes-1.16.1.ebuild 651 BLAKE2B 1d3813f820580d35973a0e894fe5292f8f306e8290ed46b76b43abbfb09b4e258250d658d6daa28f5c8814c867830f9d99834d0cce1b0d2a643c5847c36ae5c6 SHA512 4bcb6448d66a00fc8fc2148100dd08608faef613208036272eb8e412592496da13887a15251694d9626a9149b0b7820f08a9a1d5cdbaa41e6c207a02422032f0
+EBUILD pipes-1.16.1-r1.ebuild 650 BLAKE2B 39fa97f601bac7358a6414f15026efb556c6cb42f7f92d864a6ba12575656c8e312243a537100dd3ac635d06f85d0fb5a5766723c15965df7f4118303c1765f9 SHA512 468e549147fee025b2e766ef3bdeba1bffe7c9075e9c2ef5cf4b1a1d1c749b9071a0c541c62eef7de039da5d9bbe322141ae6d0c3200f7ca9cae918e00f9d5a2
 MISC metadata.xml 1243 BLAKE2B 018079999961b4720d9f6999852b0c6d90ed32d08ac9a2084659d35ccccfd9db602a5ea6540928e1dbf0f942ea06f9cc9358231a0d041eea5aa8620f6a61079b SHA512 64f85cdfbd01bc948cc78a5b0a7816d45583c861cc45144ff0b4547b704516a5151d18b19a99be58ad666f3dcbcd866c215e5a24c237c7b97a35e689841316e0
diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild
index 1e29bc9099ee..d876994479fb 100644
--- a/net-misc/pipes/pipes-1.16.1-r1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 x86"
+KEYWORDS="amd64 ppc s390 x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-execlp.patch
 )
diff --git a/net-misc/pipes/pipes-1.16.1.ebuild b/net-misc/pipes/pipes-1.16.1.ebuild
deleted file mode 100644
index 99191300b44d..000000000000
--- a/net-misc/pipes/pipes-1.16.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very versatile TCP pipes"
-HOMEPAGE="https://bisqwit.iki.fi/source/pipes.html"
-SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 x86"
-
-src_prepare() {
-	# Prevent the build system from looking for dependencies
-	touch .depend || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin plis
-	dosym /usr/bin/plis /usr/bin/pcon
-	dodoc Examples ChangeLog
-	dohtml README.html
-}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 3772b1900e3c..0617a6a11de2 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,5 @@
 DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.74.ebuild 1683 BLAKE2B f2e694377eaa8ae5dad4c136ce82ea3a1f8707bef3b9a7527228a2b49c382e2ade8e2215ea1d93a0bafd74fff4360369578a8eb85af94157cb90bc3352b67bb0 SHA512 2fde3aaa7af3b725e5d61deb410f26e32dc7230b11ec524e8ed768543bb69691d623a7e10ba97f2df59cabf4c26bd823c7800ee9c705a5fd5312454d311c7243
+EBUILD putty-0.74.ebuild 1690 BLAKE2B 977b5a33f2e5e855fd52602002ca5e540ff18cb95d73e264887e354621982dc49bf1d9b9d0d43da2c92a68a4223a4ca370ab8322552e31f435d1247f64c07cb2 SHA512 e2887b4c2fb1b36e5687a290d0adec2670f09e4bae6545964e953697a1fc297c8d61f0cdff91fb0f9871b139be65af7178ba139d6b803a9328082f65a52f9172
 EBUILD putty-9999.ebuild 1737 BLAKE2B 7e09d4cbf3e219f2452f535ef15a1733c77b72fedf8336968b88cb4adbc6e7ab13fb4dd3bfea9150a23198d1e5d649a1a099d65da0263e8942f39ea02001e1ad SHA512 30577a60f28a9ef6fcb6e763a93d4ce624d4ba23708181eef42d8c20afc303f1c42af598808957caa80759a40d02c294eb19b16eea369ff801ef57b74d00fbe4
 MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
index 518c228a1d8c..359b634424a6 100644
--- a/net-misc/putty/putty-0.74.ebuild
+++ b/net-misc/putty/putty-0.74.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ppc ppc64 sparc x86"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index e7ea3e46b179..b8d89bfecd6f 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,8 +1,4 @@
 AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe156186643c9639c7e30a5f03716b257c357e1f7b090792594025ba0525763a93b481a992822a8cc251c4332 SHA512 e50734adbd76627bccb4f0f08d6d1a3042a72fc7a836aac049c897ce9d7f37c41a0d0f7da1fc158d1ae8c14329ff2967687420bae0c72f7ebf9845f795d24aba
-DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a
-DIST r8168-8.048.02.tar.bz2 109232 BLAKE2B 24c04cd0e47fce427ef7de1a2e41e384fd7c0d8dd028715411cc6f47901b703c824dd9c15bc0ed90f649520bd5fd25dbd48cdc37f94ca8f838a07faa99c8aa84 SHA512 d9d828e4717d2857bd38e8c9b9005de19387419db9bc8d174f5c8a8ea120c81c3094770b164a1f92cec7833696d7a1302332ef473c5852146fff5dbf9a69196e
 DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f
-EBUILD r8168-8.048.00-r1.ebuild 923 BLAKE2B b91f9d551f38d5fb82e480e0ebd299de9dcbb9671897c1c17d3a682ea6c70b79c7e26b41b7daa092c76a2d53c2d819e029afb0ab7de32e0128110a24525c4c25 SHA512 d0972fb69d9c97d5e5cb845d7dd124d8c48ba789e157575298a750656976c06655b3ace2d858d45f457adbca6d20e085f89092d4491aa49996f7d18a7cf30a76
-EBUILD r8168-8.048.02-r1.ebuild 966 BLAKE2B 5de1e783e73c113f06735475035d7cb61918ef6a0522a970d9c3f01d48ce9e6519d136cf9f1ce7a13543a3f73eb82905008f5497323c82bd6b80317754a9688c SHA512 d092a193b6ee1faed1ed99d21e8a268717078c47700a8033e29241259b303a6f3441aecf03b56727569779c4a3f71528545aa01dc99746164090cb757bc7362d
 EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750
 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
diff --git a/net-misc/r8168/r8168-8.048.00-r1.ebuild b/net-misc/r8168/r8168-8.048.00-r1.ebuild
deleted file mode 100644
index 3d0aad6e797e..000000000000
--- a/net-misc/r8168/r8168-8.048.00-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link,
-# we need to mirror it to avoid users from needing to fill a captcha to
-# download
-SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-
-CONFIG_CHECK="!R8169"
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
-}
diff --git a/net-misc/r8168/r8168-8.048.02-r1.ebuild b/net-misc/r8168/r8168-8.048.02-r1.ebuild
deleted file mode 100644
index 2496884f96e0..000000000000
--- a/net-misc/r8168/r8168-8.048.02-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
-# we need to mirror it to avoid users from needing to fill a captcha to
-# download
-SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-
-CONFIG_CHECK="!R8169"
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
-
-PATCHES=( "${FILESDIR}/kernel56.patch" )
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
-}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index e456983afcd0..e1ebf6df04ae 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,6 +1,8 @@
 AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d030c4b26c05b0758d9669d6f29311ee4c3273374addd92c2e191cb86c91dbce7ebb7681ebec46462986696c746e0dcd03ec SHA512 7a4c09378238a675e76eadeaa29215d32ea5f6afa618bdb60569b30ed9fba0dcbf7ae7cf3a1de47a05d25c5b61a3bd14313930dc02967477c20e212483af1e59
+DIST Remmina-v1.4.10.tar.gz 2072202 BLAKE2B 38b6a3cca9b5956a252d4d4433910d46d0d36a2232a2a107b1e556f118f3b1a6d3c02b0bea26a39a52d572c1380dbb5bdac1acd8d6ba07c97b9acc9a64a9142f SHA512 89fed0b0ed17ac1db57a1d9ad33b80f4d17f6cfb4ff7db9b6434d9d4dabf708971e4d93dd573dbf606d1899311e564f159a656223d66bc4a9d7a15a29b5b5963
 DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf
 DIST Remmina-v1.4.9.tar.gz 2033555 BLAKE2B 901e0118f8231a6bf021a0389a1db9462f19527b21954f3deba24e92e3c04d0d323efa3aeb475f0ec915e8cdc4b55cf331ba2010598e8a58567cba0f353b5177 SHA512 21c5141619874a3d90fd1e2ee9ae87dd4ca4b7dc14c0e16f06bca01b38f84db6e7ab178b0f6e9db703bf5d1ddcb17db45553786bb047cf814b1ff67f4aa6139f
+EBUILD remmina-1.4.10.ebuild 2502 BLAKE2B 66c4daec9382a3a677d37da07e8fe95e97295176549cb0033a22ce478525055534db4d8975ddd63b53c8c15b3b45503800791c9a1e2fd215e3c2c86bfa2f4901 SHA512 46f68da358de3e4a8887f5cbfb4dd9ac8aa1feac3ef00f0895abe7452967c2b4829d80a36c67fce5c814dab17a54efb1d66602b713dd1e90a8b5f1ee1b538346
 EBUILD remmina-1.4.8-r1.ebuild 2493 BLAKE2B 444297b0607ae73a1a8868ddb5c5af4c58484adc944ad29d2c983b70c5ca482e20a7782d4681b59330183c074acc4d138517eb6e5bf702d5e2daa361ca96d2fa SHA512 95a1c2cf34f5039268cc58afbc36e6bc872f740a1ec2465ef95aa4c703b1592fd89ff86d7b1ef817ac184ac0b6202585f96bfab5e7a53c35b3018cc6f8a72b82
-EBUILD remmina-1.4.9.ebuild 2495 BLAKE2B eb98f41f1abc9e1ad47cd576a60b68b97f43dfbb57a3cf5d10354cf4cbfbf0e720b7d9eeca14bf22182461f63b2fbae185c85a96ebfd35f86ae51ff721729668 SHA512 0b860aaaf18815fcfd10293f14810c9948fea66636b1360bafce7a5335a239527b84a70aa70339fe54b46391a0fdf06a1e61b2284b141b667e5b733ab84f325f
+EBUILD remmina-1.4.9.ebuild 2502 BLAKE2B 66c4daec9382a3a677d37da07e8fe95e97295176549cb0033a22ce478525055534db4d8975ddd63b53c8c15b3b45503800791c9a1e2fd215e3c2c86bfa2f4901 SHA512 46f68da358de3e4a8887f5cbfb4dd9ac8aa1feac3ef00f0895abe7452967c2b4829d80a36c67fce5c814dab17a54efb1d66602b713dd1e90a8b5f1ee1b538346
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.4.10.ebuild b/net-misc/remmina/remmina-1.4.10.ebuild
new file mode 100644
index 000000000000..9a2ee2547ae8
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.10.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 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="
+	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_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
+	)
+	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/remmina/remmina-1.4.9.ebuild b/net-misc/remmina/remmina-1.4.9.ebuild
index 518563f4af8c..9a2ee2547ae8 100644
--- a/net-misc/remmina/remmina-1.4.9.ebuild
+++ b/net-misc/remmina/remmina-1.4.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
 
 DEPEND="
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 139c836a78cd..56d935f58a69 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,3 +1,3 @@
 DIST sipcalc-1.1.6.tar.gz 117628 BLAKE2B 6da2a64f63ac9a4a53a588f8d82cfca230ba0f97893d89310ea0d83a8d6cc6b6a4c53fa1dc7ed9ac20b6bd8cc39e479c3b5d35658c58069e561b55d841e3a3ee SHA512 9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e
-EBUILD sipcalc-1.1.6.ebuild 398 BLAKE2B 03f71fe5971a25ea4f8c44f7241df229b79bfd964796ff92918318b48219720e36619a8ca7be2fef6930f8251ac42ff817404ae3a46baa79e95d5707399dc40f SHA512 9783c1ccf449eec4bfda253c0576184a1965f15e036dc0ac3621ec6537aea35adde6eb274cdfc1aeebdb1d529789cc7fce09dde5e63b714d80bfd63d8d8a0a00
+EBUILD sipcalc-1.1.6.ebuild 402 BLAKE2B 272048d2c85f633f5dbc0fb312ccd0f9f7ef0849e481037645b442a1fb2abb65197291bc369c9e49f23d95de5731dea30c647216741db71804072ff15b7c36c4 SHA512 3e414711f989835aad58ab3b50ff2be2fdeeba926e6ea7821d9b31efbede7dc64bc26e6936f7581a2fe6ef01cdfe1d48ef9db982123e415f6effbae751cadcec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/sipcalc/sipcalc-1.1.6.ebuild b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
index d9861b9af859..25bc9b8a9cd2 100644
--- a/net-misc/sipcalc/sipcalc-1.1.6.ebuild
+++ b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ HOMEPAGE="http://www.routemeister.net/projects/sipcalc/"
 SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/net-misc/srf-ip-conn-srv/Manifest b/net-misc/srf-ip-conn-srv/Manifest
deleted file mode 100644
index d85ef1ca5d85..000000000000
--- a/net-misc/srf-ip-conn-srv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX srf-ip-conn-srv 162 BLAKE2B 88d3a39843f4d0fea05c5d37a6e23c17e001b833e47f7a3aa5b51616d65f812e92e39b2f67ac73c09308835f36ef1f96ebf23cc27f21adaf6ca338600268cb64 SHA512 7a5d2fe94f89c06ae54e01a532bc57735d39a0a620d11a536a5f27ae0912a017661b4e5928ceb3f4a63e49d155592cb763043a6a53f270810b15bc0f22074e41
-DIST jsmn-35086597a72d.tar.gz 11056 BLAKE2B 12db2b739b910602ecef6b2417443275b10eae7baf746d77e017a5c568417e8a013531af1666d5ec7a26bb25a45d78505afea1681508964b82c8c08c5101d4da SHA512 0cec27867f3ffd39ae1040e5236b7710a0e1b31fd184da6b56aed3995379da64907dc00aa01692f244ed5ea59ec995d62bacfd3a130bd1dd59724405f24560bd
-DIST srf-ip-conn-140c9b8a8619.tar.gz 112882 BLAKE2B fd368385d5a2e54ee7d7f7aed1149120ad9249702fc0b9db9eb415adcb5da65191b23776e23d337764baad1bbdb500993f8c5590da77f33900a549cf291c3219 SHA512 6f6e6fbc1b3d17fb36ef48c530756d2c4b2bee0a0e9016355ca57ac7124ca2b18c845110d40818673b200a3700b92f6b40664d157a158979705146aad579186b
-EBUILD srf-ip-conn-srv-9999.ebuild 1703 BLAKE2B 721ad8f7d682fc7a44b58a31eeeef59c8b553aebad2d4fb428d0bbe8ca6d52895b232a51b7f0d8ae05c9099f632f9b2a29652c5b6e73da91a561b21afdd6a3af SHA512 557704ae6a2831103de64197fc63d1e45cb532501b84e95261129855f09cf3fe6bad57b85fa7a4b33ce3f1456c6737a9123c2697929632a1600dc4850519ca87
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv b/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
deleted file mode 100644
index 4bc3f9d30f33..000000000000
--- a/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [[ "$*" == *-c* ]]; then
-  /usr/bin/srf-ip-conn-srv-target "$@"
-else
-  /usr/bin/srf-ip-conn-srv-target -c /etc/srf-ip-conn-srv/config.json "$@"
-fi
diff --git a/net-misc/srf-ip-conn-srv/metadata.xml b/net-misc/srf-ip-conn-srv/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-misc/srf-ip-conn-srv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
deleted file mode 100644
index f92e83711ca8..000000000000
--- a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot git-r3 cmake-utils
-
-DESCRIPTION="SharkRF IP Connector Protocol server"
-HOMEPAGE="https://github.com/sharkrf/srf-ip-conn-srv"
-srfipcon="srf-ip-conn-140c9b8a8619"
-jsmn="jsmn-35086597a72d"
-SRC_URI="https://github.com/sharkrf/srf-ip-conn/archive/140c9b8a86193b8f345c9e113691113310859ff8.tar.gz -> ${srfipcon}.tar.gz
-		https://github.com/zserge/jsmn/archive/35086597a72d94d8393e6a90b96e553d714085bd.tar.gz -> ${jsmn}.tar.gz"
-EGIT_REPO_URI="https://github.com/sharkrf/srf-ip-conn-srv.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/build"
-
-CMAKE_IN_SOURCE_BUILD=true
-
-src_unpack() {
-	vcs-snapshot_src_unpack ${A}
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	#set needed paths
-	sed -i "s#\$ENV{JSMN_PATH}#${WORKDIR}/${jsmn}#" CMakeLists.txt
-	sed -i "s#\$ENV{SRF_IP_CONN_PATH}#${WORKDIR}/${srfipcon}#" CMakeLists.txt
-
-	#set cflags/ldflags
-	sed -i "s#-O4#${CFLAGS}#" CMakeLists.txt
-	sed -i "s#CMAKE_EXE_LINKER_FLAGS_RELEASE \"\"#CMAKE_EXE_LINKER_FLAGS_RELEASE \"${LDFLAGS}\"#" CMakeLists.txt
-
-	#be in a sane directory for eapply_user
-	cd "${WORKDIR}/${P}"
-	eapply_user
-}
-
-src_install() {
-	#add a default banned list to edit
-	sed -i 's#"banlist-file": ""#"banlist-file":"/etc/srf-ip-conn-srv/banlist.json"#' "${WORKDIR}/${P}/config-example.json"
-	echo "{}" > "${ED}/etc/srf-ip-conn-srv/banlist.json"
-
-	insinto /etc/srf-ip-conn-srv
-	doins "${WORKDIR}/${P}/banlist-example.json"
-	newins "${WORKDIR}/${P}/config-example.json" config.json
-	newbin Release/srf-ip-conn-srv srf-ip-conn-srv-target
-
-	dobin "${FILESDIR}/srf-ip-conn-srv"
-}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 7005643be507..ae230f42c48d 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,6 +1,6 @@
 DIST streamlink-1.3.0.tar.gz 694190 BLAKE2B cd262290cd81f1954567e217eaf9568c00180ee7f6955c8227b7067488d685385fe8b4b3bcd6004e7e8f7f66236696a48e744cb24c4d00f2111f00633ffeb1bf SHA512 5a114e0b1e617b2a41f8fe00f9bd6846843dd7643b4283d2fe30ea869cc9d6f495458b0ddb97955a87b7ad64e5628343262af5068b8a7a19d0d84a32020b3365
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
 EBUILD streamlink-1.3.0-r2.ebuild 2058 BLAKE2B 59e8674d7cd8626c7720370a626ea3da8f0d85d9629aebc842aff2cbcc929d4e39c0c3b24081bf5f18b43d635381034d3bff82fa049c98f16b90bb7c2af6f0a6 SHA512 a9577b8586ec067701d9cc70598022fce711ec134e9ff4b269f1a7a850ee3f0964e277053b96e0f6716247aa73a05b6eb6db4b1bc8963f83e8668e265e6a6553
-EBUILD streamlink-1.3.1-r1.ebuild 2058 BLAKE2B 59e8674d7cd8626c7720370a626ea3da8f0d85d9629aebc842aff2cbcc929d4e39c0c3b24081bf5f18b43d635381034d3bff82fa049c98f16b90bb7c2af6f0a6 SHA512 a9577b8586ec067701d9cc70598022fce711ec134e9ff4b269f1a7a850ee3f0964e277053b96e0f6716247aa73a05b6eb6db4b1bc8963f83e8668e265e6a6553
-EBUILD streamlink-9999.ebuild 2058 BLAKE2B 59e8674d7cd8626c7720370a626ea3da8f0d85d9629aebc842aff2cbcc929d4e39c0c3b24081bf5f18b43d635381034d3bff82fa049c98f16b90bb7c2af6f0a6 SHA512 a9577b8586ec067701d9cc70598022fce711ec134e9ff4b269f1a7a850ee3f0964e277053b96e0f6716247aa73a05b6eb6db4b1bc8963f83e8668e265e6a6553
+EBUILD streamlink-1.3.1-r1.ebuild 2060 BLAKE2B d8c5a8929e7996b0ba791ca114409d882dc236f1a5c2346dcddc14566d25534bd790f9d6f3d2227b62442f635908161fd9ade62ee539500555b78ad6098c35b6 SHA512 7dd52874f571b4c22901a9b39faadf534deb019d7c83385a9897c1fa583c848faca60d2e36c5eacb8d25663090bf995d91d81e25ce6474523bd540fda42e3e57
+EBUILD streamlink-9999.ebuild 2060 BLAKE2B d8c5a8929e7996b0ba791ca114409d882dc236f1a5c2346dcddc14566d25534bd790f9d6f3d2227b62442f635908161fd9ade62ee539500555b78ad6098c35b6 SHA512 7dd52874f571b4c22901a9b39faadf534deb019d7c83385a9897c1fa583c848faca60d2e36c5eacb8d25663090bf995d91d81e25ce6474523bd540fda42e3e57
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
index 6f6674f9723b..e1b66ef0065e 100644
--- a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 6f6674f9723b..e1b66ef0065e 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
index 7b6b21198e9c..7f0760dbcfab 100644
--- a/net-misc/ucarp/Manifest
+++ b/net-misc/ucarp/Manifest
@@ -1,3 +1,4 @@
+AUX ucarp-1.5.2-fno-common.patch 232 BLAKE2B 62939993a6a896188d951c2873188ac6c8a1c83dfa435302aae4d0fee4982b08e65562d4e39a93e0f94bf8b273a6b3dda8925662309210e648a722f6627a47a8 SHA512 8ac343fa03be28a798d5575243ab9622653b508667f05dcfcd1a96b32e4003fe01f80eebb0afadfec2674baf6f96ff6323f34e9d09730aab1c526da37725a4f9
 AUX ucarp.8 6311 BLAKE2B 1b01047eff2fbdf6deb8d3886fcb19d3512d2bb21518007d2bb578653d8a602ff8767f67a04119edd8c159c3430bf63a70d891610cd159853712bc3ef538762e SHA512 4aab5f072663501e90a504e47e30c7cf3a89c6996addb6a23c7d0b3688688141f90d6134c79d2746fef1934a63588723bafb375777b2a12a6715257681baf28f
 AUX ucarp.confd 880 BLAKE2B 134b87a7adfcd4c64a140f5c74d6d318a7205f68f436538a7f638382541876ec274c3e596cd086ed9e07e20586a899a67c6413e2e6a9c1653bcca57dcc949bbc SHA512 e72594f6292dcc4e17c13c07f12d5cd9ef791ea91ee2c22d5023d0aa574990b6ec6c6714dc45d678ba70ec8395790cd80272a8a57adbd8c735f296e580a298a1
 AUX ucarp.initd-r1 1902 BLAKE2B 05b7ba252938cd5f8c668c5593250376d0390f2eeade13c9d6801522b39027a4724b3e0e142128a5dbca6fef5e82adfeb914a8420c3c9a924000e287fdda298f SHA512 6e5a7a1ec245c6c89ce61b189768594a42b630b94d882f79357475a62f63b3198c036f1cdbc09a91b3d3509d6f6b0c621b56f107dbfca76fecf79fae3e0a66db
@@ -8,5 +9,5 @@ AUX vip-up-default.sh 132 BLAKE2B 01d0976bc4029250a481ad22db0432b62604030ed2d6d3
 AUX vip-up-default.sh-r1 131 BLAKE2B b0067bf6a9c442fe536564fc50f589be00caf7dbacfe1bb2370d467a5f5e706a548bfb5db8d2f5d21bf946ab543e0a2f84c74d07d737772c70713c583ec551a1 SHA512 d00a2acaa44567f936e029af96a841bf815b75e18f5d2563800e996acdea68ef3265e7ea7b67e7cba3fe671e7809ec905e9cc39ad5fe2c807170cfa1fa6595ff
 DIST ucarp-1.5.2.tar.gz 429089 BLAKE2B 2e30b5c2f1f4e51662e9dab0e3b32eae636fbaeb533df2c8753dd1df8199101aa75b146bda1035fd77b0d209617eb9eb1d3a8b2fc4bd5089e6c1478c4a821ef8 SHA512 568ff2061e59d314c72a160ccb42eb099bf7cdf04bc30f405b5b62322dff3ceb4fa037c2b430fdb4cee25f0dcacf9309a15bd814b4b70b640840400bda20b253
 EBUILD ucarp-1.5.2-r3.ebuild 1247 BLAKE2B 067f4cab17d51e15ffc2abd8407450ded183e6e6ac7d82af3994b0b1ebea0f0da3e3ef25ed2b954cb07379a2249ee050b62913493821bfd3c97c7785740589d1 SHA512 66ab66b2db551c97bee096a2f1d81767c10e6beb96c2268504db219c2b01b4edae118c82ca04c3fa2d153d486673ab108caba5ff43d5168530f9a5a0eea75bc4
-EBUILD ucarp-1.5.2-r5.ebuild 1294 BLAKE2B 478a6329804bbeb059dc3fbf83e2159ecfc4d7792f214a481720ddb150aa3762dd0d1b26153af493ced9ec615ca157e8411510accce218f08723a1d0be0f645e SHA512 0da1ba75ab1b8e877067814e8fb7551f6bdd19c430e6e2a85381ac4e284a642d261c9f41ebb7509ca71737e105b1a24efc06bfb3896c42663759ce99244bbea8
+EBUILD ucarp-1.5.2-r6.ebuild 1450 BLAKE2B 3571bb3a3fa11476607ec3815616669e21559e7293f4e40686a578a8fcbf5e82d5ae7a27667362fbad0f7571995ba19a349f0d9e08c6dc38f0e5caeca2cc3dd5 SHA512 2b581d01af3b1d423837a1f1c9b1432d98a2068d6a5c9a997c47e80c33430fbdc388778fb22f8c5ffe5ac75cca97c4221922584b35aae190fb7ac82b39197ab7
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch b/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch
new file mode 100644
index 000000000000..6e746b26da66
--- /dev/null
+++ b/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch
@@ -0,0 +1,8 @@
+--- a/src/ip_carp.h
++++ b/src/ip_carp.h
+@@ -70,7 +70,7 @@ struct carp_header {
+         u_int16_t       carp_cksum;
+         u_int32_t       carp_counter[2];
+         unsigned char   carp_md[20];    /* SHA1 HMAC */
+-} __packed;
++};
diff --git a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild b/net-misc/ucarp/ucarp-1.5.2-r6.ebuild
index 00283bf58e82..a843fc050bfa 100644
--- a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild
+++ b/net-misc/ucarp/ucarp-1.5.2-r6.ebuild
@@ -1,23 +1,28 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
-HOMEPAGE="http://www.ucarp.org"
+HOMEPAGE="https://ucarp.wordpress.com"
 SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
+IUSE="debug nls"
 
 RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
-	econf $(use_enable nls)
+	econf \
+		--disable-static \
+		$(use_with debug) \
+		$(use_enable nls)
 }
 
 src_install() {
@@ -33,6 +38,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/ucarp.initd-r2 ucarp
 	newconfd "${FILESDIR}"/ucarp.confd ucarp
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
index c7a4e46d86e9..b49ea9a8294f 100644
--- a/net-misc/udpcast/Manifest
+++ b/net-misc/udpcast/Manifest
@@ -1,9 +1,4 @@
-AUX udpcast-20120424-fd_set.patch 253 BLAKE2B c899709ecfa472eda7b99fbc6609318ba93fdf75123b72ab5f1f0bf0fb9140f090b5940808234a3a32ec11d2c274be3fa211bde53da3932038b0bff7196292f4 SHA512 8986f45356c25ae1c5104bea7be39284d5f37e626e20b000df0492d60fcb7a781a8adcf9d43b8af4707573a5dd474521148706e0b0c69a0a0fd93edd5146744a
-AUX udpcast-20120424-gentoo.patch 384 BLAKE2B a2ae0508f74598b5421218a943286f8aab499742cf792fb93d9fbae413a67735ed2f74f065cec965e739633fc54ece37f39e3f8034535c3044c404b8f8285331 SHA512 a04594ffb92b06a0b35f8cbdb10fab1def767ea7bf892a1edf6226fe8947f5f261bb6def8e9bf775ba12f3ab1dfad475eef337a93e769da3f07a106dc1e018bf
 AUX udpcast-20200328-gentoo.patch 338 BLAKE2B bc10afd3494d0b57b382cccf2d046c3dc1085830bf9821b0bec4b4eb521fc06c53ebd86189a74e292ebee44aa70701cd28530679a4ea799c49ea2c86bb9ba491 SHA512 28022d99fb5b257f9fd59336d2b7d4d5029b5a8a8c9aa92ed848f94d8cb15908c6325a70e93dbde3f4138ffae262ef9a1522c18f3370095e3c896e797f7c1fb4
-DIST udpcast-20120424.tar.bz2 138955 BLAKE2B 4ba16b9ff86f32bf1f2b07d521fbe1ef05774f0418362eb02fb06eaf84083e1f5e1ee5fc0a675f65b510d9adefcdb0d627bf6f104d5ce501d074517cbd312d6d SHA512 b28ada43f9f3cba498ffff3032cff6a673584836439275604c1201a18fe2e37f2c847a48b72783065b1656a7a2f9e9739d8a376e90df8b05749bc2e2f64278de
 DIST udpcast-20200328.tar.gz 169252 BLAKE2B df760dea814fabf951a65dc191a88355dec864d9c0f1be99ea60c742862d0b9944e51a45dd462ffce5c4b56a8d94f719796e3c725b42edae8cb9a19b1d3bc147 SHA512 b1ce4f0cade5db6bc69d3a154c354565675f44e97f9e3d90152f9594fd4f17fff2891eb1cb8d73c59e0d24eeb85e485e96b7a64fa9f1b6d2f005c4cece377bc7
-EBUILD udpcast-20120424-r1.ebuild 598 BLAKE2B 1c86d03e35f7345ef838ca843d31ae8b2ffc4c06df44395568253dbba8de6c2d10ceceebe08cdd951cbb4acfe169f348ae28321c0b870d10019578fabb50da88 SHA512 bf5a998a79b9bbf83d90f45175147514f68d901dea0c664b06ff1293b41025de87a31dd65bf066880ae3366e00d628d504c22fc7bf476d27c42236e367949827
-EBUILD udpcast-20120424.ebuild 489 BLAKE2B 1bc79fff06727ea1875a93e0b02358fe1349c345c086472f86101a2e1f4f528fbb8f64e427e93985f518b9e99524cef9a065619146885faf8b4fcaa0d7f51d11 SHA512 7737a85d20b1023059ea3ddbb4b2403ab70d1dd4fd87cf3c0cd2efb576330bd63132a10b3c917429fa1ce10a7254f38fa00c1f18d5c314a4178a13e64149710e
-EBUILD udpcast-20200328.ebuild 550 BLAKE2B 62fd74aaf81d8bc604b80bbf8dfcebc67920b8699d60f5066e7c1b04641e665f67fe004159fac5b5bf58891cc7cdcd3244160f78f7e64fb8e875341ff6928123 SHA512 6654b61ddec029a90e831a38bc6cc553c977e7026e38eed51d6a800075a79d40a468338cfc87af3ec3c1aaf1fca0f901ae0fb083ad316bb305ffbaf27bcdc99f
+EBUILD udpcast-20200328.ebuild 549 BLAKE2B 23845dfb07fdc0e5f3abf93f376f5d1587991b7d2ade0b7e02a054009f301e71eda260ed2065b0a6129cf8a9e4df4e9c1825014be13d03a9c5d80a7c37ae75e4 SHA512 1a63b729e0979921656aeebb03a0c7f25847868aa83dacf944e3bb4b42e364f0d942adb27d4de720361f768249e3b057367725becb5ed7737786222451acb871
 MISC metadata.xml 692 BLAKE2B 05fdf36d745cd86ccea0a735e3a87fa51d1582f6b47131fbac37607bbf2f874ce813afaf2743f24b454bd4c880332ca9481c3bc0ab03b085e4a09cdc9a490c69 SHA512 7bca2ea7d909286fc510e6ac35ba860ec20a46093b4dc93ac74b29bdb9fdf8acdd8af9111a6614fff15247cd7f739281d12bc19755958dee2c0a20e22cdb43f5
diff --git a/net-misc/udpcast/files/udpcast-20120424-fd_set.patch b/net-misc/udpcast/files/udpcast-20120424-fd_set.patch
deleted file mode 100644
index 2bd5bd5ce801..000000000000
--- a/net-misc/udpcast/files/udpcast-20120424-fd_set.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/console.h
-+++ b/console.h
-@@ -6,6 +6,8 @@
- #include <winbase.h>
- #endif /* __MINGW32__ */
- 
-+#include <sys/select.h>
-+
- #define prepareConsole udpc_prepareConsole
- #define getConsoleFd udpc_getConsoleFd
- #define restoreConsole udpc_restoreConsole
diff --git a/net-misc/udpcast/files/udpcast-20120424-gentoo.patch b/net-misc/udpcast/files/udpcast-20120424-gentoo.patch
deleted file mode 100644
index e4269a0873a6..000000000000
--- a/net-misc/udpcast/files/udpcast-20120424-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -30,8 +30,7 @@
- 
- # For additional warnings & checks, add -Wstrict-prototypes -Wshadow to the
- # following:
--CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG -DUSE_ASSEMBLER -O6
--LDFLAGS +=-s
-+CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG
- LIBS +=@LIBS@
- 
- BUSYBOX=../udp-busybox/busybox
diff --git a/net-misc/udpcast/udpcast-20120424-r1.ebuild b/net-misc/udpcast/udpcast-20120424-r1.ebuild
deleted file mode 100644
index a1002dbc1ac8..000000000000
--- a/net-misc/udpcast/udpcast-20120424-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="Multicast file transfer tool"
-HOMEPAGE="http://www.udpcast.linux.lu/"
-SRC_URI="http://www.udpcast.linux.lu/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardened"
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fd_set.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_configure() {
-	use hardened || append-cflags -DUSE_ASSEMBLER
-
-	default
-}
-
-src_install() {
-	default
-	dodoc *.txt
-}
diff --git a/net-misc/udpcast/udpcast-20120424.ebuild b/net-misc/udpcast/udpcast-20120424.ebuild
deleted file mode 100644
index e60e56db9b2c..000000000000
--- a/net-misc/udpcast/udpcast-20120424.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Multicast file transfer tool"
-HOMEPAGE="http://www.udpcast.linux.lu/"
-SRC_URI="http://www.udpcast.linux.lu/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fd_set.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	default
-	dodoc *.txt
-}
diff --git a/net-misc/udpcast/udpcast-20200328.ebuild b/net-misc/udpcast/udpcast-20200328.ebuild
index 09fdba474f86..2a300d7a0be6 100644
--- a/net-misc/udpcast/udpcast-20200328.ebuild
+++ b/net-misc/udpcast/udpcast-20200328.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.udpcast.linux.lu/download/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="hardened"
 
 BDEPEND="
diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
index ca2384ead6b2..bcaeecc39ca7 100644
--- a/net-misc/usbip/Manifest
+++ b/net-misc/usbip/Manifest
@@ -1,5 +1,4 @@
-DIST linux-3.19.tar.xz 81688872 BLAKE2B 0b89e34e62d6fe42f43144fe4f3070df2d9a23831b231918946c1f19a1a4b881095892635983ac7afad902f366b0c6001e46751ed2c96890ecbe9d4056154be6 SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c
+AUX usbip-4.13-fno-common.patch 1027 BLAKE2B 20b8a310ee6952b9a2f9496a58b57362a83c578dfe01c772b344afd7af4c5b469a415d2a7104629a9525499b0e933fd4fe6881620a950060247fb8e9f2dd9c12 SHA512 9d11fcb07f4bef9494cfe52160a2c4b6f7f88e4a9488afd39f77bcbaf5b5d3e07b8aa19fd7387ca37adb7e2637167c71b7389ff4cdd3acf3b4f0071d3271e60a
 DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
-EBUILD usbip-3.19.ebuild 1177 BLAKE2B a45830a8824c875cf6eef765e243ec49a05ff9869dbcb534d8267ba7de0cc5c037fab847e720717a21bdf5f56dfab0295aafe080718bea174c1d05ae220e561d SHA512 46f5a579e8e3051aee38f5d89803bb1d34de18f218b3ed404a4ce0018b6ea73988614a55f2d3c54f0095d4b7bac131580868d8a13b40759fb04346c80c6cf2fc
-EBUILD usbip-4.13.ebuild 1222 BLAKE2B 6b66773b165741225f41a7df753fe93e7a83090254c16a779fcbfea4d235beef6e20157f14c07df3e8de1710ff411891962c078a29be6ef7876bf1d8dc273fb1 SHA512 023a798189dc15bd58e962c0869003a650ee9cebe9c43b934c3c517aa5072771e4369fbcd0242ffe21b139a1f262b6505461a659397999db1d7a6cef8166a306
+EBUILD usbip-4.13-r1.ebuild 1230 BLAKE2B af3b55afea8eefbc2c34b6a9231f2a885d8ef61d30907aa8c0d31505cf3dd5ec7570d784ba5600fb9da7f046ee81c73046eb4ca20a0044d2674c3531439f507e SHA512 223fe1747dcc0708f6875ec91b0202818ebe6fd414dfc2c859273e5ca1cf9ff3493c2de982ddf5394914deb5cc59728fd043e818d3633a9b2c6c178de5144554
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/net-misc/usbip/files/usbip-4.13-fno-common.patch b/net-misc/usbip/files/usbip-4.13-fno-common.patch
new file mode 100644
index 000000000000..b8ffc40c4b9e
--- /dev/null
+++ b/net-misc/usbip/files/usbip-4.13-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/libsrc/usbip_common.c
++++ b/libsrc/usbip_common.c
+@@ -14,7 +14,7 @@
+ int usbip_use_stderr;
+ int usbip_use_debug;
+ 
+-extern struct udev *udev_context;
++struct udev *udev_context;
+ 
+ struct speed_string {
+ 	int num;
+--- alibsrc/usbip_common.h
++++ b/libsrc/usbip_common.h
+@@ -53,6 +53,8 @@
+ #define ST_NODEV	0x04
+ #define ST_ERROR	0x05
+ 
++extern struct udev *udev_context;
++
+ extern int usbip_use_syslog;
+ extern int usbip_use_stderr;
+ extern int usbip_use_debug ;
+--- a/libsrc/usbip_host_common.c
++++ b/libsrc/usbip_host_common.c
+@@ -23,8 +23,6 @@
+ #include "list.h"
+ #include "sysfs_utils.h"
+ 
+-struct udev *udev_context;
+-
+ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
+ {
+ 	char status_attr_path[SYSFS_PATH_MAX];
+--- a/libsrc/vhci_driver.c
++++ b/libsrc/vhci_driver.c
+@@ -15,7 +15,6 @@
+ #define PROGNAME "libusbip"
+ 
+ struct usbip_vhci_driver *vhci_driver;
+-struct udev *udev_context;
+ 
+ static struct usbip_imported_device *
+ imported_device_init(struct usbip_imported_device *idev, char *busid)
+
diff --git a/net-misc/usbip/usbip-3.19.ebuild b/net-misc/usbip/usbip-3.19.ebuild
deleted file mode 100644
index dd1e0ccb381a..000000000000
--- a/net-misc/usbip/usbip-3.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ETYPE="sources"
-K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
-
-DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="${KERNEL_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
-
-RDEPEND=">=dev-libs/glib-2.6
-	sys-apps/hwids
-	>=sys-kernel/linux-headers-3.17
-	virtual/libudev
-	tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README ../../../drivers/usb/usbip/usbip_protocol.txt"
-
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
-
-src_prepare() {
-	# remove -Werror from build, bug #545398
-	sed -i 's/-Werror[^ ]* //g' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir=/usr/share/misc
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
-	elog "machine's kernel config and USBIP_HOST on the server."
-}
diff --git a/net-misc/usbip/usbip-4.13.ebuild b/net-misc/usbip/usbip-4.13-r1.ebuild
index bfb8473198b7..453bd87fa8fd 100644
--- a/net-misc/usbip/usbip-4.13.ebuild
+++ b/net-misc/usbip/usbip-4.13-r1.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 ETYPE="sources"
 K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
+inherit autotools kernel-2
 
 DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
 HOMEPAGE="https://www.kernel.org/"
@@ -13,10 +14,10 @@ SRC_URI="${KERNEL_URI}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
+IUSE="tcpd"
 
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND="
+	>=dev-libs/glib-2.6
 	sys-apps/hwids
 	>=sys-kernel/linux-headers-3.17
 	virtual/libudev
@@ -24,33 +25,32 @@ RDEPEND=">=dev-libs/glib-2.6
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS="AUTHORS README"
+S="${WORKDIR}/linux-${PV}/tools/usb/${PN}"
 
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_unpack() {
 	tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die
 }
 
 src_prepare() {
+	default
 	# remove -Werror from build, bug #545398
 	sed -i 's/-Werror[^ ]* //g' configure.ac || die
 
-	default
-
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir=/usr/share/misc
+		--with-usbids-dir="${EPREFIX}"/usr/share/misc
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index 1a5dbdf8cf54..6e148eea6e72 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -2,5 +2,5 @@ AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c1
 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-r2.ebuild 656 BLAKE2B d54b3d423bdc9e563beb94b7ff7a8bd11e15c2db232125966ce2f3036efec681d521f230b71cb245503ad890a8b4c606c7e59357370009d04d5f335a8628e670 SHA512 f1d799b8372909276834149a272340471e8a97312d4c5821f53c2382159dc160f8d2b4ab8ae60f9764fddbb5ee88df0703452a532b76571a4b099241b62b93cb
-EBUILD wakeonlan-0.41-r3.ebuild 648 BLAKE2B 7b2adad378c0ea62b111f78593c84997a8b6321ecf5d5162d77423a3efb7e79156e2a308d6ee597bcadec0bc7fe4377e3086d7f9d7f2479f396701ddf09360b4 SHA512 ba655f402532977613f2bc38ef999dce34900f56dcf456e4f017944dde54f977f49722c23231785a1d63b269786730dad95c6adb84cab575d68934b20ccbdab1
-MISC metadata.xml 252 BLAKE2B d5ae1c6434a18a4052d21b9d34d573fceda4a6a37f4f0f1001fcd8c5d7d179d6f6d7df0f611b7129eddeb894dbcbf573d9c22f25dfc12fcd989900efe48b3512 SHA512 84cb947f6732467eb3137a917ea484aed7b45f56115790f8fb6595b73d0a558e03f379e239db903e4741934744c8eb10237382be10788787c684fafc854527d3
+EBUILD wakeonlan-0.41-r3.ebuild 644 BLAKE2B 85920ed07e23534e6576329b5b36d20e6ea06d5f7fbb7d33690f282c3479df9d68c5af6a2fd1cca6f514bb7b52df16d787eae31c23cf6c6709ed9737f402e63a SHA512 1283e5a841b52e1fa4d8120d315f245608afdae335185de9a5f39602efbf49c35fd118d4d4312ebfe0d6f4dab85ba1c9e44f00118e540f5e8f1aaeca768e148e
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-misc/wakeonlan/metadata.xml b/net-misc/wakeonlan/metadata.xml
index 6106785f32d2..1b2becffa26c 100644
--- a/net-misc/wakeonlan/metadata.xml
+++ b/net-misc/wakeonlan/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>axs@gentoo.org</email>
-    <name>Ian Stakenvicius</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
index 2ac0dc29d53b..6106c0a10112 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index c53686c2f79c..a30a16532451 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,7 +1,17 @@
 AUX youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch 854 BLAKE2B 31c948c2fa82ba431c2b31eab9c29a55cbf5bb59ee2eff7a683c5549d30935bbf96be479cc920196408027c34dff818d409e5aee875855ba56be42aa879f5079 SHA512 7bb9a264dcf4a5691460fe537fcb64e11f7f02a54d29590375e5630489688ae940d66818966690916aa0b6ec8b54be730b0f39efa168554e644a1b68bcba33a6
 DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
 DIST youtube-dl-2020.11.26.tar.gz 3218922 BLAKE2B 4e8ac926a7cef9d8a9f53de1002464e4d3a632d09c6564e1451a7bc49fe4cdf72e206f98df58a4025d55718f46d84fe4f1f6e23268ef19ad3ebd11725d5a0fcc SHA512 126c299c3db654ad3c88ced44bfc1a34bd73a439d8d3fd64720bb5d06fe84df817182a9e0b38d1def2eb4f1de26c7e2b8b6d3d6b4282f973db548c9868938a41
+DIST youtube-dl-2020.11.29.tar.gz 3222467 BLAKE2B 6b699689f55fb5b24d9a3fa9b500461076d9cac58a111fde5f07f4df45113d40cb2cfbec2b86777b92277fbe16467c1516fdd5bb49e30f8361dd7fe3479eca57 SHA512 e3b4e7e7a776a608d2ee34c5395108445ea43fc999b0364a686eddb5d5977591d2c625b2a97955fd565631da070921f3196cd98ce58cf9aebf4e504636645a3d
+DIST youtube-dl-2020.12.02.tar.gz 3225560 BLAKE2B 953de14c6801a853091625753c0f918e7c6f88b1631ed2d41427fc36cc615830161f860e043ca784b31b1845ecfd0f5a88afcaeca40dc797cd89d36d4762d637 SHA512 5e48e272d957be391cb18960e0b1864b0f2202e26a53491f5c15f6c40bc36e720d80e95955a5a2f889e05f11a999fd311d095b18e5082bb951739c63ffe7565a
+DIST youtube-dl-2020.12.05.tar.gz 3228845 BLAKE2B 6186a7d788bb839a7beceb708ddcc629bf111403ac003baa68422122a77d3793148769b0062f8ca2b1d24348d203ba7cd0b1841c2a16f95e0620423b881a83c2 SHA512 c58baa8a95a9bfc09a8f37299fd3061101d29a0662bd1c35f5b4d3d030ac1f06b47ec2f42fdec1759005556a81c43f7d067e9a43622ba06f8817b1a63c52c4a2
+DIST youtube-dl-2020.12.12.tar.gz 3225195 BLAKE2B da14fb941fd81f0596a590e7690c2f4786a57d9fbe057743ab2a4a4cabad9978df3352ae1389b89e42673c3ea99e43488741f2d22cbb6274f1fadc5cbb923a47 SHA512 388722cadf500cbcd97b8d92b1ae67d091a5fe79e6bdf19e3a3f94476ef926f7ab57b35ee6d14e2d7a7bf1c72db37535de6c9c6affd32f4c1403902b813d5530
+DIST youtube-dl-2020.12.14.tar.gz 3229047 BLAKE2B 5a54ce2f7f754640c29c9183495c5933340f6d2b94e4bc958eb6590ada08b12b8333d7c61106e1c00d1ef039a7d203382930833d2734f80bf361cf6858ef09f8 SHA512 8a7d96656ef6803afdff90a2c528cdac5354a10996a631c54c722615ccbf879fd5e89b85f9e369cb9d1fd239fc095db4e232a5c420cdd902f5ffbe76f4e3d1a5
 EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
 EBUILD youtube-dl-2020.11.26.ebuild 2234 BLAKE2B b77ce7a214ccaf5b4512402f406cecf6f770832cb1ac99fb9ad3f7d087b985a0c9d4db1de7e661e9a0bc583d2548286221c6402911d190f8ac77d0ea8065136c SHA512 e7416bca93ff11567f98bf293a1adc66bfcc9dbd6c9be39c6e292b46cdadc96e68ae03710cb42cd521e0893793e19db86e4e90e5376c37ef5172be464226e3cc
-EBUILD youtube-dl-99999999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
+EBUILD youtube-dl-2020.11.29.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
+EBUILD youtube-dl-2020.12.02.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
+EBUILD youtube-dl-2020.12.05.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
+EBUILD youtube-dl-2020.12.12.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
+EBUILD youtube-dl-2020.12.14.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
+EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
 MISC metadata.xml 353 BLAKE2B 53a5a71088d6c6ba1785f245c36c8c7551eb800b308313a053cfb5f292df1adce321383522528a06742aabee8f5d7fe8d2d9805c28632fce1d50f6a938b163a0 SHA512 01570d01232abde7a0d3983e307197cd07ad010f57f5df49048405b45fe2e1f2aeb0594260014bd4d95a6f234885e29ac802111402df3707d41b4b0f75b7457b
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
new file mode 100644
index 000000000000..47f8343b521a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..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-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 ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} 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. ${PN} 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 ${PN} 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-2020.12.02.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
new file mode 100644
index 000000000000..47f8343b521a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..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-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 ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} 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. ${PN} 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 ${PN} 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-2020.12.05.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild
new file mode 100644
index 000000000000..47f8343b521a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..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-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 ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} 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. ${PN} 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 ${PN} 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-2020.12.12.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild
new file mode 100644
index 000000000000..04afa74ada09
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..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-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-2020.12.14.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
new file mode 100644
index 000000000000..04afa74ada09
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..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-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-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
index 5c8d50fa92c2..5c8d50fa92c2 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /net-misc
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)