gentoo resync : 25.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
commit: c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree: 620cbf137661399a3fb1eff92914204f9a970713 /net-misc
parent: cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)
83 files changed, 1312 insertions, 910 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5ad04e882fd0..62d7e6061dfa 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index d5b6ffc073e8..a6d5f03fc5f0 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,3 +1,3 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
 EBUILD cgminer-4.10.0.ebuild 2561 BLAKE2B c83adfe93051f23be466d8d324da27690ec96dfa6887e93668f510f09f8b43b7c5bb6351a2941b4d02ee67b50965cdf42fb722b49c877ec5e9da5d2683452df6 SHA512 3ad82b78ee9796f264ae259b0b1e60fa95b73c50b772ffa427f113eab9d373723d27592780282a9d1c36f3352e6dad220a56c23b60c4fb7a3d5acd3440e76ee2
-MISC metadata.xml 2137 BLAKE2B 5e96d3a5b9faa7558ce4b1b76d91c8f2d999f74f70e02873a8e5a2e4a4e3aa3456680757b75907c86e3dfa7a719d6cad17e4a5aa0ee7c94238f9de3f20faef70 SHA512 bdfc2de55fe1a7247446b2badf4b7ebc610f9d11bd69c4dc84426165dc9c10f1fc3f5333540f62b53b30c95dd178f90728dd35b6678366d46429102a2c9d01b5
+MISC metadata.xml 2052 BLAKE2B c4fe4d3eaa47476ee0a871f6c0a247d581013c395ffba953b1c6189f402e8fa7a2a5014a9f10e9e9022eadc1de0ce15d22c50741e3bbdb9d533e9804c0e53991 SHA512 2e7cf4cc6c678a7c6b870c1a51f459c06bed247f14a304013a75d76e1683f10b8c1b51f78b23c43f28b60dc32e89dd1a92c7f20bed841a2e48e3159f0c50d381
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 79f8665f4a0a..ac84dac8329c 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="ants1">Enable support for Antminer S1 Bitmain</flag>
 		<flag name="ants2">Enable support for Antminer S2 Bitmain</flag>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e416edf6ea75..514ecaadd266 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,6 +1,12 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
+AUX curl-7.79.0-http-3digit-response-code.patch 1756 BLAKE2B 5efa4e2548660650609c655545de33eda48a87ed7a7acc430559dae7c574f8d35f4a461d24caf8119e10695a663270b2f40b673d1ea386b7ba400e3f74c061c6 SHA512 ec3b7602317c6400ed86cf1bfde820f93803540bf6298bec3e1c0cf32a896f577a1b6723ddb062537c05432278d1307784f1a6cba697dde2188b9d1d59e1bacc
+AUX curl-7.79.0-http2-connection-data.patch 1298 BLAKE2B 8ad95bc3daca78dbf792b12381993cab6c23d2fee3778601150eb1d7361406cb95b2aa28959b0729db5ba407da66beb0adbf6cd3065aeccf7ba9b5545e053b33 SHA512 49ff5c7b1e36121065626d08a6699385874c64b841349e1ca8d6e514be547e94aef9ee663783d8e103350481590ee086b829247b6a21608e7727c926aca5bb40
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.78.0.tar.xz 2440640 BLAKE2B 0422071ce22d38b89652c702989674a2257dd18b05004245c4f2d7494ccdd24b5b52f330629ce6a411a059d5990e8c879cbbdf23d873b881141f9d2b9ad07f7f SHA512 f72e822a0b5e28320ef547c7a441c07f3b4870579a70ab4c428751baba435a1385cb89a22b9ed4b84a7fafecf620f155911e4131e3463ec1bdad80ecde47bb7a
+DIST curl-7.79.0.tar.xz 2463072 BLAKE2B c3a8a60d3c04965272b1a439a4719cfaca903daaecd6265869b9188d1b6b13be63817b9daa77260673d67330baa3d9c2d917274f939cdadc467ac64d8fcf3203 SHA512 68bccba61f18de9f94c311b0d92cfa6572bb7e55e8773917c13b25203164a5a9f4ef6b8ad84a14d3d5dcb286271bf18c3dd84c4ca353866763c726f9defce808
+DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
 EBUILD curl-7.78.0-r1.ebuild 7962 BLAKE2B 22e11af875ee637a45cb4af83d295aa7cacbcf3fac349bd3f7ddefd03f0fa3b1348d2356cd2547fb8891ff1f47ebf1fae6ac3d5e214bb74a7d16d85f55e7b944 SHA512 9fff1fdddf753e8ac210f01cb24e48dd87a9f603f2a3f5c0e4836177f827636940ff796e06bd3d4276fb3debad7168704047c0993bdc8fa67278f4706dc99653
 EBUILD curl-7.78.0-r3.ebuild 7969 BLAKE2B 02cc15b20edb0f2102dfa3fa7cf43d04181a86af9690b24781607a08067b4ad3312c5fdcc3b4bf92373512ee8f5be3c7beeb63128042cd6a555f18ad490a250e SHA512 80aa6a4a1190a9fd0c6af379c8a58e10e5c9c05eaa8307c11a7e10307c7cd91f4732c33ddf7838cc4e8d9a9aabc5bc3b3aeb0af034755e715457d4852f836c33
+EBUILD curl-7.79.0.ebuild 8101 BLAKE2B 6a0e710d1e8d6214d096f4e693278f520336e68e18714df27f9f259f1b31569c1adeed83ff47bcc851511e084aed0688e698a0d5306964499a0745904245f6c6 SHA512 243bc5b883f1d0231d0db376e3fd4034f5c5328c6009f5711bd5d3dc9481303a30142e191da40e9815a13aacb42ef7df359c603e92243f2d920aae6f32cbe12f
+EBUILD curl-7.79.1.ebuild 7964 BLAKE2B 5839f5f418224b78090012eae1b16661e1c6e08165671769910b3daa1ca8fea5b1d2cfda32b1b849b35f5875d9021a87776250cb5353b2dcc726e9d999482efc SHA512 26a87695d9295cdca045ababf9f844d0b2ded1ad42ebe426806e6ba99eb072933badf28be5bd952ebd7335d35d86334b89d66870c8c41ed8e797ff9d997f96bf
 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
