2021-04-05 22:35:28 UTC

28 files changed, 62 insertions, 59 deletions

diff --git a/metadata/md5-cache/net-misc/curl-7.74.0-r2 b/metadata/md5-cache/net-misc/curl-7.74.0-r2
index 541c90cbe39d..53ad20016cc2 100644
--- a/metadata/md5-cache/net-misc/curl-7.74.0-r2
+++ b/metadata/md5-cache/net-misc/curl-7.74.0-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 INHERIT=autotools eutils prefix multilib-minimal
 IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
+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
 LICENSE=curl
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.74.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=0ca3f55a26ad68483aeea6392d91b185
+_md5_=d189ae3d8866aa41adbb11bb4cd207ed
diff --git a/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1 b/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1
index 773dc19d3783..933d1852d1b1 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1
+++ b/metadata/md5-cache/net-misc/dhcpcd-8.1.9-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 INHERIT=systemd toolchain-funcs
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-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
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.1.9.tar.xz https://dev.gentoo.org/~polynomial-c/dhcpcd-8.1.9-patches-01.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=fc3712d3461d855d0eef65a3b131438e
+_md5_=9141645d69d4411b10a153f439545fb9
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9.3.4 b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
index 4715baf174d5..f1c4342423a5 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9.3.4
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 INHERIT=systemd toolchain-funcs
 IUSE=debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev
-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
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.3.4.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=6fb062be942cb2edbfb7ec601a08f66d
+_md5_=ecbf56fd4c2dc26febee2f5d3bfd25a0
diff --git a/metadata/md5-cache/net-misc/dropbear-2020.81-r2 b/metadata/md5-cache/net-misc/dropbear-2020.81-r2
index 11d9635ecffd..df267702b730 100644
--- a/metadata/md5-cache/net-misc/dropbear-2020.81-r2
+++ b/metadata/md5-cache/net-misc/dropbear-2020.81-r2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
 INHERIT=savedconfig pam
 IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2 >=dev-libs/libtommath-1.2.0 zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2020.81.tar.bz2
 _eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=0a5d306717b85d49dc0002092f8ab02f
+_md5_=d33e7b63a2765c69a2f465b8cccf5c5e
diff --git a/metadata/md5-cache/net-misc/ethertypes-0 b/metadata/md5-cache/net-misc/ethertypes-0
index b15f99cf0c79..409e74e75003 100644
--- a/metadata/md5-cache/net-misc/ethertypes-0
+++ b/metadata/md5-cache/net-misc/ethertypes-0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Maps ethernet frame ids to symbolic names
 EAPI=7
 HOMEPAGE=https://netfilter.org/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!<net-firewall/ebtables-2.0.10.4-r2 !<net-firewall/iptables-1.6.2-r2[nftables(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/ethertypes-0.gz
-_md5_=0018162e01b808915397a4018f643605
+_md5_=9a12c6f8a5d6cc2d775891bf8f30658f
diff --git a/metadata/md5-cache/net-misc/htpdate-1.2.2 b/metadata/md5-cache/net-misc/htpdate-1.2.2
index bccb685037dd..dd0495a41386 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.2.2
+++ b/metadata/md5-cache/net-misc/htpdate-1.2.2
@@ -3,9 +3,9 @@ DESCRIPTION=Synchronize local workstation with time offered by remote webservers
 EAPI=7
 HOMEPAGE=http://www.vervest.org/htp/
 INHERIT=readme.gentoo-r1 toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.2.2.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=807a820d006bc4461db659e340c53a1f
+_md5_=a5317dd44ab24e11d0a8cf67911e1059
diff --git a/metadata/md5-cache/net-misc/ipcalc-0.42_p2 b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
index c901458e20cb..61d349bd57fd 100644
--- a/metadata/md5-cache/net-misc/ipcalc-0.42_p2
+++ b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=IP Calculator prints broadcast/network/etc for an IP address and netmask
 EAPI=7
 HOMEPAGE=http://jodies.de/ipcalc
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.6.0
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ipcalc/ipcalc_0.42.orig.tar.gz mirror://debian/pool/main/i/ipcalc/ipcalc_0.42-2.debian.tar.xz
-_md5_=878aac14b557fab061ae009f44eb11d6
+_md5_=bd625c82eba5a0b252480f9e0c92d9da
diff --git a/metadata/md5-cache/net-misc/iputils-20190709-r1 b/metadata/md5-cache/net-misc/iputils-20190709-r1
index 9c1b2e407385..4889809f0d8a 100644
--- a/metadata/md5-cache/net-misc/iputils-20190709-r1
+++ b/metadata/md5-cache/net-misc/iputils-20190709-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 INHERIT=fcaps flag-o-matic l10n meson systemd toolchain-funcs
 IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6 +filecaps
-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
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) nls? ( sys-devel/gettext ) ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20190709.tar.gz -> iputils-20190709.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20190709.tar.xz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	543b53e4d003ebd889082f4673e52af5	meson	e43eef9331f54965a573ed380854ff47	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=eaef80294bec8ec21fa151e7cc2230e3
+_md5_=c97f42ae98408cfe802d47dc8be774bd
diff --git a/metadata/md5-cache/net-misc/iputils-20200821-r2 b/metadata/md5-cache/net-misc/iputils-20200821-r2
index 4e2a1aa3bd34..fd5a43959433 100644
--- a/metadata/md5-cache/net-misc/iputils-20200821-r2
+++ b/metadata/md5-cache/net-misc/iputils-20200821-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 INHERIT=fcaps flag-o-matic l10n meson systemd toolchain-funcs
 IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6 +filecaps
-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
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( sys-devel/gettext ) ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20200821.tar.gz -> iputils-20200821.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20200821.tar.xz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	543b53e4d003ebd889082f4673e52af5	meson	e43eef9331f54965a573ed380854ff47	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=9299dcc9e5d4db3f518165ddf43d1e91
+_md5_=e33f544a6b1a82aad1a3fbf69f4a597e
diff --git a/metadata/md5-cache/net-misc/jwhois-4.0-r1 b/metadata/md5-cache/net-misc/jwhois-4.0-r1
index a35326cdf8c6..5bf5ab243bf3 100644
--- a/metadata/md5-cache/net-misc/jwhois-4.0-r1
+++ b/metadata/md5-cache/net-misc/jwhois-4.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Advanced Internet Whois client capable of recursive queries
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/jwhois/
 IUSE=idn nls
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=mirror://gnu/jwhois/jwhois-4.0.tar.gz
-_md5_=1c8a0ef067ad3f7798a31d95a732d2ea
+_md5_=202222b9ca9e011daa20ab7558e9e498
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.5 b/metadata/md5-cache/net-misc/keychain-2.8.5
index e62f24be5871..6bf863012ef7 100644
--- a/metadata/md5-cache/net-misc/keychain-2.8.5
+++ b/metadata/md5-cache/net-misc/keychain-2.8.5
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 EAPI=6
 HOMEPAGE=https://www.funtoo.org/Keychain
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/funtoo/keychain/archive/2.8.5.tar.gz -> keychain-2.8.5.tar.gz
-_md5_=248742d8b49b295c4f7e21e90d336dfb
+_md5_=4583d124bbb145da3c64d55cba69812d
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
index f880a617ec0a..3abe41b79ec0 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=http://lksctp.sourceforge.net/
 INHERIT=flag-o-matic autotools linux-info multilib-minimal
 IUSE=kernel_linux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=https://github.com/sctp/lksctp-tools/archive/v1.0.18.tar.gz -> lksctp-tools-1.0.18.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=911b574da3d080081141235abdcd7359
+_md5_=5adbcefc132c3d3b706378ca3de2d978
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.9 b/metadata/md5-cache/net-misc/memcached-1.6.9
index 4a56ddc8eb6c..9fa1e382768c 100644
--- a/metadata/md5-cache/net-misc/memcached-1.6.9
+++ b/metadata/md5-cache/net-misc/memcached-1.6.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://memcached.org/
 INHERIT=autotools eutils flag-o-matic systemd
 IUSE=debug sasl seccomp selinux slabs-reassign test
-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
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.6.9.tar.gz https://www.memcached.org/files/old/memcached-1.6.9.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=b1a9e672c831a402379c060202b6910e
+_md5_=bded2608891bd00946edfbbe15643f05
diff --git a/metadata/md5-cache/net-misc/netdate-1.2-r1 b/metadata/md5-cache/net-misc/netdate-1.2-r1
index 2c2426d718bb..9d253b7bbd41 100644
--- a/metadata/md5-cache/net-misc/netdate-1.2-r1
+++ b/metadata/md5-cache/net-misc/netdate-1.2-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=utility to synchronize the time with ntp-servers
 EAPI=6
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
-KEYWORDS=amd64 arm ~mips s390 sparc x86
+KEYWORDS=amd64 arm ~mips ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/people/kukuk/ipv6/netdate-1.2.tar.bz2
-_md5_=87fa13c0c0f5992038cac252d1d7166e
+_md5_=95e0220496065a977688709e3602743c
diff --git a/metadata/md5-cache/net-misc/netifrc-0.7.1-r1 b/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
index 342e126fb521..904d6f972e47 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
+++ b/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
 INHERIT=systemd udev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.7.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=ff48fff2a1a2aa0e9925955bf678e38a