diff --git a/net-misc/curl/curl-7.79.0.ebuild b/net-misc/curl/curl-7.79.0.ebuild
new file mode 100644
index 000000000000..380b1da5a4e5
--- /dev/null
+++ b/net-misc/curl/curl-7.79.0.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+# 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_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+	# Backported patches to 7.79.0
+	"${FILESDIR}"/${P}-http2-connection-data.patch
+	"${FILESDIR}"/${P}-http-3digit-response-code.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-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; 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_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
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-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
+		$(use_with brotli)
+		--without-cyassl
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		--without-libpsl
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-rustls
+		--without-schannel
+		--without-secure-transport
+		--without-spnego
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/curl/curl-7.79.1.ebuild b/net-misc/curl/curl-7.79.1.ebuild
new file mode 100644
index 000000000000..952b25afe63d
--- /dev/null
+++ b/net-misc/curl/curl-7.79.1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+# 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_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-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; 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_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
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-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
+		$(use_with brotli)
+		--without-cyassl
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		--without-libpsl
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-rustls
+		--without-schannel
+		--without-secure-transport
+		--without-spnego
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch b/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch
new file mode 100644
index 000000000000..4fa701132651
--- /dev/null
+++ b/net-misc/curl/files/curl-7.79.0-http-3digit-response-code.patch
@@ -0,0 +1,47 @@
+https://github.com/curl/curl/commit/beb8990d934a01acf103871e463d4e61afc9ded2
+
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Fri, 17 Sep 2021 16:31:25 +0200
+Subject: [PATCH] http: fix the broken >3 digit response code detection
+
+When the "reason phrase" in the HTTP status line starts with a digit,
+that was treated as the forth response code digit and curl would claim
+the response to be non-compliant.
+
+Added test 1466 to verify this case.
+
+Regression brought by 5dc594e44f73b17
+Reported-by: Glenn de boer
+Fixes #7738
+Closes #7739
+--- a/lib/http.c
++++ b/lib/http.c
+@@ -4232,9 +4232,9 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
+         char separator;
+         char twoorthree[2];
+         int httpversion = 0;
+-        int digit4 = -1; /* should remain untouched to be good */
++        char digit4 = 0;
+         nc = sscanf(HEADER1,
+-                    " HTTP/%1d.%1d%c%3d%1d",
++                    " HTTP/%1d.%1d%c%3d%c",
+                     &httpversion_major,
+                     &httpversion,
+                     &separator,
+@@ -4250,13 +4250,13 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
+ 
+         /* There can only be a 4th response code digit stored in 'digit4' if
+            all the other fields were parsed and stored first, so nc is 5 when
+-           digit4 is not -1 */
+-        else if(digit4 != -1) {
++           digit4 a digit */
++        else if(ISDIGIT(digit4)) {
+           failf(data, "Unsupported response code in HTTP response");
+           return CURLE_UNSUPPORTED_PROTOCOL;
+         }
+ 
+-        if((nc == 4) && (' ' == separator)) {
++        if((nc >= 4) && (' ' == separator)) {
+           httpversion += 10 * httpversion_major;
+           switch(httpversion) {
+           case 10:
diff --git a/net-misc/curl/files/curl-7.79.0-http2-connection-data.patch b/net-misc/curl/files/curl-7.79.0-http2-connection-data.patch
new file mode 100644
index 000000000000..bdb1484d1b16
--- /dev/null
+++ b/net-misc/curl/files/curl-7.79.0-http2-connection-data.patch
@@ -0,0 +1,43 @@
+https://github.com/curl/curl/commit/901804ef95777b8e735a55b77f8dd630a58c575b
+
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 16 Sep 2021 08:50:54 +0200
+Subject: [PATCH] Curl_http2_setup: don't change connection data on repeat
+ invokes
+
+Regression from 3cb8a748670ab88c (releasde in 7.79.0). That change moved
+transfer oriented inits to before the check but also erroneously moved a
+few connection oriented ones, which causes problems.
+
+Reported-by: Evangelos Foutras
+Fixes #7730
+Closes #7731
+--- a/lib/http2.c
++++ b/lib/http2.c
+@@ -2221,12 +2221,6 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
+   stream->mem = data->state.buffer;
+   stream->len = data->set.buffer_size;
+ 
+-  httpc->inbuflen = 0;
+-  httpc->nread_inbuf = 0;
+-
+-  httpc->pause_stream_id = 0;
+-  httpc->drain_total = 0;
+-
+   multi_connchanged(data->multi);
+   /* below this point only connection related inits are done, which only needs
+      to be done once per connection */
+@@ -2252,6 +2246,12 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
+   conn->httpversion = 20;
+   conn->bundle->multiuse = BUNDLE_MULTIPLEX;
+ 
++  httpc->inbuflen = 0;
++  httpc->nread_inbuf = 0;
++
++  httpc->pause_stream_id = 0;
++  httpc->drain_total = 0;
++
+   infof(data, "Connection state changed (HTTP/2 confirmed)");
+ 
+   return CURLE_OK;
+
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index c4add19dc980..0590dba8183a 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-40.1.tar.xz 63980 BLAKE2B 6f5ebe7f00e2038f88740a994ee90f55b7f3ce6e4ea8898b7326d2f36dea2d89c721cffd253f92cde388b1273ad8d086242bfadaa86e4b87361844b3a3bca5b7 SHA512 39116afa16256820a69e020b71de5458fc5da8154bc8255d2157ff56fc679c39f4608f790d74eb4a0cb10cc61bd27d4172cfc547582100cab5b897644a700ee3
+DIST gnome-remote-desktop-40.2.tar.xz 65400 BLAKE2B 47be88529c365e5ab72b225aae1ad0fdca4748c39476ea1251db8f317e7fc25e90acf0b908f64f0a2111e0c59d8a213ede6945fe75151cdca6ab2cf8a77351cc SHA512 f39feb5b4b89d1c504a07c5dcf5962a4340cfc45c70d806a2b6739512ca80671dd8b7928a6dad83165dbba50b17c7961e329ecae0dd59f3f57f4fcf0f7969466
 EBUILD gnome-remote-desktop-40.1.ebuild 1226 BLAKE2B d6f64f25193c9f9b95f281d1ab31b09f7ee414472ab89a0c7bb8e3bd06e8f3b01009250747339a31c865e70e6e908fb4648ecb464bfb20e1135a5a50807e8050 SHA512 561a66e5a50b815657d68b5c22e0a33bcd58398fa77a687c166f0b93b8d58a2c5c9cea97cf6969fd08aa661f55b07f46b533b51166894ee3aa2db8bdbc1e838e
+EBUILD gnome-remote-desktop-40.2.ebuild 1227 BLAKE2B 009b113dc0ea796ee3b5007eb42436e1f58cff823805a793c3e3f461f573ed251746272e06cf497442528f87016dc854cffd52e89da4abfcc0a983b43b3323db SHA512 2c9f6267b7c55bf2d519cc4a5f497dc0a4efd72dfabc7372a29ea672bc3e809765a5d9e9eb386542349087364d0a6f69a56f64fea6c71003178e26797b7618c2
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild
new file mode 100644
index 000000000000..8df01c6524eb
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rdp +vnc"
+REQUIRED_USE="|| ( rdp vnc )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	>=dev-libs/glib-2.68:2
+	>=media-video/pipewire-0.3.0:0/0.3
+	app-crypt/libsecret
+	x11-libs/libnotify
+	rdp? (
+		>=net-misc/freerdp-2.3:=[server]
+		>=sys-fs/fuse-3.9.1
+		>=x11-libs/libxkbcommon-1.0.0
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e '/systemd_dep/d' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use rdp)
+		$(meson_use vnc)
+		-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/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 8f8c2a1dc299..20aab998874b 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.22.tar.gz 5043351 BLAKE2B 98bae9bcec74511f33134c0430937788d0ade66648081eda1a394aa032914410d3765a9cbe6c0167911aad9df6392810fdcbaf43d3d27862fbd881d847324d37 SHA512 12a7e014b6f86d643641fc3511387cfe7b9bccf3a8ed9b49e21aaa73f3fd2412a413e83264e306e837b76a5f707caddf08151f95c55a4c2bb197a73cd0429de4
 DIST gns3-gui-2.2.24.tar.gz 5043449 BLAKE2B ef2de570dbad46b90be450e2bc342d96eea3fa7898380e01cf43933a60d0fef6ebef3ed857b9d0fc648355f6f335a406bce3677fd23d87a68e7923bb8bbb2631 SHA512 7b917106836cb77cdb90ecdcce2f0ce183feed52906b27b2dfa0146c12ffaa5e41733de57c0932e0104e55aad501b6508607301648a5d3997d10613daa0c1f19
-EBUILD gns3-gui-2.2.22.ebuild 1024 BLAKE2B c3585ad5af11292a85bef8cb9fee2dc74af2943828c493c9aa6f9f8718d60481c44ed0f38baf3daa1337e418a96bb35b919e728e0d233bdcdaf11ad714c7081e SHA512 3080d89cc01c1bde3500e74f2bb5e47b7f3df22c361c00205dc277d489cd6069bdaa34657d036912dddc22c3ec39d9070ec040f44c60f04710d808f7ec148d80
+DIST gns3-gui-2.2.25.tar.gz 5043324 BLAKE2B bd9a04dc91a35b80cdbf8fee7e8bed98ae5d4d8dd887e8902c3f8d2b08c405b9d6ec707fc9b0202053b1409b3326d9b09be7804cb85d0f14eb90af2db13ea5cd SHA512 d70806efa9251e8be419d838ebf0361bcc7d1ca923962dc4c9b364032772e37f2ae9d646b5e6b96b6c54cc7100dc3b1814eb85270d09e21c1f2679a4a3afda53
 EBUILD gns3-gui-2.2.24.ebuild 990 BLAKE2B 5d5fdaa73087a089e25b465de45d52e6e712ce9826eebc0430aa031e93e6ab71a70bb7f5fd4e803120d71ce84d24d3f9f8bccb78fe5ec0799e71c25071eff1e6 SHA512 e562b389923a191040f322f805034627db7cad6d1f75f50043a6d9b372738cc93eb535b739c67f07f17834c52da7bd5659d1c3c5944ea0fa1d67b4bca3afdf63
+EBUILD gns3-gui-2.2.25.ebuild 1026 BLAKE2B 4a79dec0da1dbf35efe0f774aaca11548911c2f3dbd4822361e3c47d991dc5923da301c23fba63f46e0d0e5b301973116b569d263a4c4e99c5fa8d79cb1301d0 SHA512 df2c2f7f612bb41a1054e6017867017da626d9d00e88ea7600e2bd3b0507b7011cda3e4a9b3566861010004f5d44ca6f3be029cce8c4e625b1352113029b8599
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.22.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.25.ebuild
index 4e0c4f33f2ce..aa3b783123d6 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.22.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.25.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx xdg
 
 DESCRIPTION="Graphical Network Simulator"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
 
 #net-misc/gns3-server version should always match gns3-gui version
 RDEPEND="
-	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index a96b69b4a466..d29df131c26e 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,6 +1,6 @@
 AUX gns3-server-2.2.24-Fix-tests.patch 2975 BLAKE2B 91d3da6f87e88e172f3e31afc941b0e7f8199e1a601d018847834df57687eafee36f2a8130293b77449bda8f6de94a5d786e950207dc3e21ff4702193367dc1d SHA512 b7f7570977aa6c36b3eeadb15c2327d902e77abae06d2496b8d72914abb442e1ba80b7b54787d98e3df66e38d175f7e2a1085695c13fa07891a808c0964e2480
-DIST gns3-server-2.2.22.tar.gz 9011028 BLAKE2B 910711cac6f649d8dd3f7a4d2a9aa77839c9dda9f4280e7079b86857c542907feaa1205b7060ce7cc8956a2fbd220d5393cda319f64ff17eeb5ce476922afccc SHA512 444f483e69a56ab82c053c042b8791711e2fc6b7c800d30c08f2221405418a5c78d780f0f959c80d56ce864230ae17b04639c74a6559c7f5abce65f9c808a282
 DIST gns3-server-2.2.24.tar.gz 9057352 BLAKE2B cc49127afa9b3422f25ec2d10e53b7cedc59a4b872394d7b7c47ac34e6859fd5f22547277f351ba75b6520a0881b2ebbda6ba932af31108f070c2ccd92574020 SHA512 22a4394f645b5909e75b07d63164ad4fa362f78d69c6f30e8e2daf15bc910c238e8cd983a9f1cb3c1045a0722f9a1c260002b4afe8fb5915033b3ddb20814a17
-EBUILD gns3-server-2.2.22.ebuild 2233 BLAKE2B 58febe525be2f40d6294398ae76b7b7f87261b0a97f246512a07db590aa545b7b3dda22f0fb8ffa317c202867dbcb99748bc3e771f660278a67d2f2bf260b2c6 SHA512 ffbde90e9fd1a526f74a5031af44d8550d75e0a051f5aa7f68facf72b01cbbacfef183e898c32472a2187dd9557616a20704a954080e261214fc9c700034936f
+DIST gns3-server-2.2.25.tar.gz 10229566 BLAKE2B 73827940698335dcf9ef6d4b6c4c88b162852ec493f8ea05eebbdca20df3c84e4f5ee2ac218ed72755350df2f0e27cfc6cbd34b541e9e5bc0eada2fcb8e266ac SHA512 c7fa163eedc064fd266100658d7d2084ab0c542280d6689938a06943534df320f905c0e46175580bd3792218369936c55f9e135a12577f8a4b7eb86ac8fe9739
 EBUILD gns3-server-2.2.24.ebuild 2208 BLAKE2B 4baaf0cb904aed94173092f4ce584120bb247cc157a66acb63ee84cb44789127c3f6a868943a474eae48838112fe18e2d24090cc8396056a1c3400802d59aec7 SHA512 5675af064e4194b765ba350ced456424688e9f2b3fbd01f099ca854ea1c40be30ec5382795c60cc999ddb1411b0f73b7c70b546b585e453db4d437e55cf9a5d4
+EBUILD gns3-server-2.2.25.ebuild 2079 BLAKE2B 5d0cd48a38265e55410e9b3934fd248745c9aaace27163c46cbd97a0412b0893b52ebc96322abe19e8241d888c13a29aadd22faf1ea9e50f9d61412282cd0ae7 SHA512 4d21ffce7f0e447ceb490fc00d97f7bcdfea30ccc562b347afd767b3652977e12dc77a58a585c997773b698928735a4284c42a7610bd5aa122df84b11320f0a6
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.22.ebuild b/net-misc/gns3-server/gns3-server-2.2.25.ebuild
index b670345461be..9d91356deda2 100644
--- a/net-misc/gns3-server/gns3-server-2.2.22.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.25.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -10,25 +10,25 @@ inherit distutils-r1 optfeature systemd
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=app-emulation/dynamips-0.2.18
-	>=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+	app-emulation/dynamips
+	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
-	>=net-misc/ubridge-0.9.14
+	>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+	net-misc/ubridge
 	sys-apps/busybox
 "
 BDEPEND="
@@ -47,10 +47,6 @@ src_prepare() {
 
 	# Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
-
-	# prevent installing tests directory, see:
-	# https://github.com/GNS3/gns3-server/pull/1930
-	sed -i 's/"tests"/"tests*"/' setup.py || die
 }
 
 python_install() {
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index b6e3f16db4af..e38e97ae1a6d 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,5 +1,5 @@
 DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a
 DIST httpie-2.5.0.tar.gz 1105177 BLAKE2B 6e16868c81522d4e6d2fc0a4e093c190f18ced720b35217930865ae3f8e168193cc33dfecc13c5d310f52647d6e79d17b247f56e56e8586d633a2d9502be66a7 SHA512 f14aa23fea7578181b9bd6ededea04de9ddf0b2f697b23f76d2d96e2c17b95617318c711750bad6af550400dbc03732ab17fdf84e59d577f33f073e600a55330
 EBUILD httpie-2.4.0.ebuild 1577 BLAKE2B 09c82238242dd6bc2bfede83fd47e219ca29f34ca848b660f097156f4576d65ba6a575bd08c98ccf70a8113638d73195207e7f1f2f91a9ffe6e7a18ecf47075f SHA512 68a57ce1e74b68e0245a8370531ce9382b899f0ae732412eace4988cb068aedff5eb98a2bab04c3a8c0dd16bdcd15077c435958b7035dff5081add48ad7efa93
-EBUILD httpie-2.5.0.ebuild 1662 BLAKE2B 2c1fa9f6533f68490af03205960fc8d562d3b642e293974d003055b2cb1597c9fdcc9741bb04eced402eb81b53f38f84794bd1971085b02e10e15614198c490d SHA512 f49b54e61dc90d00e7c50d84b018e72fe410b1c0502f74779c08fac582f9474e254a9b28ca0663a272f6ec9d91cf06958f86892b20b99498ca50381c866f7391
-MISC metadata.xml 750 BLAKE2B 2a7704017de86fa9c13f02fcb48a3d43fb6eeb172bf6e36fead39caf8dc288ec059289c54d74012c201f337747e0030ebed66c934b5314e7cd8c25d6e47b4cbf SHA512 4691f76e8a91174cff7d399f4cab8df5f275742b8900150de58b4b5acd251afc1d030622f9881af1b998a2f688ca4fd1a0ca67a9c4e6fd0feeeb79d5aa42366f
+EBUILD httpie-2.5.0.ebuild 1076 BLAKE2B bc703c118eaa94b490676b198e4807c749dc54ff93d2a8a4a1582b46c7813051af3a153e7d90febc4ed2f6a7254f3abedc7b13e48a4a30d2bf5df804d81b2759 SHA512 c3a3b70c43e563b30414527e36b2519cfe899a0a7d16ccebfae7a5e59e65353c16041a4e091a7d4d5003b1e3cee6840e824e710978784826759a0ae00d4e6c4d
+MISC metadata.xml 1165 BLAKE2B 38bffb922e5057ecaef199ed37d2908776056fa851d24ff9c3fb798e124de4a8edd3c8f0c74f3175cab852f97bbaf634a27aec90162d7749da73fa3dbac18ab4 SHA512 e63434bfdefb4eebe1971f2b92df5a478134fa3be286db6fff6bbfed1e2c8c457a3941facb9bef68f25bb5db97ab4d0dce0ecfc68459fab33564a872c7eeeb47
diff --git a/net-misc/httpie/httpie-2.5.0.ebuild b/net-misc/httpie/httpie-2.5.0.ebuild
index b2e48e8373fa..00420956f69e 100644
--- a/net-misc/httpie/httpie-2.5.0.ebuild
+++ b/net-misc/httpie/httpie-2.5.0.ebuild
@@ -10,14 +10,12 @@ PYTHON_REQ_USE="ssl(+)"
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Modern command line HTTP client"
-HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/"
+SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/defusedxml[${PYTHON_USEDEP}]
@@ -28,7 +26,6 @@ RDEPEND="
 BDEPEND="
 	test? (
 		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
@@ -37,21 +34,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-python_test() {
-	local skipped_tests=()
-
-	skipped_tests+=(
-		tests/test_uploads.py::test_chunked_json
-		tests/test_uploads.py::test_chunked_form
-		tests/test_uploads.py::test_chunked_stdin
-		tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked
-		tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked
-		tests/test_tokens.py::test_verbose_chunked
-	)
-
-	pytest -v ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	newbashcomp extras/httpie-completion.bash http
 	insinto /usr/share/fish/vendor_completions.d
diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
index ee6866684a3b..4bfbb6afe5f7 100644
--- a/net-misc/httpie/metadata.xml
+++ b/net-misc/httpie/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>mickael@apible.io</email>
+		<name>Mickaël Schoentgen</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		HTTPie (pronounced aitch-tee-tee-pie) is a command line HTTP
 		client. Its goal is to make CLI interaction with web services as
@@ -12,7 +19,10 @@
 		servers.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">jakubroztocil/httpie</remote-id>
+		<bugs-to>https://github.com/httpie/httpie/issues</bugs-to>
+		<changelog>https://raw.githubusercontent.com/httpie/httpie/master/CHANGELOG.md</changelog>
+		<doc>https://httpie.io/docs</doc>
+		<remote-id type="github">httpie/httpie</remote-id>
 		<remote-id type="pypi">httpie</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index d121a377396a..6cd4fb998987 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -4,6 +4,6 @@ DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f5
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
-EBUILD iputils-20210722.ebuild 4520 BLAKE2B 8c7f435fc634299e5ba49c106c1539f037f7a5ee03a7a63a76c5940da1a92a2077aa127ea5ccf91fa7df372e3e16aaf2b53f8edf0f11568768b8f87e4dd3b946 SHA512 0fc37933864740e24c398d1cb4760697bc8dc48657dcc28d241794e4cc495f86f751e59f21e363d10667a2ec94dc4b517f5cc3cf8ed8b380d75a9955f511bca6
+EBUILD iputils-20210722.ebuild 4514 BLAKE2B 133f050cc1f1884108fe72f147545efffece8f9e7ff931eebe7755f47c76507ee389ca7650b58cab7294e2be8515b92a3446c3e8a66207ba2a523fce3a4abcab SHA512 5891e9702aa66647fe828c4ca26359b9c3729d10cef89cf2960d5ea6b3e90899c9b4ff91a18b40c38f0f4bf4526b8ff15c97c066a606faac0ab0e97e4760ab40
 EBUILD iputils-99999999.ebuild 4440 BLAKE2B e752bc9085ee4a631a7c93b6f5a533bc2ea88009020aa336add86167cb68296a418e436af05469e06e8d11f6c49bf7bff9534e8258258d8eda5674e7011481bf SHA512 2b30c9bd6a5470381d016ab68338de9da471ebb0f351a19585543a33b77ab4f586a13590f592fc7b5c92a976d04ee9988c6da3d7d83ff15a55f295535021ac52
 MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9
diff --git a/net-misc/iputils/iputils-20210722.ebuild b/net-misc/iputils/iputils-20210722.ebuild
index b89114ba0788..08c7ecd7e7c7 100644
--- a/net-misc/iputils/iputils-20210722.ebuild
+++ b/net-misc/iputils/iputils-20210722.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index bb535eb93ada..d1a8196a0ec4 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,12 +1,8 @@
 AUX ipv6calc-2.2.0-gcc-10.patch 942 BLAKE2B 2732dca8ac3e593fb51bcc09777278044b6b37fe55007963728483595bfe93eb297ca95e9f79ba01755ed377bebb85cc3475c7289a4ca765d0a2301646d7de88 SHA512 ffef37d1944ed07ba6c4645f160e041c0423f4c5affeeb75f973386e658edb3cf8d5cd34d8462c63850c4ffdb6ad54bef782261925f7dde4f8a0d42fb3f09003
-DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
-DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
-DIST ipv6calc-2.1.1.tar.gz 1453854 BLAKE2B c95f66c2f99cb4953a0c9a8416e294a08d4907e0c5df53616fd0d26c31070ca4727fcb6ebe3d9d84b147d8f24bc69a5c789564ef8e0f5e2fedb1af31a664ed85 SHA512 99dfc87c33c48722d75c98d7a4417b68b23da3d691629ebec65a18992d82a09fd01e55f829f4db4440e0becb746907669cb0bcab4a9ecb477bdcf8ecab675dac
 DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2f745213059ed2b0f36d7a9049a7a659d0419e6f684661247c7714d3e9886fe0a6782f5dd35895c46f2583310dcd SHA512 6e9acde56e245ffae0903305659881eb763524336da285d5048b655728c7d7b031ae7b4190f01f663e3d7134defbb8987c8f47ddd75bf8c8368ec1b918ee42e3
 DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695
-EBUILD ipv6calc-1.0.0.ebuild 1487 BLAKE2B 2bea35e2df217cee666c20940c365e91976eb70cf752653148138649e1c80c35514d13b2eb3571a401c3413fb9b29c24fa3e297c0d6837bd57bb4618b340b1e3 SHA512 93bb58646c27e30c067f003bd8b79c8d9562e63c2db39c80e207913760c1bcc46ec3e14cb343466d0a5a2f8a4d9cf037abdabcac520cd06a950f364c705f189f
-EBUILD ipv6calc-2.1.0.ebuild 1525 BLAKE2B 2fb920cc7f827d4b6d272f8a50418a6382ea82ac64ed7ed79c2cd2faa76240b0656ba02b1184207c9de2161b13b176ea283db9713bb6ebd5ad9d3a1ddbc0c00a SHA512 2e3653a9c4a8b48d2f61a8ff3d46f2218cf9a407ed48c2add7d8a04f686984c046491ec6f0f2235daa20c935bb50e754ff63f85778efe21a7dd8e174f408a86c
-EBUILD ipv6calc-2.1.1.ebuild 1528 BLAKE2B fd6b294ac662f84c8f4812e1049ca3c546ddb66fd126a49154b076833745aa217660f89ce4049207a8177c306e1ec2e724dd7120175ff49fcce86bc012861ba1 SHA512 297f6571f673e48b0edab519cfdea211f62bd07a8ba0570acb6a68592f468661b9e9bb12ae66710c36893eaf76d36a46fc66cb540cf9680036dc6a33471cfc07
+DIST ipv6calc-3.2.0.tar.gz 1645414 BLAKE2B b74406a867b03e22244c1890133ce9553c40b5a737bd1711783e94b7f3afc43cfcff26e12583552a4c0fcc9ecd51174fb20844bddac22732d08e995de9e0f5ef SHA512 f7cd3d8820acd06c016e6f439129516d61300ba1660fe3acfec319f4dbd73de77f0a339bef31fd42bb0a4ab2e68d0e4771b1526f3217d3504cb4605d7b9b0195
 EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed1a4c77d002e8f44d1984641b68cbbc4976b994659b4d6320de7afc244ad3e6a817550b341c3e12a73ab6abcf52 SHA512 a094719eee65deee5e3067fa2c348dfcaa2f7544191f292c94db7b75baaed2932422683bbd8a3b0d73f9bd27f444c226496d396f2b55e735da75e59cf74defd3
-EBUILD ipv6calc-3.1.1.ebuild 1535 BLAKE2B 38a64d668af4ef06e5106513cf29fdfac4407d59e3c8d84dff049fb0227f5084cdc364a3c50b84a38b203e00db4f86f8ee7967848c766dfad0bacad141e07542 SHA512 4f2a5b818e076092d5ecf9a2666887c7ecfd6a7a4a743c41af4f07a93a168cadff86936496070c57ab6f7d44534383e147fa812c057b6bb2a013c5ed9072e2f7
+EBUILD ipv6calc-3.1.1.ebuild 1532 BLAKE2B 94dc5e9c2c3567f8f838e750c5e8ff5bc2deb9f72d6893252a3eca1a29bd647936a23e972979afd28c6888e3e48a203dddac7f21ae2d78713fb59aa23ad9dafc SHA512 4b613ccedda6b597f7bfd226a62a5a5d87efad5213a83940779ba30fac030e792ebf735ebe69867619cfee3804aa616d808f8987242d7cf42bad73eae735e2fc
+EBUILD ipv6calc-3.2.0.ebuild 1535 BLAKE2B ba17e83c53f680a204cbc5467fa30323c07c5c009ebd33b7a820b70b371beab6359ced1f5f5ddc390ea09fba8896205d82d8dcefa96e4b800be78c3e78cfc18a SHA512 d6a0445fb3ef4eca4e0c57312f34d1d94289f7feb6d79d10e4589845b57f7d18401c91555f76757d76e0d970f902df3e907f65e6ee11dfc54fa9e605e4c8c42c
 MISC metadata.xml 335 BLAKE2B 80a2b9fa130b3475f0045dc1626eb166078e1f091632013bcb48af829da11ab8f8c6fa61e107ddf1636eac2282493d370eb639669383f7f00e56cbbdb8ce5028 SHA512 a95df3df487415da7ba079eb8de0466bda61770e128761b8d8a9158aac7b22727287d2f35ba7bc6ad00c2e80037892dac6c9e2ce7ad1beec2bc9b2329e14688c
diff --git a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
deleted file mode 100644
index 86d615e8a1ea..000000000000
--- a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
deleted file mode 100644
index 69f5be77bbdb..000000000000
--- a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-src_configure() {
-	# These options are broken.  You can't disable them.  That's
-	# okay because we want then force enabled.
-	# --disable-db-as-registry
-	# --disable-db-cc-registry
-	if use geoip; then
-		myconf=$(use_enable geoip)
-		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
-	fi
-	econf \
-		--disable-bundled-getopt \
-		--disable-bundled-md5 \
-		--enable-shared \
-		--enable-dynamic-load \
-		--enable-db-ieee \
-		--enable-db-ipv4 \
-		--enable-db-ipv6 \
-		--disable-dbip \
-		--disable-dbip2 \
-		--disable-external \
-		--disable-ip2location \
-		${myconf}
-}
-
-src_compile() {
-	emake distclean
-	# Disable default CFLAGS (-O2 and -g)
-	emake DEFAULT_CFLAGS=""
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		# Disable tests that fail as root
-		echo true > ipv6logstats/test_ipv6logstats.sh
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog CREDITS README TODO USAGE
-}
diff --git a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
index 80ba906c239b..434e03208517 100644
--- a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="geoip test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
index b7026925c586..42eca99cbb18 100644
--- a/net-misc/ipv6calc/ipv6calc-2.1.1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 DESCRIPTION="IPv6 address calculator"
 HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="geoip test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 5755de717e1a..f5954844a552 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -1,13 +1,8 @@
 AUX kafka-connect-distributed.init.d 836 BLAKE2B 983a7eff314d7d09e3d6c01de7187b4b2537afef26143e5f8ec518553dd234940e1397f6217d965e6921b43947f956040cd11a19a9690f966f26f4dcbbd435e2 SHA512 4f999fc28d4f3b7df92d74391041efb17f64b2c4f111a8b2a40a39e50b647f90bc3d363b2b957f8da1fc4ca7fe96c1699f3b09cc0d8ced3b693b091f07dd7697
 AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010
-AUX kafka.init.d.4 709 BLAKE2B 3fb3d09fb715b4c01396406574c21a2127cc7c73a92927b9add59123fb5cc2d9f97c2dd2c10c212eb3bb723a05ab7575c2443a71baa6063b85ef21dce9426f75 SHA512 1c96854b6fab044e1b415e6e9f16964d1d06dc4070dabead9a1b391a9ab2a4b64120e175f8199afbc1fd2a4ba7f7d319932e0d2b5fb1ef0e8cfe55c68313d1a3
 AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f2514272c16379d302019630add9fa1cf840cbe398afc1d36d5a19522aefbbbad635d050070cdbd6ae0c3 SHA512 578dbbb51ec12220f51ee4e80ebcfc3d20e0d921b262673505f50010522f9f67998293a6081357fc0f8b6d9e4a7dc306d4e5f45d4099bfee80fd5cd3f2940e8d
-DIST kafka_2.12-2.5.1.tgz 61709988 BLAKE2B 4e6943058fe25da0cc9285e1e8dbe2be2ad2be5ef52d7c12f9007607e34ba1834d192c45e01275e893dca2e8968bdba07510dbd30ccd106e80edaabc0f7c6dba SHA512 91f96f28c016bdaa3fe025f87ace188417a1e594c8e32b7d23a104aa390bc25f5db5897e23cccf00ea7ede3ac20b3028c10363ebe99dcbd7db2cf6237ee7553a
-DIST kafka_2.13-2.6.1.tgz 65585925 BLAKE2B 639cc9ec9a3b630d01387b1fe4aa12f5e6ba66b751689d48f17af3759fbfc079616a21534eb72bb647cfee0d14ff86757d73e2ee0733d0f69548efceb90be3e3 SHA512 09ec7a39d0e11494ede7d92cf7dfec5b95c6b0218e3b096b731d85ee8c442469e66aaf369a9c6750399719e515ee1bd372d609d6b232e3358e18aa2b57c90e29
-DIST kafka_2.13-2.7.0.tgz 68583422 BLAKE2B 68925221e025c2f380808da672f9ac08c19c21eaf4d3fe732051e02143dbc735082fce55cd40388b980159bfbe8b06666922852492564927c5fcc237bb3f74dc SHA512 f3dd1fd88766d9150d3d395b285bfa75f5b89a835822381490c8428e6e568889054ddb5fada1eb63613a6441989151bc7c7d6cde16a871c6674b909c4edd4e28
-DIST kafka_2.13-2.8.0.tgz 71403603 BLAKE2B 5aae0b9c3bbe26af093c00fb971ebdac2a7ee28e10ba52732dd816d343ae79dad08502f766efb3465ab5d43ee51e3573b240dfbb511330af74d8010aef107eb7 SHA512 3c49dca1147a0a249dd88e089f40af31a67b8207ed2d9e2294fa9a6d41f5ed0b006943cd60d8e30d7e69d760d398f299cafcd68b6ed7bedf9f93d1b7a9e8c487
-EBUILD kafka-bin-2.5.1.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a
-EBUILD kafka-bin-2.6.1.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
-EBUILD kafka-bin-2.7.0.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
-EBUILD kafka-bin-2.8.0.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
+DIST kafka_2.13-2.8.1.tgz 71438574 BLAKE2B 51969ae472665f5716f0ee9df35d627221d1347ea0ddcbc0812774606c3c8251670a7f79eaf93eb3141494042f967e9eeca14ae078937afb6bc29c2ef57bd68c SHA512 91fcd1061247ad0ddb63fa2b5c0251ee0e58e60cc9e1a3ebe2e84e9a31872448a36622dd15868de2c6d3f7e26020a8c61477bc764e2fb6776a25e4344eb8892d
+DIST kafka_2.13-3.0.0.tgz 86396520 BLAKE2B a58b3638dd17ead6677db367003c727ad52827ebed0a5dd7772a56821866b867decb8e8e344106b047d40c6c19ce925c468d3879f4a1ce14f965adecf5b5432f SHA512 86cdeb04af123399858d03431e9777948c1c40ec0d843966cf9bd90b8235b47ebbb5cb96d1f0660710b9286da86bbb5ee65e21e757606f5a1e67f970ae5cf57c
+EBUILD kafka-bin-2.8.1.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
+EBUILD kafka-bin-3.0.0.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
 MISC metadata.xml 390 BLAKE2B b381ee7c8449c21b4036052e12f2442e1480e9790df1e42ac5375dbb13c7c9344e8d2b2f9b80bc75fdafdd023d6a80c2149151233ee7d2908539ef9d998e7445 SHA512 fe9f241db7f81e850901a8d3b7c2d90f043d3b80851132359055e855c9b1c949566aab4a3889b5af56db99e9f18000e40b4f9096221a9bf813ac5e82bb88bf7e
diff --git a/net-misc/kafka-bin/files/kafka.init.d.4 b/net-misc/kafka-bin/files/kafka.init.d.4
deleted file mode 100644
index 064821f669de..000000000000
--- a/net-misc/kafka-bin/files/kafka.init.d.4
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Kafka distributed messaging system"
-
-logfile="/var/log/kafka/kafka.log"
-
-command="/opt/kafka/bin/kafka-server-start.sh"
-command_args="/etc/kafka/server.properties"
-
-command_background=yes
-pidfile=/run/kafka.pid
-
-start() {
-	ebegin "Starting kafka ..."
-	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
-	-m --env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
-	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
-	eend $?
-}
-depend() {
-       after zookeeper kafka-zookeeper
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild
deleted file mode 100644
index 2b5372ad071a..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="https://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-COMMON_DEPEND="acct-group/kafka
-	acct-user/kafka
-	virtual/jre:1.8"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-	eapply_user
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.8.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.8.0.ebuild
deleted file mode 100644
index fb42f54f96da..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="https://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.13
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper connect"
-
-COMMON_DEPEND="acct-group/kafka
-	acct-user/kafka
-	virtual/jre:1.8"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-	sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die
-	eapply_user
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-
-		ewarn "Zookeeper owner has been changed to kafka:kafka"
-		ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper"
-		ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper"
-		ewarn "to keep the previous behavior."
-		ewarn "All logs files have been move to /var/log/kafka/"
-	fi
-
-	if use "connect"; then
-		doins config/connect-distributed.properties config/connect-standalone.properties
-		newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.8.1.ebuild
index fb42f54f96da..fb42f54f96da 100644
--- a/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-2.8.1.ebuild
diff --git a/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.0.0.ebuild
index fb42f54f96da..fb42f54f96da 100644
--- a/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-3.0.0.ebuild
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index f4bdce881399..1e2cb8bc6910 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,4 +1,6 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
+DIST mrouted-4.3.tar.gz 327278 BLAKE2B 3f9182f90170868c0c770cb07ac8d6cfb5a8dce305a9b5e3bb9881e238cbdb246389225fb1524a0765a4c2725402546e07945a406edd78c5c6dd3272a16f263d SHA512 c471e95f5ce6ff017d269ab3005741ecbf1c41931da07f584bf9e28799c3cbbeeb57d8c517dd2fa342b63a460fb4df8f7f7db53312480059509a9d64b5e765b6
 EBUILD mrouted-4.2.ebuild 739 BLAKE2B 0600285e2c195f010ce90cff56552869a018ee311c238aacd22f4e13ae50dd80c794fa1925922aca99e087b4163b1328115ad85bbd4b4e9b33b54031a1f2453a SHA512 ce61708bdaadeec297a442fd5d9059af362786b47f6e7539f2ced24a86200633f5d206da7e031ffa1e3263bfcc7471d4efe2d971c7b7ed7d1d1f46a7be1b72ca
+EBUILD mrouted-4.3.ebuild 716 BLAKE2B d7c391767251635f300684bf18165314999f7dbf844ca2f5e64af13e6725c17eb28e2466816c9d95d204c126611e94805fb4fd7da011fedcfa1b03c55feac0cc SHA512 04549e79911d8bef24297a87aae547128c780c4a713b47b6e9c503f785e929b490e97c133f336c95d16b21a06a7f54ca6a337fb40f0842f0da4ad4e5a7d76fc6
 MISC metadata.xml 351 BLAKE2B 2cc58048ba632fa6ae2147b949a5ac8441b4e10c5cab17527369a1100a5d95cca3746d82c43a7d99b564f07ed68cd95114aa5a13bfd73b07befd1203a423cb3b SHA512 1ccf9c0699efed649eff70b1b2eaf588b9bad3838c1530609e8bb912ace18bd21f35571f7d731727e886cbd7027aae5b234cf3e4959da5d81991724679a815d0
diff --git a/net-misc/mrouted/mrouted-4.3.ebuild b/net-misc/mrouted/mrouted-4.3.ebuild
new file mode 100644
index 000000000000..f46a82c1fafe
--- /dev/null
+++ b/net-misc/mrouted/mrouted-4.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs systemd
+
+DESCRIPTION="IP multicast routing daemon"
+HOMEPAGE="https://troglobit.com/projects/mrouted/"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Stanford GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="rsrr"
+
+BDEPEND="virtual/pkgconfig
+	virtual/yacc"
+
+src_configure() {
+	tc-export CC CXX
+
+	econf $(usex rsrr --enable-rsrr '')
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins mrouted.conf
+
+	newinitd "${FILESDIR}"/mrouted.rc mrouted
+	systemd_dounit mrouted.service
+}
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index ccec39023f7f..400a44176732 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -4,5 +4,7 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8
 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
 DIST ndisc6-1.0.3.tar.bz2 260294 BLAKE2B cb9f302bd4d4f15effc8165dfdc686b2eda7543dd745cae43a24fea49086e3b5c58cc5b4eb14bc1a46657a15f6bd11322d5629570461f68743619deb9cd10004 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54
+DIST ndisc6-1.0.5.tar.bz2 263243 BLAKE2B 638e47e2bb1671a0bdd53edafd65acc774f068442dd6ade398e8bcae5630353f64b753b04237443aa6a6ea27de36206359e93e308fe5e610a4133ed730d71dd1 SHA512 d2742fee8202da988fd6d2b4b811125a4ab786b645b96b3a1fcfe248a3d9a39706055cf499c6cc742decfa5c3dbcbaac28ae01a50b9ad3ec10906dd468fec47e
 EBUILD ndisc6-1.0.3.ebuild 714 BLAKE2B 36f429d37af7fec788201473ddd22f2c2f038223f0c47e33a1413b9b43b5e5b08c27176183e64583bb92d8052f3f04a9ba8bc764271b98a24f5991b880bf16a3 SHA512 064d54c64e2a29c6f6385e828612eca5f1cee2d68df4b68b132852d1644638ad8197116ce1f6554cdd2dd00e6e547e7014b5fc019567a2707195858bcff94965
+EBUILD ndisc6-1.0.5.ebuild 739 BLAKE2B a1243a983629cea9c98843dbd2b3aabe0bca3ddbaa549ecf49ca420d1f0029d587d63bc5f3285ba6ac57b7c775689ff175c5470d0f247ea21bc447ae155ee5b6 SHA512 45de76d5d49a1a1f296e45476e2587d8a47b414b08b725b9ea7414c202cdec8b915f0a60f084cba7bd4d8a581cfff7fe78134165550abb683e3fbbe713f0c425
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/ndisc6/ndisc6-1.0.5.ebuild b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
new file mode 100644
index 000000000000..8304f55956c5
--- /dev/null
+++ b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
+HOMEPAGE="https://www.remlab.net/ndisc6/"
+SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="debug"
+
+BDEPEND="dev-lang/perl
+	sys-devel/gettext"
+
+src_configure() {
+	econf $(use_enable debug assert)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd
+
+	exeinto /etc/rdnssd
+	newexe "${FILESDIR}"/resolvconf-1 resolvconf
+	dodoc AUTHORS ChangeLog NEWS README
+
+	keepdir /var/lib/run/rdnssd
+}
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index 7971ca97b08d..320a2a59bbba 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,3 +1,5 @@
 DIST netopeer2-2.0.0.tar.gz 255138 BLAKE2B a33fa6a952a060a8fb4bd4ad2f2f4e0ab163faef44cd999eb5d3a28706110908bf6350859da1032e873cf24ff8bd9327d0d694edeb35ecb8e0650634dc5d8966 SHA512 789a6fb36f9a3cf9df4ff996b90a5e8f07a24b14027ec455133e184ae96c72a1e8f9adef6d36800139d47d667c54189a2c14616f4947ce0fe72467cb178dbec5
+DIST netopeer2-2.0.28.tar.gz 293502 BLAKE2B 0ddcede996167c4479b8172e39f80d92937858f1accce1aa62afff970fd81b4be2fc46475be4d04ebecbfc3124b692552b0ff653310e6f41942bdb7ffea234d4 SHA512 dc594b73d98d611f77cf6451ae23c35a6f4ecfb400e2ae34d321fc81956013fffc9f8267e567529cd3d92966a0930935e03e7d58d4e97187558b75cdf2e2c1a0
 EBUILD netopeer2-2.0.0.ebuild 923 BLAKE2B ec65dfc84bbeb329af7a3da12a4520ce41addb79f2a04deadb19ddd54f46262d25b7715223731cb6739f1fa701e39c13c5d75d178f4f91a811d9694cbd9ca50f SHA512 b85af038622f580bb0fc3005cecf0ee3200b525b2e2440b5a9a3f4b11ca5bcc3a43524b1725759ff12e2a2644143fa3286e073ad25b6320f2cb3fb1524feb509
+EBUILD netopeer2-2.0.28.ebuild 979 BLAKE2B 2ffaa730fc36bad2a5232e3c721ef27b1334e8aacdd372643af3a19ff777ec7eaef0e68e122b3261ea607a3305ba4312b63a2efe09c7ee091cdd66584c011053 SHA512 f16faf2b767bc715b13a41be9dae6489985c2b3b3237d234ea4b7b279c3bd04763ddb05b3e8679189b9e4e057d0777806810a1416bb6d9b71e146632f0adaad2
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.0.28.ebuild b/net-misc/netopeer2/netopeer2-2.0.28.ebuild
new file mode 100644
index 000000000000..35ce893a9f95
--- /dev/null
+++ b/net-misc/netopeer2/netopeer2-2.0.28.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Server for implementing NETCONF configuration management"
+HOMEPAGE="https://github.com/CESNET/netopeer2"
+SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:=
+	net-misc/curl:=
+	>=net-misc/sysrepo-2.0.41:=
+	>=net-libs/libnetconf2-2.0.17:=
+	net-libs/libssh:=
+	>=net-libs/libyang-2.0.88:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGENERATE_HOSTKEY=OFF
+		-DINSTALL_MODULES=OFF
+		-DMERGE_LISTEN_CONFIG=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/netopeer2
+	doins -r scripts/.
+}
+
+pkg_postinst() {
+	elog "In order to do initial server setup please"
+	elog "run setup scripts located in /etc/netopeer2"
+}
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 8cc3112e1915..da05fbdc1af4 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -2,5 +2,5 @@ AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3d
 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
 EBUILD nx-3.5.99.25.ebuild 3399 BLAKE2B 8374b0636f45bbce371c9d2c08f0f87b25f85248a216ca3f7213b5a663952407237e8647e4099ba749efc5f114550ef05106ca18a5e502aad8ed7eb3c8233ef0 SHA512 f14f778992a7d4bc75656a99de471505703305f4d1ec66c11ec4694821d5d8f2746aa4a84ec1f9ffd522db230669a67df9dff43d6b16f90b0d2bf0baee55aade
-EBUILD nx-3.5.99.26.ebuild 3520 BLAKE2B 1ae7719c98dddc863f54152c08936ebf27c23cb0b74b77cbc06ee47ea7ea2d0e2c11edefe4beac15a8cdf84d0c27a8e89237387b917b18fa16c0e13503142745 SHA512 44eb366461b831386e5a8869f9a2443a8d207f54fe087c93bbe75a79a9e7b721171773f63ff53889575473337374eb09edca710e0547330ab7896438980d2b7b
+EBUILD nx-3.5.99.26.ebuild 3518 BLAKE2B a93f7fe62e8261d380b8a0e243585c5f6e02029a905a48fa44214edbeb962b97888849ea75e6cecadde5fce61ea18803039999b555684e9abc595826e973e6dc SHA512 a63dbdc2de74fded16818f615a439d7a4647a9fe87e665d077e4619ac644ca58200c8622561bbeff9bdf5ef1deca7d2acb97d91e40201d741ce997d44ffe5221
 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 17d9b3f5472c..2c7adf32ba37 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="elibc_glibc"
 
 RDEPEND="dev-libs/libxml2
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 29bf94ad2442..bc228ad7ae73 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,3 +1,3 @@
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.1.0-r2.ebuild 670 BLAKE2B 6ba8d21aa1047ad533510c09d2e07dd1099a48c91fce2f8319fbc0909eaa17795543106c7d6e1a352b08e974f47609ce2c304bdcf9f7e74207b6727878277ee7 SHA512 433e8d5d24b9955a28f4ffdb557dbfacedd52e54bf6b12a76db64617974339392e1f9fc3cc6ec011e943448b5de8352adda3084c474b36bea09408a6520e4872
+EBUILD nyx-2.1.0-r2.ebuild 635 BLAKE2B 96c501b3ed2f5c92b4992fd81e00d57930bf40ea545a899ae185b94959268c614ffb2b0f5c399023e381d97127d7ce15f2e9db4e9cdff088dd5270b9f0f57810 SHA512 262f8a6361135d6c839e05cedac8ddd1c96ae66c9a63221ae162550f1da30e20c72b81d20eb4255623ff8970a16c96a294151cce49bafdd34503aa2a2d06ec99
 MISC metadata.xml 329 BLAKE2B 089c30db84b27384d6b7814fa6f8a5ab3ce4c40cc0c95538fd45262b79df25520c0780013548ed6dc7511fc815c25401d38d37f60ce4ee0e2a53bfbe99f6b183 SHA512 d969896fb35aa789b119ad623b7d4e63518cfb2ff0f46cff3f299db828a0918646b6634c94c901ffd847b1c1e0e4b722f2b0015034354886eb94fc8bc29071e6
diff --git a/net-misc/nyx/nyx-2.1.0-r2.ebuild b/net-misc/nyx/nyx-2.1.0-r2.ebuild
index e3daaf75fa08..7c6aeee19674 100644
--- a/net-misc/nyx/nyx-2.1.0-r2.ebuild
+++ b/net-misc/nyx/nyx-2.1.0-r2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=(python3_{7,8,9} pypy3)
+PYTHON_COMPAT=(python3_{8,9} pypy3)
 PYTHON_REQ_USE='ncurses,sqlite(-)'
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 675355439a35..529452de4d56 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,4 +1,6 @@
 AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241e40e88fdb92c15560f9a8744922fea9cf83114a242315de910fe849918e9e26f7b8ce63831ad SHA512 ef86f8e4d3b30d98eee5849c85fd8fd1bed0d8ac9c76bcce91440483439dbaea36e1ff3529fe8f5c1b0255a91917ab67d98513cafcae8f0031cce1bf3f133704
 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
+DIST ofono-1.33.tar.xz 1060408 BLAKE2B 646a96c0926ea032fef0357aabe6a4be6da88f4ccbdff59bb86b5de73a9b469362151b212a05234619f5d616b534343137c66e923782c7d50dfe13d2bf66558c SHA512 8d88226aa2b43eca840c6330045ee7a96c91f6003b06fca5ea55b74fc229f0e0ba0c8d98f7945f8c23ec5a8e7057bffef6335c61842e245686e0ed7c5feda589
 EBUILD ofono-1.31.ebuild 1635 BLAKE2B 45b6875cd3e99ff72d5bde84c7f17f14bb74e75676afb68f006f5befce85c1221fa8249d5c3cb294ce3c2e4eb441b7d80d90af56f26973a3396f59aef6d17711 SHA512 9518abf4fa61f8812f7e5dda459565e3ee5168e3777522256301227152e3e03f6293e39ad41e6c1b7fc946b55997c937cc1193363808c54101ea01a4125a1bb8
+EBUILD ofono-1.33.ebuild 1642 BLAKE2B 9371d2e464683c5c756d62fafdfc8a13fb5ef6a8cf8189467b023f7df40e1c7b6cd5bbbebb62aed9cb5ab379381a5e52e54fca9056ad5f823b1828e119f21261 SHA512 5985af743c2d82bc9cc265fecd362c01fd07bf56454570ebc130a8df434a669daf598e847bb62d5a3c62617fc550c882a0dab8314cfbd9969dbe33e40723405b
 MISC metadata.xml 952 BLAKE2B 9980756397330c03bd0f21db6d44e4af119135b9a864d4cdc97a697e7f0013051985c7db3c48d8d17bd592cfaf185a81add398d3e0a3ddc64aa61979a1603d5e SHA512 a745e9cf9a89e3c989cd950651c3d914ffe17e34f32f9623c468127011c6faa35942484d24c34c217b614b295743120a035a56aa30ae79343a72ba5cfbc462f0
diff --git a/net-misc/ofono/ofono-1.33.ebuild b/net-misc/ofono/ofono-1.33.ebuild
new file mode 100644
index 000000000000..7b3600dc6b80
--- /dev/null
+++ b/net-misc/ofono/ofono-1.33.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="https://01.org/ofono"
+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 ~riscv ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.6
+	>=dev-libs/glib-2.68
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		$(use_enable upower) \
+		--disable-maintainer-mode \
+		--disable-rilmodem
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index c796f1a93621..44a089417fbb 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -6,5 +6,5 @@ AUX oidc-agent-4.1.0_makefile-toolchain-vars.patch 1439 BLAKE2B 9e3477c1eb3303cf
 DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
 DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
 EBUILD oidc-agent-4.0.2-r1.ebuild 2134 BLAKE2B 3a654a6b6e3c8bafa04001580abef231ed3b71f4e15b7a918f771f8f93442e99b0f0a77fb6332da74b63def9db04d9c4d0ea8df91b56c1f22aa6499639710189 SHA512 b65d825c1d5fe74a7693d62a8d51c725f11b75f1c873ae9deac3d43802eb234c009ab985ea561a3bfeff01b4bcd4186a445a52895232e5823f721d65e739cdb3
-EBUILD oidc-agent-4.1.1-r1.ebuild 2138 BLAKE2B 245ff9f15799908d0d600fa0f5847c6e2d7b915b06f3033ac16c385d6d16a753462f768a196759491699c071e29fbd7cdd458d9e0e21cf5ab9d59395977841ed SHA512 ae6190512ad4046e59bc17b6afc0c6d824615fc611c2b2cf569505b1c5557637cc6333f62a09234eca7fe939e0d0bbb05eda088630f84db1e2fb37d01329c2c4
+EBUILD oidc-agent-4.1.1-r1.ebuild 2137 BLAKE2B 749784644c7ab3a5665dcc2265bd98f5bfdbe32909b4ad66745cfaab154832697e29bea3538d4878130bb36865af100569f81288f42be41a1354e08b80ce118a SHA512 3298f8ab25b46039650d9ecc71ee3a5b0d8e0f17a41c6e156b9e484e8c03539754cd60c21c419c867f1116251169217e06f1d5d167ab817dc6951d2cda5ac007
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
index eb94432fdc16..efb002fd48f8 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index aa431d74763c..cac07b17284e 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,6 +1,4 @@
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
-DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
 DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988
-EBUILD omniORB-4.2.2.ebuild 2356 BLAKE2B 399814240e5c0b85626ffb6800812207be3d7a3929d2defb4fc7a0f857d9d3f0187eb6986602696f636d30dcc527a85f7d51a985cef437196eb238ddfc750919 SHA512 f1019973a9c3feab9b118df4f9dd76cc028e995e5ec488f7b2d9822cf030ab1a9cb8c5ecd2779a3595cf2e4b3d5772653f95e18bdd11406c0a474a3e8460aaae
 EBUILD omniORB-4.2.4.ebuild 2356 BLAKE2B a245ac15e187ed3a520ed6c41d3673dfacc72b9ba94e9b4764b932627fcaf1b5915aa5af80d737e69d15703b0d2ee0b589c43d508bb7897680e697538480149d SHA512 25d9491129305db575442b6d732530048ae24c411224098dcf5633efcb1747e98c2cd900f769fc1e92371d0298eb7c41322d63b7f45ebeca8df68c336dacc36c
 MISC metadata.xml 248 BLAKE2B 6b95a9a2c894490085abcf451cc5d598f356cb34085ae0a247c4c3d4943a472c947983bf2f90242bb949e09485f95a4f7a368593a24f1638606c2bbb9a12e8fa SHA512 b1b79973bfd62795feea524b26a30a5e00b230d3f6416f94cd912899d8b1e22aa3a78e71f8333382a19a41a112e21b0af17b88993b137a87c5b38f81028e6670
diff --git a/net-misc/omniORB/omniORB-4.2.2.ebuild b/net-misc/omniORB/omniORB-4.2.2.ebuild
deleted file mode 100644
index 403726b19216..000000000000
--- a/net-misc/omniORB/omniORB-4.2.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1
-
-MY_P="${P/_p/-}"
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="doc ipv6 ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# The OPTC(XX)FLAGS variables aren't present in these files, but we
-	# will set them when we call emake.
-	sed \
-		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
-		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
-		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
-		die 'failed to switch CFLAGS variables in the makefile includes'
-
-	# The out-of-source build is suggested by upstream.
-	mkdir build || die 'failed to create build directory'
-}
-
-src_configure() {
-	cd build || die 'failed to change into the build directory'
-
-	ECONF_SOURCE=".." econf \
-				--disable-static \
-				--with-omniORB-config=/etc/omniorb/omniORB.cfg \
-				--with-omniNames-logdir=/var/log/omniORB \
-				--libdir="/usr/$(get_libdir)" \
-				$(use_enable ipv6) \
-				$(use_with ssl openssl "/usr")
-}
-
-src_compile() {
-	cd build || die 'failed to change into the build directory'
-	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	cd build || die 'failed to change into the build directory'
-	default
-
-	rm "${ED}/usr/bin/omniidlrun.py" || \
-		die 'failed to remove redundant omniidlrun.py'
-
-	cd "${S}" || die "failed to change into the ${S} directory"
-
-	dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
-	dodoc -r doc/omniORB
-
-	if use doc; then
-		dodoc doc/*.pdf
-	fi
-
-	cat <<- EOF > "${T}/90omniORB"
-		PATH="/usr/share/omniORB/bin/scripts"
-		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
-	EOF
-	doenvd "${T}/90omniORB"
-	doinitd "${FILESDIR}"/omniNames
-
-	cp "sample.cfg" "${T}/omniORB.cfg" || die
-	cat <<- EOF >> "${T}/omniORB.cfg"
-		# resolve the omniNames running on localhost
-		InitRef = NameService=corbaname::localhost
-	EOF
-	insinto /etc/omniorb
-	doins "${T}"/omniORB.cfg
-
-	keepdir /var/log/omniORB
-
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/omniidl
-}
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 6f42deda9473..1ab0f3285673 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -2,6 +2,6 @@ AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add0597
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
 DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
-EBUILD rdate-1.10.ebuild 744 BLAKE2B 0abcf56513a377a525356f61fb1cdb75067e9e258625fb8b2a2640a8aefbfc138e2ded225016c08fd717cd6ed56d8a995d47ecb80149114b73c96d6cf12a7d2d SHA512 a51f39d3890da382e25f3f5c93f793ebd760deb9ed510e809cd2cfaf12939c3f9b85f6da97793239c194b075942d40993272e05be984f5db99ecb8e4e5d32cc5
+EBUILD rdate-1.10.ebuild 743 BLAKE2B a3241a2734fbde24280b2a78cbd91b11151d7536504ef01229dca386198c524f417b7c4714e1788a77ffe77515fcbf2b9c92cdb3d0523d1f899fc20a866a29ae SHA512 582511eb5b1c66b6575a4cf7f2e8a9663013a612f25943213d392e418e1f3b8b0786cb8ce45446b84250c3336c0838e72b6a220b2ba78ed7a687c89b4655b480
 EBUILD rdate-1.4-r4.ebuild 830 BLAKE2B 1a8a3f303d06b50a53cd86bf2f8973b269824b91db1f01dff92f9bd9be59c2e3fe7adb229edce00f36be62ed2fc1594b259a07fb7d82ca9198f777086df504de SHA512 b7924e5b106f30b6df99c0ced3dd37e6e3834ce7407bd46ef62de66c2ddf5e1c955690bbb3af0de9059e0c37398f09b78225189d8c4495fa107e79b474027d50
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild
index 2a7e8d09bc57..6287c785348b 100644
--- a/net-misc/rdate/rdate-1.10.ebuild
+++ b/net-misc/rdate/rdate-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/libbsd"
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index b33d973155cb..a53d2dd1b7f3 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,3 +1,5 @@
 DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb
+DIST rygel-0.40.2.tar.xz 1696072 BLAKE2B 9071be84a36c603f4c113c5741e427a9b960e97b7262b41c4e4b96bd125ee938508fbae9eceda1dbb9ac9d8cccb096d5fbb3545adee36895845908e79b0dab59 SHA512 23bd31ef4d6d605797dffea4c71eee3770889f5ec54ece39df3743b82973eb0b42a54f3cfc1123e870976f9927987d59d9c0c2b9f69cdec731168dba118b1771
 EBUILD rygel-0.40.1.ebuild 2198 BLAKE2B ef3f3b236482562b9394f8fccdbcaba8f42f5f1b4c3b45db32d99a47e1b3e1fe47c49cd82584760fe51cb907436035a23e730c8605f269a76720fd7e6ec4e36a SHA512 5516705acef67f4da77d2f94a158b8299dd5255268f1ad623527906b6ba92ee5cbd91066e7a455c581462632299b29e1f7f333b171d50c4e14cc8e45726359f5
+EBUILD rygel-0.40.2.ebuild 2196 BLAKE2B 8e795389da6068c88887ab07b0b5990cb62b8cd903b31289bb6d008dc0748a35fcb9ed16162ea3de07cda4dc0594a59e00fcdaa8b9918eef2c4ade87d655b47e SHA512 2f2e23b44b0e2b470c861ceeec76652da6a0f60ec1b89e0325ea2397f2d22154f91d5a0ed5751bf3aa88c6a45e351a9ce5fd0e1eb694cf4917022c2350be6a5b
 MISC metadata.xml 432 BLAKE2B efa83d6c3c964e076185ee541b7b25c59a7f46dd53f96900cc9a9b617133b476ec21747f6b70392fb3903075032774252b1580d90e512c0123d2dfc779d7591e SHA512 b8cf12e9798b778551cdf099ab7a87aa606e6c68697db1b1eb37e673cd2368781c80c9cbc41c5b492997ad4b39eed9f68075f7c4be8ec21ad021470757b72d1b
diff --git a/net-misc/rygel/rygel-0.40.2.ebuild b/net-misc/rygel/rygel-0.40.2.ebuild
new file mode 100644
index 000000000000..36099977232b
--- /dev/null
+++ b/net-misc/rygel/rygel-0.40.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.42"
+inherit gnome.org meson systemd vala xdg
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/libgee-0.8:0.8
+	>=dev-libs/libxml2-2.7:2
+	>=media-libs/gstreamer-1.12:1.0
+	>=media-libs/gst-plugins-base-1.12:1.0
+	media-libs/gstreamer-editing-services:1.0
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=media-libs/libmediaart-0.7:2.0[vala]
+	media-plugins/gst-plugins-soup:1.0
+	>=net-libs/gssdp-1.1.0:0=[vala]
+	>=net-libs/gupnp-1.1.0:0=[vala]
+	>=net-libs/gupnp-av-0.12.8:=
+	>=net-libs/libsoup-2.44:2.4
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring:=
+		x11-libs/gdk-pixbuf:2
+	)
+	tracker? ( app-misc/tracker:3= )
+	transcode? (
+		media-libs/gst-plugins-bad:1.0
+		media-plugins/gst-plugins-twolame:1.0
+		media-plugins/gst-plugins-libav:1.0
+	)
+	gtk? ( >=x11-libs/gtk+-3.22:3 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	$(vala_depend)
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# Maintainer only
+#   app-text/docbook-xsl-stylesheets
+#	>=dev-lang/vala-0.36
+#   dev-libs/libxslt
+
+src_prepare() {
+	vala_src_prepare
+	default
+	# Disable test triggering call to gst-plugins-scanner which causes
+	# sandbox issues when plugins such as clutter are installed
+	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
+	#	-i tests/rygel-playbin-renderer-test.c || die
+
+	#default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc api-docs)
+		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
+		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
+		-Dengines=gstreamer
+		-Dexamples=false
+		$(meson_use test tests)
+		-Dgstreamer=enabled
+		$(meson_feature gtk)
+		$(meson_feature introspection)
+	)
+	meson_src_configure
+}
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
index deb34f8cdc03..74dbe56aa4ca 100644
--- a/net-misc/sipp/Manifest
+++ b/net-misc/sipp/Manifest
@@ -1,6 +1,6 @@
 AUX sipp-3.6.0-parallel-build.patch 309 BLAKE2B e5c790cae99c31ba4cc79800f2991787401865b41bc270ecb648a9534da0322ef0b0a4f029146c7fca013f295565bc18c8c424139782a42de779b75e775e3b3c SHA512 41b052b3612cc3cd4afbd0a1437a4502c27e3cd948d800a4229c99561a88d1dc488f1feb06aa68faae83d9acec0977e3f4be2b65fef4cd5c541e2b4a023a9ff1
 DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e0f20c6c3cf9b72ebcd65cb12cf4cab2b90e010d16e17b9bb4832f42915b104ea9bd1253242d304ab4f3cb32 SHA512 eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12
 DIST sipp-3.6.1.tar.gz 744407 BLAKE2B a201ecce624c15c51a66c3cb5ac467522755085419c2980b1f76340e7ffca5996516f34d7e52776a8aa0a2170ca2b7301030ecb50272a1c0a8e86aaf18a6de16 SHA512 58504c56ca0c14363fafc5d0598fd93857ef33cc5856f579a225fd0e38238f7d2c409127a18a368e22355cc3912758d4dba07bac7eaa3e8a0d2943ea5fdec602
-EBUILD sipp-3.6.0.ebuild 960 BLAKE2B aff654d4ba7a2a4bf00b5151242e9fe57f711ac6fe67e2d7e6746955f4d55f2226b6181fc423f61ca115ac95228be64b232326d8d4c4a8950e5c601171cac430 SHA512 1a4585f9b910b5e67f2abf71409c09515af2713b0199456a34be6a23bee89a24fec66f6840790593bd29c980ca02f5fd613c5292c23604e7ae6e921d2fc57728
-EBUILD sipp-3.6.1.ebuild 1136 BLAKE2B 86020f84e324244bf93969e5a68e8c9a4fb674d50c3fb6f89819fbb1346782a0fb676bc966f1dfc07d9f78930efb5dca00af46bd1f58ece4f13bafb4aabf3881 SHA512 744eaa702c6fb0def430cb1effd1dda82be090135c58ffaecb21be185a4852ebc823aadc3a9a370ca4bbc22d37c6820fe8fa0e0d93b56290aa387163b4d59684
+EBUILD sipp-3.6.0.ebuild 960 BLAKE2B 550163f90cd8fd1e4ad2df50ceb28865f1d04eca6e9fe1a0801994480ab05350e9f6de621adbda5935f0d1c07013be0ec9a3aec5150f4c3e18f2834f3af5be66 SHA512 5f843a13eb4c22b7032ad3945b1247b20396041ba114b9d6b73072f5378fa0a7c9ecf1eb864090fa7ada6dcd944dfa34555b897491b8c63eb0e029bea3c7215d
+EBUILD sipp-3.6.1-r1.ebuild 1146 BLAKE2B bad94a87d3d0f791d81fd81e30384497cb4ae7d6e61e969b67456db7dfbdd11e675072fc7d912b6306426e10dc6bfb1a2179bec3d50653d4ba5cafa3dbecb6f6 SHA512 0bccc850330609892e3c2200e6b181bbf58bb6c76394931fb7508e65fffeda554b3cdfb703835e87c64c79eae7395d4d8196421e82b82850618ee5720ebaeae0
 MISC metadata.xml 487 BLAKE2B a78cef4eea5698358a3f5a9272f427c45af6d3268f40ec15d074fe66cc53eddbf082452b74f84bd859ee93decc1afd90dc82c109d39027024f6111cb74d40684 SHA512 317ba183367cb851a6e3fd535038df2c0ed277f7e5e22fd025f61b9ccec7fe7d4e880e56f92fdfa25248d22808c1ebbe6e57524722f39b12ca2dfe2b52b18c53
diff --git a/net-misc/sipp/sipp-3.6.0.ebuild b/net-misc/sipp/sipp-3.6.0.ebuild
index 5ffd92882ca4..bc7ef82c8b22 100644
--- a/net-misc/sipp/sipp-3.6.0.ebuild
+++ b/net-misc/sipp/sipp-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
 HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases"
-SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${PF}.tar.gz"
+SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 ISC"
 SLOT="0"
@@ -42,6 +42,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	insinto /usr/share/${PN}
 	use pcap && doins pcap/*.pcap
 	dodoc CHANGES.md README.md
diff --git a/net-misc/sipp/sipp-3.6.1.ebuild b/net-misc/sipp/sipp-3.6.1-r1.ebuild
index bff0d1ab42ed..d46f12c26028 100644
--- a/net-misc/sipp/sipp-3.6.1.ebuild
+++ b/net-misc/sipp/sipp-3.6.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake
 
 DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
 HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases"
-SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${PF}.tar.gz"
+SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 ISC"
 SLOT="0"
@@ -46,7 +46,8 @@ src_configure() {
 }
 
 src_install() {
-	default
+	cmake_src_install
+
 	insinto /usr/share/${PN}
 	use pcap && doins pcap/*.pcap
 	dodoc CHANGES.md README.md
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 63c91e7d3ec1..7dc392daf142 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -5,7 +5,8 @@ AUX sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch 477 BLAKE2B c71d4e
 AUX sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch 1671 BLAKE2B 1847efb5fed4e5cb2d6580d172a662e1af48de607d07218be5c450908689374ffdb9674b00b4cecfd2124fa98e4b8277b42d47caa4ef1c0205208aebabd6372c SHA512 16f4d27df6c0e44491529c721f93cfc8686be6826d1132c3ae90de3b49f1964de4ec9adc1e03564e6213135ea38d40641039c40d344555888f3cc7746be611c2
 AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 549 BLAKE2B 7e9c1d30fef853431323e09ff186d207c7820c4773f6924579b9ce32cb795295104c75aeaefb79eeb2dd2275ae4c44c5d55c532bae7e0c6b4f69b2e8a1fb5ae6 SHA512 369fac53c1713a009578f7ee6c53b0d66439cd73c705d38897634251992abfc2743fa113fca807c3bae26ad0a155ebfa085b4f156b4a48882fb25520263f11e0
 AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c89f259b5e3a9c28dab50d563472f8e85a07d11853b076123f58e8abd7eaaa5e8d8d34a5295d0577655069a6e9dc404740566000b7cb160bb4bdf3fb52d SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4
+AUX sitecopy-0.16.6-32-neon-0.31.patch 346 BLAKE2B 7140d51c507ce81e568806e6c3ac3a00cadc0fcc00cfa55150de3718039365b7ca4c79f757331b639c1c182c979288a308241def2c7d03ac7d3b0e64091b6bc0 SHA512 87b2d063b463109351789c259c0d879a96144bf9c27c8a6bd3ddabd21b6b152d73a04a7311e3b17266b42b5c0f30028402b4a8e929154b867a055743a275623c
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
-EBUILD sitecopy-0.16.6-r1.ebuild 1978 BLAKE2B c7a74b61d04be2b0fab0607ff18ae3a3293c5114b0bef3cf6d1fa0500e88eb592b866087f29de2225829fb0ad8f8cb26828265fe9f0e47e647bb4c22b33d1d40 SHA512 6ad9aac3cf9a7352acf8109fbd2309e896e8f0e52adb1e50bcf235f61886e9db1ba770fe8c62c4894b494632b8989fa2a08be482b07743e6d846027bb9682e79
+EBUILD sitecopy-0.16.6-r2.ebuild 2031 BLAKE2B 78cd9aeea12a3deb670a07b92520722800dfe1bdd508805172bc88e40a55fffeb41bdab4354abc4090e728acbf03658953c60b90abf22502e65c29a53d8471fd SHA512 4159d5f8ab37da5d67e06ca0e75cf77653e3183187cc476982853b44ca7a4bedec06e6adc009aab1c6a0fc70428facc3fc0f86dc338b929270a1dc924a768e01
 MISC metadata.xml 612 BLAKE2B 0c206ae7b2894a24efa3c7bf0c98a6d8bc2a4eaae0a4015fd55d793e2cd2462a82c4a0ab4983de7f0dc3ee85eb216d997c73e1fd769d36814ce6393600ae0581 SHA512 026dabe1f9f701a737affa9da967118ab722d49f5ef289fd3ea55147b09326c7223711887c2c8258fcf9fdab775e24f687f773a732c502f602a53184de239dec
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-32-neon-0.31.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-32-neon-0.31.patch
new file mode 100644
index 000000000000..c07c5085a348
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-32-neon-0.31.patch
@@ -0,0 +1,13 @@
+https://sources.debian.org/patches/sitecopy/1:0.16.6-9/32_neon-0.31.patch/
+https://bugs.gentoo.org/779847
+--- a/src/ftp.c
++++ b/src/ftp.c
+@@ -634,7 +634,7 @@ static int dtp_open_active(ftp_session *
+     char *a, *p;
+     int ret;
+     int listener;
+-    ksize_t alen;
++    size_t alen;
+     struct sockaddr_in addr;
+ 
+     ret = ftp_open(sess);
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
index 94aa7118251e..3b63980075a6 100644
--- a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,7 @@ src_prepare() {
 		"${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \
 		"${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \
 		"${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-32-neon-0.31.patch" \
 		"${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
 
 	# Source package uses incorrect '/usr/doc' for the doc folder.  So use
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 5ab8061fead8..7cf4fede95fd 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -7,5 +7,4 @@ DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b6
 EBUILD socat-1.7.3.4.ebuild 1532 BLAKE2B 798d515cf02e7ae01ff39357151bb57d6a2d29594e6fdcfabefec77432f6ca94b73cf697850a83558c675bf83cde86bea452358fe574e1b64bb6d53b786c916c SHA512 92c581282a689a04bc8f7a9300d9565ebfa1a45b1ad18e114e7cc539055ab04bc962e92292aa1873d816d0ed470bb05c3d57c888d2b1cd923e0bf49357b9e4dc
 EBUILD socat-1.7.4.1.ebuild 1479 BLAKE2B fe50e1861da8d2e17344ae1df1e6433ea7ad694a7ee8a19953a6d35afacfda16bb34813391f35483224c71a93d214eb5bf928f8ab480df384d988e4c105c897a SHA512 9a7aade38d9239f319f1f2fe313ad4ed9ca9040bfedd14d1329294cada49b76aa924b66a4c792e31ed0e58f4431818bdcc42a6ef616d0c72ccdc08f49477af3f
 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a
-EBUILD socat-9999.ebuild 1351 BLAKE2B f403fe50adce17a9a9b60e3f60760a8d0236a85371a7b9bb5148a8a8093adda5d06a153d6de73a3cdd57ffe9d707d51df6e70966f49edde7dce1d2dcccd66d84 SHA512 d6744cbb4749a03de8ab462303accc428a294d56d4791a7a644eab94346a379a30f4927351a8302a3871ad7b9921951a5c636ab2f4792a9603b949a11a5e54b0
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
deleted file mode 100644
index e0872e55666e..000000000000
--- a/net-misc/socat/socat-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
-EGIT_REPO_URI="https://repo.or.cz/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-BDEPEND="app-text/yodl"
-DEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	readline? ( sys-libs/readline:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
-	test
-	ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
-
-pkg_setup() {
-	# bug #587740
-	if use readline && use ssl ; then
-		elog "You are enabling both readline and openssl USE flags, the licenses"
-		elog "for these packages conflict. You may not be able to legally"
-		elog "redistribute the resulting binary."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug #293324
-	filter-flags '-Wno-error*'
-	tc-export AR
-
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc doc/*.html doc/*.css
-}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index e3496a412624..7bd0626cdfc0 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,6 +3,8 @@ AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc55
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
+DIST stunnel-5.60.tar.gz 984278 BLAKE2B b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228 SHA512 4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e
 EBUILD stunnel-5.58.ebuild 2951 BLAKE2B afa7a612d238ba4e1195da562a63d632472cac4c11affbace964201206e7dfe472fd757ab548c0a2834e0b8cbaf4a1f44bd34d888a37a8dcabe04f57ef76cd88 SHA512 947e8b54f6d21b980bcc4afcd43a644da26ff8565fa6ad312c8086d2c782cd345a20fda94781296df4e8c913b5e0b88ddf582588a430bce4b9d4bbde05c3c651
-EBUILD stunnel-5.59.ebuild 3004 BLAKE2B 18ae3e208e065f910159202d3ee2635d100deb1e9be0ef903f5cee3b44ab4f0c604aaaf0ae91d62f28bfbd57bb50caecc5f1e5c004122219cf3ff33aff80cd19 SHA512 380dd888e2c5e313796c091fc0b50da00da6f98227cffd4b5fd5f90663592a327f9cb175b2aaa997a76656066c3f080ecd993ae0dfd467cc8d1159cb4d8eda49
+EBUILD stunnel-5.59.ebuild 3000 BLAKE2B 4ceec56ff378cb02dacc41004da9d8ff02b7c3bea6b54ae3ab899022c69c0ea3cb456583f47dcf2b71f59e4a0d10bb2bec8b524495379caf4a8e07d1c13a32cd SHA512 9fbeaf1d9397904340f92c5a1fbd91f4d188671b9381efdee339819c0d3c2137bcb2ff0bd252ed9fed26b5acada830b3e60c5be0b5734733d9d6bbceb31b7898
+EBUILD stunnel-5.60.ebuild 3004 BLAKE2B 18ae3e208e065f910159202d3ee2635d100deb1e9be0ef903f5cee3b44ab4f0c604aaaf0ae91d62f28bfbd57bb50caecc5f1e5c004122219cf3ff33aff80cd19 SHA512 380dd888e2c5e313796c091fc0b50da00da6f98227cffd4b5fd5f90663592a327f9cb175b2aaa997a76656066c3f080ecd993ae0dfd467cc8d1159cb4d8eda49
 MISC metadata.xml 797 BLAKE2B 223460276faf20ee415c5c0137aefe26cfd54df0049cdfce1c62bef53aeef6c9f35967d05995b8a3a2e8958e427ae34dc3acb26aa7939d7b52f8996d324480f3 SHA512 a391483377cbdf230f6d41f9dfd88b76a2fb3219b868b4c090e6ba977482378599f1d087d884f88b31f2a76e2fccd37f72ee6a7cb39aaea5f4b6179c64e75fd6
diff --git a/net-misc/stunnel/stunnel-5.59.ebuild b/net-misc/stunnel/stunnel-5.59.ebuild
index 7f0616ce3608..baab2f384b1f 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="
diff --git a/net-misc/stunnel/stunnel-5.60.ebuild b/net-misc/stunnel/stunnel-5.60.ebuild
new file mode 100644
index 000000000000..7f0616ce3608
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.60.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable ipv6)
+		$(use_enable tcpd libwrap)
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	tmpfiles_process stunnel.conf
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 0b139b8df5dd..fd7e4e289ac2 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,4 +1,6 @@
 AUX sysrepo-2.0.1-cmake.patch 749 BLAKE2B 40419e1ac3cd9459587f5af1a54a89cbce3b770e81e2c891a6a5dd8f12da9499cdea470951b65233ac43095282892069a976b2f13753332a3981d9779a635ec2 SHA512 9b2d89bf5f6fea6b088d672c51c6b7691375ca2d824c350b9d21cb72df6f290d31681b51426dfd8d2fa5d027e49177e4d6f7392fb758de5718ecd59a9a674597
 DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953
+DIST sysrepo-2.0.41.tar.gz 648603 BLAKE2B 98aeaecf8b79fd93ce8238d00ef36dd7238b5aac43772dd393d5048f689204a7ffb4985ba847b691b072476e18ba4b3f5ff467286ab08cf4f949974a02116f2b SHA512 edb61d9a29d7ee541ed48dc98a9d1cfabd1faf40676e3174f155a895530c543622b2d058b016d7af23836a42e41980b8ce8eb3fed2f38de7c254382937bb16ce
 EBUILD sysrepo-2.0.1.ebuild 784 BLAKE2B 62ef44c179e4b30451b6c9b3eac3cb8d2ce3b218a5295d1c52d7116dad8c13e71bf6c28db7dad1b34ae6fd0fc593e954a40820c942ef42607ab1ae8cb582178c SHA512 6a53a695e039e954e842e4019e46f84bfabb1a42d55c3cb296361d9ba5c702f23b478601a3c0d952f9549b66df44bfe41ab050ffd1c8f8ccfa2a301afc8586cd
+EBUILD sysrepo-2.0.41.ebuild 773 BLAKE2B 67956f4ce765b3f412506d9e4f9c9fbb34467c31686c407efbaa9ca18920979cdbf7e37a4ff0c6e60f31982201165f4125ae3a7bdc85fd404e2f41fa659ae503 SHA512 5e2ee5d282a99e1c12521918449aac44636e4045ba6986b680eef06a7841ed8bebb4cb31a36c96e71b84b37b147ebd483fd1d58a4ac625aa5f2a003e16c8e399
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/sysrepo-2.0.41.ebuild b/net-misc/sysrepo/sysrepo-2.0.41.ebuild
new file mode 100644
index 000000000000..82ccb9f48c05
--- /dev/null
+++ b/net-misc/sysrepo/sysrepo-2.0.41.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="YANG-based configuration and operational state data store"
+HOMEPAGE="https://www.sysrepo.org"
+SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libyang-2.0.88:="
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 551b7c688ba6..9ba84e9e1268 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,4 @@
+AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a
 AUX tigervnc-1.9.0-030_manpages.patch 1978 BLAKE2B c9054f599b503d68d19dab1bd5c588ed19e96f3d547482c10acf84acc81fb59089497d1a282d6f8108132c8ed2fc412af9153c1305d6b04fdecf227c4ad42180 SHA512 dd58ab7987e2e619cc544cae77d7234575dbb812073f730ca0abda24e05c95fcc62449f96472a7962202725d2c9277432cf2289ff930d9841852c858977bf44e
 AUX tigervnc-1.9.0-055_xstartup.patch 1188 BLAKE2B 99f9371fffd6fdddef86b821152833ea7b24b9d121a51e85e04f1b25411a14f629513ed211b1c13f38f60dc48708db40891f1c36eea6b24e7b239f1e480540fe SHA512 b16cbd2360c6eba6210362d138ff5406f472bd4d81277def69460b846169f49cb3f98d29193c4fbc89d7ab06fb04052c2b94f7ceab6003f2b9b17c5b6c51151c
 AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
@@ -7,6 +8,6 @@ AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.11.0-r3.ebuild 4113 BLAKE2B 09995fb98a43899b50d2f6ca7051d713fb0c76593c405d1b36c5f5b37b23513493bd9ee67eda9704a2ac44ec394dfab9ae1d6889778c254f14ca8759ec9f04f7 SHA512 7ec990a1747655c78051c782034bde44bb2cf89b3c7a4e521b38cb085a8f4ba480415f6f32590f2b6cbaaa083c9c728243e7f3191e30a2eb804880dd06735283
+EBUILD tigervnc-1.11.0-r4.ebuild 4203 BLAKE2B 6e0640b1a200348f3301485410bfb0c85928efa2729d40a76de2be27e5c7d14115fc775528dd0482dd8fb2d7e16eea4d30c6f5f6b5e09c11e655bea8791f76f8 SHA512 7f91cbac0fecc548d7067c54530de96939d081f7297478cad7f006e72648f2dab2156151250dfa5324fcae50226b1a51300c259564830f84e8dd67325db71748
 EBUILD tigervnc-1.9.0-r2.ebuild 4274 BLAKE2B 976aaba3766e4bbec266086c4e7d6b1e197a810bea4e2e0391d986162aeec60373a7358ec2d951f87aab83ecf6a0b4ba4fcc65a92ace997437e47b5fc015d75c SHA512 bc988f43bf23dde99a675f4510946731a5a896a32a043d08a755fd9a6dc94abc3c347abf496066edd2989bf150f5cd995cb2582354b63e885ed9e6d3fe98c5bf
 MISC metadata.xml 471 BLAKE2B 450ab613da6c09763bd4d8ccd873b0c808617e5f9c4a95ecbba0bde24601ffc877db8b81a4290cb7574589329d654ea05eecf77195ac481c209000b7ec314773 SHA512 f6811c2155dc2079293bd335d9c6182a2ebe1853ff666f2c28dfba1141cf4d92e845ee8a99da9799aa08fd8f752e9d1d0fd0de8effac1fda9b19c8e464ee2435
diff --git a/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch
new file mode 100644
index 000000000000..3afaf82d0023
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch
@@ -0,0 +1,26 @@
+See bug for rationale, gist is that this is still useful.
+
+Patch from Erik Wallin <erikw@sizeit.se>
+https://bugs.gentoo.org/769794
+--- a/java/CMakeLists.txt
++++ b/java/CMakeLists.txt
+@@ -7,6 +7,8 @@
+ 
+ find_package(Java)
+ 
++set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
++
+ set(DEFAULT_JAVACFLAGS "-source 8 -target 8 -encoding UTF-8 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
+ set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
+   "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
+@@ -172,3 +174,10 @@
+     -P ${SRCDIR}/cmake/SignJar.cmake)
+ 
+ add_custom_target(java ALL DEPENDS VncViewer.jar)
++
++if(NOT WIN32)
++  install(FILES
++    ${BINDIR}/VncViewer.jar
++    ${SRCDIR}/${CLASSPATH}/README
++    DESTINATION ${DATA_DIR}/vnc/classes)
++endif()
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
index 576dcb604f1f..34e7e078e373 100644
--- a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
@@ -74,6 +74,11 @@ DEPEND="${CDEPEND}
 		opengl? ( >=media-libs/mesa-10.3.4-r1 )
 	)"
 
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+)
+
 src_prepare() {
 	if use server; then
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
index bdab6a8e7159..31c354944a93 100644
--- a/net-misc/vconfig/Manifest
+++ b/net-misc/vconfig/Manifest
@@ -1,3 +1,3 @@
 DIST vlan.1.9.tar.gz 176135 BLAKE2B 195acf3d3bf12de3d11856ec3fdab9791d744af8a5c0003d42a2dd8dda5b22d92bdb43aac392a2c3281cf43f67c2b05dc442352f1cfb589bc540593a92a2a46d SHA512 7602679c1f1569d1742da37062213fea3a14b875bec9c41fc6b10c28a09a312db80f6eae4a8641a1892946545b2b4ef4699e61fddd8514469970e334a9dab0c5
-EBUILD vconfig-1.9.ebuild 1114 BLAKE2B 4515143166be58d81ed8d9dae7e50f0627e510c24de00b4f55bba6535f9a1d392703036d43764c99691c7e72dcf9b1e738f25c3de2152db06456e9646fbb0c2c SHA512 b58bf4a60715234db64c8a9dd311bfdfb4b79c984f0612f379d19bc9e50d795c15321a2a7b102042da7d089e04ae57735a2b43828a58be6a5b4ecd275938918f
+EBUILD vconfig-1.9.ebuild 1113 BLAKE2B 084a270c660bc38426740e3ba1333d08fcb51d1f520707de97af8e01be999c977e24a9f0a30933bff31bcd57776dffd65823484ce8ad5231fca1ca7fd82bf78d SHA512 ef9d23722b0d6a9195522e4271a6b7828f137c845d34a1dd643cd7cfef75fae7c8dfb01c9b6366d87f5c67adf2a20ddd5e34d3cb533d06fd2c8a64bcca333405
 MISC metadata.xml 491 BLAKE2B 841e0806081bfe0bdd9114438b47bf6d273262f9b9b70295cc5d0049a9a9f973d0f6362c8f530c92f5288263e2d24d9a9ef79b5c630fc762b7a4a5833bda56df SHA512 ebc64c22068ea18cd35bc4d6c91d321c16521cd55ad34f7b54f51461812b69d2636c1affd85bf0e4cc7e03e098afbeb263a70160b3f4ccc0ee36e5d4cb8d3d0d
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
index 4465fa242db2..793ba8451eb0 100644
--- a/net-misc/vconfig/vconfig-1.9.ebuild
+++ b/net-misc/vconfig/vconfig-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ppc ~ppc64 sparc x86"
 IUSE="static"
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 101dcb06643d..a5e76b1d4a44 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -7,7 +7,7 @@ AUX vde.init-r1 1021 BLAKE2B cf91532a53a59fb653b3c9c221ce68a4351a40503dedb28e89b
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r6.ebuild 1407 BLAKE2B 639dd926dc7bcfde76216470b381cec847f7a7369e18b359d614f8edde3e3570cab2ab6416cc312f316a962d3cfd028a136209a607338b48a6cc318cb367b9c4 SHA512 852218c41c305ab7ae013c674c3b3194fbb03895377e37ef0b203611b8e1f1a68bfa5d6ea5bd5fef16afc82ac0706f431afaa3f98dc421d19dd7f8673585e2ac
-EBUILD vde-2.3.2_p20191011-r1.ebuild 2100 BLAKE2B 127b3d1f27c8fd2df1a9376583aa6188857805811bfa509f83c1b4e0f32a109087eb430451fcf8eac4957a6317f8f92d5febb01a59253d3168fdc8362e139665 SHA512 c92b096d679ed5fb0e306ad69f764603b5c6f86bb9d51a6685560abaeab593e071d0f059938cbf3db0acdf70e2cb602759de76335c5324caa513c90331eeb10a
-EBUILD vde-2.3.2_p20191011.ebuild 2010 BLAKE2B 0d27fd650fa45d8d2acaa52e9f85862b65290dfdcdfca9711c3f422c51139fda45b5b9b24e98af3b197e02d4d4ee63688489868796d1ae0c1529553f8d9d5369 SHA512 0a35644c54730e4855f41b821cb69933b19bb80c7b795874db692435a928f79bfaed8bb34a90f87b7b34d21d9b17813b6ea7260a5219cf36ae0fc23a26dc4363
-EBUILD vde-9999.ebuild 2024 BLAKE2B 1f1489b30da6061df5a2cbec6e1f3c8af692fc979e97a9ce713281bdce5079900e5c2c2e94bb974e06298936f197f741a08f2c9af9b84f6249436e21fd8b0b69 SHA512 83f5c66b59e54e7a907720672f5897bfb52c6216f9be2fff6b742c07ebfe4a3fd8b793431f73bce9ee4b7946d0b4b4679848339dd11c1b54466181d1e0eb8338
+EBUILD vde-2.3.2_p20191011-r1.ebuild 2037 BLAKE2B 44ce43460f5c330e89260a2bc381a8a025eacef886d80f4384accba8d262f82d05d88727e5639c00624919bda21fc83030a815109032b8b7fc530f60c9efc34c SHA512 1cceea111264d3044a4ea0b4ae8528d4ab1cdf10b082c24a5a33c99c38143c2a5ca5cf087dc37cff808278ffaefa6dee6f0f3decbd8b29dd81e3ad80ccb7252a
+EBUILD vde-2.3.2_p20191011.ebuild 1967 BLAKE2B 2435594c7f62fb10476d0a9ded2352096f5bd4ff5b7bcd9953ce27926ea8b2c57a51ec7739162dced5abcedf589db795ffe583b280ac4cdd825bcbd4959ba770 SHA512 5f9cb5597d05fcd02636b5b318c6904fad10c06fb9ccfb568ca1bc8927bf05e2e4ea9137b3b2863dc58177ce99ce643754bd55f48f2d2f176aade1af87d85b1e
+EBUILD vde-9999.ebuild 1924 BLAKE2B 5a3ceff00f2c858d35696a6ee1ef80a7a3db12c0ffe44b07da5089424e0bb3768138dbb6fab7de64c1491844f90c178d1b117b4db3f6dc29140ffbef2023fcec SHA512 490dcf752cf332d7947515f7348acce13b1f53793732ce354d9684470901e37d2d07befd88dd6b552f773fe2e45e95a5037f1224167c9720c082c1c2745c9992
 MISC metadata.xml 988 BLAKE2B 24bada8b93480ba4644e90e8ab37a67feaad750783d2dc5bb484ffdf32ebd5be15f23596d243a6d1891abecb073c586773903e75a4a5500253f1883d840d0381 SHA512 fe715ee3977df72eb82c65f85471deec3f8cd466c3911d3059a586c56bb02c9cdb83fcc67663e35691fce87a46dc13072785a1f0089e54f22e0e64f55b0bda0a
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
index 48c1a5d22c19..69fb8a181891 100644
--- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -8,7 +8,6 @@ inherit flag-o-matic
 if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
-	KEYWORDS=""
 elif [[ ${PV} = *_p* ]]; then
 	inherit autotools
 	MY_PN="vde-2"
@@ -20,7 +19,6 @@ elif [[ ${PV} = *_p* ]]; then
 else
 	MY_P="${PN}2-${PV}"
 	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/vde/vde-2.3.2_p20191011.ebuild b/net-misc/vde/vde-2.3.2_p20191011.ebuild
index 0d3dd7100e23..abd8c9c4d9f3 100644
--- a/net-misc/vde/vde-2.3.2_p20191011.ebuild
+++ b/net-misc/vde/vde-2.3.2_p20191011.ebuild
@@ -19,7 +19,6 @@ elif [[ ${PV} = *_p* ]]; then
 else
 	MY_P="${PN}2-${PV}"
 	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild
index 97b492902bf5..32de524f78b9 100644
--- a/net-misc/vde/vde-9999.ebuild
+++ b/net-misc/vde/vde-9999.ebuild
@@ -13,13 +13,11 @@ elif [[ ${PV} = *_p* ]]; then
 	MY_PN="vde-2"
 	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
 	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 	S="${WORKDIR}/${MY_PN}-${COMMIT}"
 else
 	MY_P="${PN}2-${PV}"
 	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index b22b03d025e6..b3056b784bd5 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,17 +1,6 @@
 AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3
-AUX xmrig-6.14.0-narrowing-conversion-arm64.patch 1177 BLAKE2B e8c7688a729c6bc236c6efdac73f22f2081d5ccb677f7fa5bd5e20e1a71b06cece6663d7c6acf3a11c30505470f5d0889823533e7b2177478e9cdd5e6cc678f4 SHA512 87d621feee82ea3d6e0710568ad75b6bda0bc061a9c22cb989bd5ba9b7c024c7d240d499d830e1aa819553f5fa70065858698f81a0de4a3441c4163cfae781c5
-AUX xmrig.service 835 BLAKE2B 96a6d52cae6730a08d06563cac47f054b86e8bd78972ab35355fee7f8c20c08943b8aa60e776296f9383f1436a589b84f93a25c8bc960458cb4e2c9a18e38cac SHA512 ec44d44526c67457af17b50dc021832da153bee812b2588b6f3cf0bbdb46449bb3e30e53c7118f1843b156c33695a097c6ee5f52d024a1191aa31c3375e0a003
-DIST xmrig-6.12.2.tar.gz 1628708 BLAKE2B 4fca418c7e0d6df25c84609d657a050f7df6383d0a5ee3a4ebf87ff26805d4f445d6c184df1651813e21ac4c972e0681d37ccb45a493cb4d1e199a6ba5e707c5 SHA512 a1e8d37955177f0988b0683c9b92dc6eef4bcaea68b3c1411917929a0573119cd13107e5a68a2a7971ec45bf2554aed5fc7d82c11d49e7411e95d9b81fe1a911
-DIST xmrig-6.13.0.tar.gz 1694984 BLAKE2B 6449df3fe7a42c5caa9050d0e7ef8723cb36175d6e624dae04f0c7d68670a41f705e8676acb6a377c35d7d572ca6e42ae0833bbf8fcb84ebdefa7a50027b0151 SHA512 49e55aef9c316b14b5974f58c3083486f097c1d2bfec10b0e615efcfb642b0186f2de866b5b88eb9fe2ee0153dd3ff7749936d142825928c68e96595478b9dc8
-DIST xmrig-6.13.1.tar.gz 1695005 BLAKE2B 8094a7f247d1b1f714a22fcdddcbede0d859f4883c6fcb1789ce134bdae31875da434679bdb141cd332a575ca0e4fa80b8ca96e603e8c381e9073c58394abe71 SHA512 f1a4e11f6e13bd275f2d867f1a4826cb244bdc9d157e590870ebc4dcd3cafc522bf7f46cfb4eb81e129fc3f9dbef59219288088c42e8f6b876ac16b5b6224323
-DIST xmrig-6.14.0.tar.gz 1698011 BLAKE2B 62391c7dde6d3d4fbb4cb78e53c6f704fb277830257148a03fc059e0eebd6a2fc7ba723a1caafe0e3920b15c3abe7a35a774743fdd0d0a800879fdc666ebed45 SHA512 de1cc3543a690a65cb50e629114324e95d4769dc3610c6dde0fff937206df3949907f8a21a4e4533bee71958e6febbaf4a23c3092c1e67a763f4ffea11770591
-DIST xmrig-6.14.1.tar.gz 1698951 BLAKE2B 99a0b3407aa0f0d835e04b407350c07f6e3adaf10e839217343aa56368d61665a2a83b75d4965c3573cb46018f20918c34cab295edd5c8398d0e7581e414976e SHA512 11d877e6b96f224fe317f74e019cf5df22a267d1b89c3d8ee775a2e3508e4d2f276f7ce9de5cc09430f8a8f56183595166f75d10bd8a3598530daec3bffb7788
-DIST xmrig-6.15.0.tar.gz 1742192 BLAKE2B 6495a48b9cc9e5a2ef851d6ffbeb0f1e3ce2fbd4ae3aaaef8acffcdff157006622a51fc23b2337933b1ced100a38fee334b240188aacaf8263f1806a39492f1f SHA512 e3f9af9fdf19512cddbb1f1a5655f9710fba486bc6f4a4eda6661ad7201d8909ada1308890dccf34af65d18cd687390c238b9b3522af6c1cafb360713ceb2985
-EBUILD xmrig-6.12.2.ebuild 1284 BLAKE2B ad14cf0ce42c072c6a640e32927035704a2144f76462d98fe108aae7b970ae27304abdb0600561a159ddd22874c08a19e4d42b308b1fdd6b1f9049c0f13d1c03 SHA512 87d2e6897670dd2d43383f305718536ed6769482556d8b3e88988521b4434cd635f4c5b5f0e59f59638e0851135cbf226492837e30ef96c650a1b7f71305c201
-EBUILD xmrig-6.13.0.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
-EBUILD xmrig-6.13.1.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
-EBUILD xmrig-6.14.0.ebuild 1348 BLAKE2B 464ba0de9178acb2b7eb380a58a167708425a6c97a28b4618008f830622d01629cf8d7f0a9b9482aae2da369ecd96a67c8b0771565bde8e18136399bf58351c6 SHA512 9d8af7c511fcb6a008a8cd37bc103fb821354b321453879fa9c9923c13ece6a1eb4aa4a31ec8cb5ce21f79baf358990c25f837e3fa728627a4122312a7f464ef
-EBUILD xmrig-6.14.1.ebuild 1285 BLAKE2B a7ddd70645f7bc308063979a013fb411cc4cf5d1f1c45d81d0d196a01e3b97ae659bd57f304e70b36df72c1e55b32b9981afb7ca2b6ca73612a7bd1594e773ae SHA512 fb4a7929e52369ef5ae1c4cec019df859388a805547c5bca34b6ba330824b0a0b10b4ee11474afed8bc7525601ce62a2e82060260f1321ff05bd6d17be1e9515
-EBUILD xmrig-6.15.0.ebuild 1287 BLAKE2B b47c344c0444f5c1735bbf32a0eca9b5986df3ff7ed6db66292c12d4b7353e536b007befcb5ab1e9a1d84beba91b053cc77c655f1efe03a8b6f1369039d0cc27 SHA512 fbfab6ffc6402b62775a34a883ca49231a07a586cf0aba6b12be2c38dbda7f963ebc13d06c3ba36d62e2871b6b915c45c83b2cee42f817afdc8fd30bf26ca620
-EBUILD xmrig-9999.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
-MISC metadata.xml 968 BLAKE2B 130f1098c551efdecb713449613bd57496bd9b54cbd3e7ac1cfc9ef67115a8c6e55bbb012553d3135724edcb72824cc96ee7c90530d079ca08692b0eb0c193bd SHA512 a6329eb2d151a149cf09af49a5c285762410b15b37cef73e33c93db26bbc1496021367a25749f8d3ae4fea7091a0392dc739554aaf51ffd403a151c6b8690c2f
+AUX xmrig.service 938 BLAKE2B e3b29f4fc824eee918e69175f9df3eed5c4825289c7d9b1d98ba0a3ecc8e8a9df89ad341788bd0c8850974a3bcfa3e644a7803b8339e36958f3b3b91322e323d SHA512 5012259b9d064854cfb96ba454d3bb73ea43e0bca67005126856d9ce94baa0fb986384fb203ad1a9b09ca1289cc9b9e5f7bea4682bdfc4ae46ec67e156720d84
+DIST xmrig-6.15.1.tar.gz 1743106 BLAKE2B d98537cbc75f7ce9e1c0db8ef3e23d7dd198f0d30b3feb26bac6e24649fdcfd503f27651c36674af259903cca6fbfdc9a407923a870be2ba586528fe84cfc529 SHA512 18438e6d6140b255ec24104baf20cb7b333520405fcbff1e3a5ad6b4794b7f9178d73baea48d8c2d05490fba75365102212639152d60ba79af89e0275a989e24
+EBUILD xmrig-6.15.1-r1.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
+EBUILD xmrig-9999.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
+MISC metadata.xml 1033 BLAKE2B 9f8e1d1a6e6cc807536149bec4b2b2531a49f1915a3628e5ae9b55f5fd4c85a924403807bc34a8c1a065282c8e5c27cf2f87bae4a90d3b182f5a3a058407a601 SHA512 4e47c4fea9083f5bcfdd53d2a53f04fca9a5cb088b71d28d960d3fbf21a91e153fb99a738a986d7bff6ced690a86333801d3f27d2e6ca69b4445a2fba5a17b62
diff --git a/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch b/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
deleted file mode 100644
index 7f1f1bb4da72..000000000000
--- a/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fixes build on arm64 (and other platforms with unsigned char).
-
-https://github.com/xmrig/xmrig/commit/f4cdc527b00571150e8521331928c75b44e071f9.patch
-https://github.com/xmrig/xmrig/issues/2527
-
-From f4cdc527b00571150e8521331928c75b44e071f9 Mon Sep 17 00:00:00 2001
-From: XMRig <support@xmrig.com>
-Date: Tue, 10 Aug 2021 01:40:36 +0700
-Subject: [PATCH] #2527 Fix narrowing conversion.
-
----
- src/base/net/stratum/DaemonClient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
-index 77818f34c..76f30c653 100644
---- a/src/base/net/stratum/DaemonClient.cpp
-+++ b/src/base/net/stratum/DaemonClient.cpp
-@@ -65,7 +65,7 @@ static const char *kJsonRPC                 = "/json_rpc";
- 
- static constexpr size_t kBlobReserveSize    = 8;
- 
--static const char kZMQGreeting[64] = { -1, 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
-+static const char kZMQGreeting[64] = { static_cast<char>(-1), 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
- static constexpr size_t kZMQGreetingSize1 = 11;
- 
- static const char kZMQHandshake[] = "\4\x19\5READY\xbSocket-Type\0\0\0\3SUB";
diff --git a/net-misc/xmrig/files/xmrig.service b/net-misc/xmrig/files/xmrig.service
index 8b59fc0c131f..16a924aae410 100644
--- a/net-misc/xmrig/files/xmrig.service
+++ b/net-misc/xmrig/files/xmrig.service
@@ -16,9 +16,9 @@ PrivateTmp=true
 ProtectHome=true
 ProtectSystem=strict
 NoNewPrivileges=true
-PrivateDevices=true
+# PrivateDevices=true # https://github.com/systemd/systemd/issues/13857
 CapabilityBoundingSet=
-ProtectClock=true
+#ProtectClock=true # https://github.com/systemd/systemd/issues/20835
 ProtectKernelModules=true
 ProtectKernelTunables=true
 ProtectKernelLogs=true
diff --git a/net-misc/xmrig/metadata.xml b/net-misc/xmrig/metadata.xml
index db67f3fd0d2b..c01c676279c9 100644
--- a/net-misc/xmrig/metadata.xml
+++ b/net-misc/xmrig/metadata.xml
@@ -24,6 +24,9 @@
     <flag name="hwloc">
       Use <pkg>sys-apps/hwloc</pkg> for CPU affinity support
     </flag>
+    <flag name="opencl">
+      Enable OpenCL support
+    </flag>
   </use>
   <upstream>
     <remote-id type="github">xmrig/xmrig</remote-id>
diff --git a/net-misc/xmrig/xmrig-6.12.2.ebuild b/net-misc/xmrig/xmrig-6.12.2.ebuild
deleted file mode 100644
index 809b9c2c5aa0..000000000000
--- a/net-misc/xmrig/xmrig-6.12.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=OFF
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.13.0.ebuild b/net-misc/xmrig/xmrig-6.13.0.ebuild
deleted file mode 100644
index 97dc2905531c..000000000000
--- a/net-misc/xmrig/xmrig-6.13.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=OFF
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.13.1.ebuild b/net-misc/xmrig/xmrig-6.13.1.ebuild
deleted file mode 100644
index 97dc2905531c..000000000000
--- a/net-misc/xmrig/xmrig-6.13.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=OFF
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.14.0.ebuild b/net-misc/xmrig/xmrig-6.14.0.ebuild
deleted file mode 100644
index 454bae8f9729..000000000000
--- a/net-misc/xmrig/xmrig-6.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-	"${FILESDIR}"/${PN}-6.14.0-narrowing-conversion-arm64.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=OFF
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.14.1.ebuild b/net-misc/xmrig/xmrig-6.14.1.ebuild
deleted file mode 100644
index dff470d93732..000000000000
--- a/net-misc/xmrig/xmrig-6.14.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=OFF
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.15.0.ebuild b/net-misc/xmrig/xmrig-6.15.1-r1.ebuild
index 8ad79070a47b..2639977e5a05 100644
--- a/net-misc/xmrig/xmrig-6.15.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.15.1-r1.ebuild
@@ -18,11 +18,12 @@ fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
 SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
 
 DEPEND="
 	dev-libs/libuv:=
 	hwloc? ( sys-apps/hwloc:= )
+	opencl? ( virtual/opencl )
 	ssl? ( dev-libs/openssl:= )
 "
 RDEPEND="
@@ -47,7 +48,7 @@ src_configure() {
 		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
 		-DWITH_HWLOC=$(usex hwloc)
 		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=OFF
+		-DWITH_OPENCL=$(usex opencl)
 		-DWITH_CUDA=OFF
 	)
 
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index 97dc2905531c..2639977e5a05 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -18,11 +18,12 @@ fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
 SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
 
 DEPEND="
 	dev-libs/libuv:=
 	hwloc? ( sys-apps/hwloc:= )
+	opencl? ( virtual/opencl )
 	ssl? ( dev-libs/openssl:= )
 "
 RDEPEND="
@@ -30,7 +31,9 @@ RDEPEND="
 	!arm64? ( sys-apps/msr-tools )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
 
 src_prepare() {
 	if ! use donate ; then
@@ -45,7 +48,7 @@ src_configure() {
 		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
 		-DWITH_HWLOC=$(usex hwloc)
 		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=OFF
+		-DWITH_OPENCL=$(usex opencl)
 		-DWITH_CUDA=OFF
 	)
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
commit	c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree	620cbf137661399a3fb1eff92914204f9a970713 /net-misc
parent	cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)