+_md5_=639249d6e86148f1ceb7338c1735b6f1
diff --git a/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3 b/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
index adbe725419af..4d6a0b351917 100644
--- a/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
+++ b/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
@@ -3,9 +3,9 @@ DESCRIPTION=Netkit - fingerd and finger client
 EAPI=5
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 INHERIT=eutils toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://debian/pool/main/b/bsd-finger/bsd-finger_0.17.orig.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=2aa2607a269822115fdc4828f7b42393
+_md5_=3d4e468395d127352a0b4b6603f4e4ff
diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r11 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r11
index 70170ac5ca9e..9135e9f6f2f8 100644
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r11
+++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r11
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0 pam? ( >=sys-auth/pambase-20080219.1 )
 DESCRIPTION=Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}
 EAPI=7
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
+INHERIT=pam toolchain-funcs fcaps
 IUSE=pam +filecaps
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0 pam? ( >=sys-auth/pambase-20080219.1 ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz mirror://gentoo/rexec-1.5.tar.gz mirror://gentoo/netkit-rsh-0.17-patches-3.tar.lzma
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f96c8d74c32b33b0f6de9268f26b767
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	fcaps	da689a8e04bbbb3518888ff668fee45b
+_md5_=3441b1f5b02d07cc4659feaf1c7a141d
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p15 b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
index 7528eb224fef..81e8fbcb7a19 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p15
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.ntp.org/
 INHERIT=autotools toolchain-funcs flag-o-matic systemd
 IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-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
 LICENSE=HPND BSD ISC
 PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) acct-group/ntp acct-user/ntp selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p15-manpages.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=5fe0fd1db1b88a2696c0c7e91e9027d4
+_md5_=2474501615d3701ca0b778eebd04c055
diff --git a/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2 b/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
index d4ea5b46be4a..c173691b6000 100644
--- a/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
+++ b/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.openntpd.org/
 INHERIT=systemd
 IUSE=libressl selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=!net-misc/ntp[-openntpd] libressl? ( dev-libs/libressl:0= ) acct-group/openntpd acct-user/openntpd selinux? ( sec-policy/selinux-ntp )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-6.2p3.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=f97c9ac507abad108b27d64eb7b8f1e1
+_md5_=bb50771b4ff847b5f94e070b13c266b5
diff --git a/metadata/md5-cache/net-misc/openssh-8.4_p1-r3 b/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
index c2b2a7b7d512..acba2095ac7d 100644
--- a/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.openssh.com/
 INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
-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
+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
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( !prefix? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp !security-key ssl !xmss ) xmss? ( || ( ssl libressl ) ) test? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.4p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.4p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-AES-CTR-14.22.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-PeakTput-14.22.diff ) X509? ( https://roumenpetrov.info/openssh/x509-12.6/openssh-8.4p1+x509-12.6.diff.gz )
 _eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=b5d14756eec004f850be9b69e3adc822
+_md5_=8ffb86de4571d746f3f70bcc391d61c2
diff --git a/metadata/md5-cache/net-misc/openssh-8.5_p1-r1 b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
index ab6b1fef1004..12bab824c5e7 100644
--- a/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.openssh.com/
 INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
-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
+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
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( !prefix? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp !security-key ssl !xmss ) xmss? ( || ( ssl libressl ) ) test? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.5p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.5p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.0.1/openssh-8.5p1+x509-13.0.1.diff.gz )
 _eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=97f34bfab3c47426910d02362cc055cf
+_md5_=281c93034d7f27ce642a0835372ac72a
diff --git a/metadata/md5-cache/net-misc/pipes-1.16.1-r1 b/metadata/md5-cache/net-misc/pipes-1.16.1-r1
index 844415c51d15..2994ccc11a0d 100644
--- a/metadata/md5-cache/net-misc/pipes-1.16.1-r1
+++ b/metadata/md5-cache/net-misc/pipes-1.16.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Very versatile TCP pipes
 EAPI=6
 HOMEPAGE=https://bisqwit.iki.fi/source/pipes.html
-KEYWORDS=amd64 ppc s390 x86
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 ppc ~s390 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://bisqwit.iki.fi/src/arch/pipes-1.16.1.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=66a40a2a8e95d96ae28a204426224818
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=9bb0691e04dbabfb693bdcf69b78234f
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.3-r2 b/metadata/md5-cache/net-misc/rsync-3.2.3-r2
index 490c62216cf8..76f58b300a95 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.3-r2
+++ b/metadata/md5-cache/net-misc/rsync-3.2.3-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://rsync.samba.org/
 INHERIT=flag-o-matic prefix systemd
 IUSE=acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd cpu_flags_x86_sse2
-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
+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
 LICENSE=GPL-3
 RDEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=4836f5bf004fd3ec39ed30f52cd6b41b
+_md5_=c96b6bf8068bf5d3c9a44bdc1f0cc45d
diff --git a/metadata/md5-cache/net-misc/suite3270-4.0_p13 b/metadata/md5-cache/net-misc/suite3270-4.0_p13
index a86ed4875b26..eef9d8f87a5c 100644
--- a/metadata/md5-cache/net-misc/suite3270-4.0_p13
+++ b/metadata/md5-cache/net-misc/suite3270-4.0_p13
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://x3270.bgp.nu/
 INHERIT=font
 IUSE=cjk doc ncurses ssl tcl X X
-KEYWORDS=amd64 ppc s390 sparc x86
+KEYWORDS=amd64 ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ncurses? ( sys-libs/ncurses:= sys-libs/readline:0= ) tcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/x3270/suite3270-4.0ga13-src.tgz
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=61414bab4281bc7c8a1d5e28f334edc1
+_md5_=7d5177fdd344c07eda411a8ccd407ed0
diff --git a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1 b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
index 4ec645b15f71..c11aa614676b 100644
--- a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
+++ b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
@@ -5,10 +5,10 @@ EAPI=5
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
 INHERIT=eutils autotools toolchain-funcs
 IUSE=nls xinetd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/telnet-bsd-1.2.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=34c36967d2f8ed3069c13c087d7ecd22
+_md5_=2e6db56274b369739bb2c3c9f4d49fd4
diff --git a/metadata/md5-cache/net-misc/unix2tcp-0.8.2-r1 b/metadata/md5-cache/net-misc/unix2tcp-0.8.2-r1
index c972e40065c3..2eb5d8a1d8e9 100644
--- a/metadata/md5-cache/net-misc/unix2tcp-0.8.2-r1
+++ b/metadata/md5-cache/net-misc/unix2tcp-0.8.2-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=a connection forwarder that converts Unix sockets into TCP sockets
 EAPI=6
 HOMEPAGE=http://gnu.gds.tuwien.ac.at/directory/all/unix2tcp.html
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc s390 x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ~s390 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/unix2tcp-0.8.2.tar.bz2
-_md5_=7e20c34f268241d82fc9cd4f6e620e50
+_md5_=73798f77ae70bb3c6b911b0bd5b6b608
diff --git a/metadata/md5-cache/net-misc/wget-1.20.3-r3 b/metadata/md5-cache/net-misc/wget-1.20.3-r3
index dc1f0bc2d4bb..22e9ff63e6cc 100644
--- a/metadata/md5-cache/net-misc/wget-1.20.3-r3
+++ b/metadata/md5-cache/net-misc/wget-1.20.3-r3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/wget/
 INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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
 LICENSE=GPL-3
 RDEPEND=!static? ( cookie_check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.20.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
-_md5_=3d5a1e9c76bf95e6d3cd13c0da745588
+_md5_=27b70cb6b3dc19aeb06547244f0fede0
diff --git a/metadata/md5-cache/net-misc/whois-5.5.6-r1 b/metadata/md5-cache/net-misc/whois-5.5.6-r1
index b159451ea2b6..785944a6e297 100644
--- a/metadata/md5-cache/net-misc/whois-5.5.6-r1
+++ b/metadata/md5-cache/net-misc/whois-5.5.6-r1
@@ -4,12 +4,13 @@ DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/lib
 DESCRIPTION=improved Whois Client
 EAPI=7
 HOMEPAGE=https://github.com/rfc1036/whois
+INHERIT=toolchain-funcs
 IUSE=iconv idn nls xcrypt
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rfc1036/whois/archive/v5.5.6.tar.gz -> whois-5.5.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4f432a7fd7ca581ec8bc4d62bcb4850c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=52f1f1261fe155d4a02e09c84b48f80e