148 files changed, 704 insertions, 578 deletions
diff --git a/metadata/md5-cache/app-admin/apg-2.3.0b_p20150129 b/metadata/md5-cache/app-admin/apg-2.3.0b_p20150129-r1
index 9008d86f8d99..c2704384c94e 100644
--- a/metadata/md5-cache/app-admin/apg-2.3.0b_p20150129
+++ b/metadata/md5-cache/app-admin/apg-2.3.0b_p20150129-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=cracklib? ( sys-libs/cracklib )
+DEPEND=virtual/libcrypt:= cracklib? ( sys-libs/cracklib )
 DESCRIPTION=Another Password Generator
 EAPI=7
 HOMEPAGE=https://github.com/wilx/apg
@@ -8,8 +8,8 @@ INHERIT=autotools
 IUSE=cracklib
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
-RDEPEND=cracklib? ( sys-libs/cracklib )
+RDEPEND=virtual/libcrypt:= cracklib? ( sys-libs/cracklib )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/apg-2.3.0b_p20150129.tar.xz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=4373eaf2d99246a6470f0a539497d051
+_md5_=d6150fa688409070dfd213998c36c50e
diff --git a/metadata/md5-cache/app-admin/conserver-8.2.6-r1 b/metadata/md5-cache/app-admin/conserver-8.2.6-r2
index 72c1021fbf4e..2e893c4cbed6 100644
--- a/metadata/md5-cache/app-admin/conserver-8.2.6-r1
+++ b/metadata/md5-cache/app-admin/conserver-8.2.6-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl:0 )
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers )
+DEPEND=net-libs/libnsl virtual/libcrypt:= debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=Serial Console Manager
 EAPI=7
 HOMEPAGE=https://www.conserver.com
@@ -8,9 +8,9 @@ INHERIT=autotools pam ssl-cert
 IUSE=debug ipv6 freeipmi kerberos pam ssl test tcpd ssl
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD BSD-with-attribution
-RDEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) pam? ( sys-auth/pambase )
+RDEPEND=net-libs/libnsl virtual/libcrypt:= debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) pam? ( sys-auth/pambase )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conserver/conserver/releases/download/v8.2.6/conserver-8.2.6.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d
-_md5_=56739f3b572a8947e714e60d8b4c091d
+_md5_=1c285895ad1dab931bc5e8c367a4bb68
diff --git a/metadata/md5-cache/app-admin/doas-6.8.1 b/metadata/md5-cache/app-admin/doas-6.8.1-r1
index 26c48dc63b09..8e41e713bc55 100644
--- a/metadata/md5-cache/app-admin/doas-6.8.1
+++ b/metadata/md5-cache/app-admin/doas-6.8.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/yacc
 DEFINED_PHASES=configure postinst prepare
-DEPEND=pam? ( sys-libs/pam )
+DEPEND=pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
 DESCRIPTION=Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
 EAPI=7
 HOMEPAGE=https://github.com/Duncaen/OpenDoas
@@ -8,8 +8,8 @@ INHERIT=toolchain-funcs
 IUSE=pam persist
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=ISC
-RDEPEND=pam? ( sys-libs/pam )
+RDEPEND=pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
 SLOT=0
 SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.8.1.tar.gz -> OpenDoas-6.8.1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=6966ef5b28434d3c19b37cefd3412421
+_md5_=4498713c13aaab42487e323a2cd3136b
diff --git a/metadata/md5-cache/app-admin/monit-5.27.1 b/metadata/md5-cache/app-admin/monit-5.27.1-r1
index d3bb5f0f84ed..152e503dbab2 100644
--- a/metadata/md5-cache/app-admin/monit-5.27.1
+++ b/metadata/md5-cache/app-admin/monit-5.27.1-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/flex sys-devel/bison virtual/pkgconfig
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam )
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
 EAPI=7
 HOMEPAGE=http://mmonit.com/monit/
@@ -8,8 +8,8 @@ INHERIT=bash-completion-r1 pam systemd
 IUSE=ipv6 pam ssl
 KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux
 LICENSE=AGPL-3
-RDEPEND=ssl? ( dev-libs/openssl:0= )
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.27.1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=884312de13b5ea0d4f3a7c48961ed8cb
+_md5_=b0f9cd4a34f96edb25c78334510a81c6
diff --git a/metadata/md5-cache/app-admin/monit-5.27.2 b/metadata/md5-cache/app-admin/monit-5.27.2-r1
index 60be1f25a376..0e3c6c694952 100644
--- a/metadata/md5-cache/app-admin/monit-5.27.2
+++ b/metadata/md5-cache/app-admin/monit-5.27.2-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/flex sys-devel/bison virtual/pkgconfig
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam )
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
 EAPI=7
 HOMEPAGE=http://mmonit.com/monit/
@@ -8,8 +8,8 @@ INHERIT=bash-completion-r1 pam systemd
 IUSE=ipv6 pam ssl
 KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux
 LICENSE=AGPL-3
-RDEPEND=ssl? ( dev-libs/openssl:0= )
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.27.2.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=5faccdd0eeb612fcd3fbc76b755d5dd0
+_md5_=b0f9cd4a34f96edb25c78334510a81c6
diff --git a/metadata/md5-cache/app-admin/monit-5.28.0 b/metadata/md5-cache/app-admin/monit-5.28.0-r1
index 4a9330742a2a..1932292579c3 100644
--- a/metadata/md5-cache/app-admin/monit-5.28.0
+++ b/metadata/md5-cache/app-admin/monit-5.28.0-r1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/flex sys-devel/bison virtual/pkgconfig
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam )
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
 EAPI=7
 HOMEPAGE=http://mmonit.com/monit/
@@ -8,8 +8,8 @@ INHERIT=bash-completion-r1 pam systemd
 IUSE=ipv6 pam ssl
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=AGPL-3
-RDEPEND=ssl? ( dev-libs/openssl:0= )
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.28.0.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=bce67fc976459b0682f9cd58a93360a6
+_md5_=0606104f45028e049ae16f3d60f409b3
diff --git a/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2 b/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r3
index bc9c24d5d0c1..1295d0176e74 100644
--- a/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
+++ b/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r3
@@ -1,11 +1,13 @@
 DEFINED_PHASES=prepare
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=An improved version of cli-crypt (encrypts data sent to it from the cli)
 EAPI=7
 HOMEPAGE=http://xjack.org/pwcrypt/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=http://xjack.org/pwcrypt/downloads/pwcrypt-1.2.2.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=4071c7abeb0e4b7f7fd07532a2baf920
+_md5_=5680dc057043d39112e9788f6a436241
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.6_p1-r1 b/metadata/md5-cache/app-admin/sudo-1.9.6_p1-r2
index 7dea1a66518c..14a2ea6377c6 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.6_p1-r1
+++ b/metadata/md5-cache/app-admin/sudo-1.9.6_p1-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/bison virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
 DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=7
 HOMEPAGE=https://www.sudo.ws/
@@ -8,9 +8,9 @@ INHERIT=pam multilib libtool systemd tmpfiles toolchain-funcs
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris
 LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.6p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.6p1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	libtool	241a8f577b9781a42a7421e53448a44e	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=9f4a1f137e2dce92cafbf996cc18e073
+_md5_=ce1518c08ca9a0ed646bbf151015d0d0
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.7_p1 b/metadata/md5-cache/app-admin/sudo-1.9.7_p1-r1
index 695088ed128a..c8f5d6158e0f 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.7_p1
+++ b/metadata/md5-cache/app-admin/sudo-1.9.7_p1-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
 DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=7
 HOMEPAGE=https://www.sudo.ws/
@@ -8,9 +8,9 @@ INHERIT=pam multilib libtool systemd tmpfiles toolchain-funcs
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris
 LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.7p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.7p1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	libtool	241a8f577b9781a42a7421e53448a44e	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=34c697579542fd59b1b69a9c4b1000b0
+_md5_=d351ca5c151722ce3ea551fbd1f60fbe
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index c709a84afd9a..5d5b417a6490 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/bison virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 virtual/pkgconfig dev-vcs/mercurial
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
 DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=7
 HOMEPAGE=https://www.sudo.ws/
@@ -8,8 +8,8 @@ INHERIT=pam multilib libtool systemd tmpfiles toolchain-funcs mercurial
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
 LICENSE=ISC BSD
 PROPERTIES=live
-RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) nls? ( virtual/libintl ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	libtool	241a8f577b9781a42a7421e53448a44e	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157
-_md5_=3af357d4c883b49ab847bbbb72206d5d
+_md5_=cb93b7578e13050afe69b081bdc16d5e
diff --git a/metadata/md5-cache/app-admin/sysrqd-17-r1 b/metadata/md5-cache/app-admin/sysrqd-17-r2
index 9aa1f2408254..3b78e5baa1a1 100644
--- a/metadata/md5-cache/app-admin/sysrqd-17-r1
+++ b/metadata/md5-cache/app-admin/sysrqd-17-r2
@@ -1,12 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install postinst
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=Daemon providing access to the kernel sysrq functions via network
 EAPI=7
 HOMEPAGE=https://github.com/jd/sysrqd
 INHERIT=systemd toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://github.com/jd/sysrqd/archive/v17.tar.gz -> sysrqd-17.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=c4cbf1637301c563c8aa612d1ba1751e
+_md5_=329be521e690bf176fb0e56f0d4278f8
diff --git a/metadata/md5-cache/app-backup/burp-2.2.18-r1 b/metadata/md5-cache/app-backup/burp-2.2.18-r1
deleted file mode 100644
index 7fc0de753f9e..000000000000
--- a/metadata/md5-cache/app-backup/burp-2.2.18-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/burp acct-user/burp dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib dev-libs/openssl:0= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/pkgconfig test? ( dev-libs/check )
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=7
-HOMEPAGE=https://burp.grke.org/
-INHERIT=autotools systemd
-IUSE=acl ipv6 test xattr
-KEYWORDS=amd64 ~arm x86
-LICENSE=AGPL-3
-RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib dev-libs/openssl:0= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.2.18.tar.gz -> burp-2.2.18.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=28aa9fb18c99422a308ab51a3aef151c
diff --git a/metadata/md5-cache/app-backup/burp-2.2.18-r2 b/metadata/md5-cache/app-backup/burp-2.2.18-r2
new file mode 100644
index 000000000000..cfdfe887f49c
--- /dev/null
+++ b/metadata/md5-cache/app-backup/burp-2.2.18-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) test? ( dev-libs/check )
+DESCRIPTION=Network backup and restore client and server for Unix and Windows
+EAPI=7
+HOMEPAGE=https://burp.grke.org/
+INHERIT=autotools systemd
+IUSE=acl ipv6 test xattr
+KEYWORDS=amd64 ~arm x86
+LICENSE=AGPL-3
+RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grke/burp/archive/2.2.18.tar.gz -> burp-2.2.18.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
+_md5_=930d73967ecef35be96d92d62ae799e9
diff --git a/metadata/md5-cache/app-backup/burp-2.3.36 b/metadata/md5-cache/app-backup/burp-2.3.36
deleted file mode 100644
index 6cba87c066d3..000000000000
--- a/metadata/md5-cache/app-backup/burp-2.3.36
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=acct-group/burp acct-user/burp dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib dev-libs/openssl:0= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/pkgconfig test? ( dev-libs/check )
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=7
-HOMEPAGE=https://burp.grke.org/
-INHERIT=autotools systemd
-IUSE=acl ipv6 test xattr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib dev-libs/openssl:0= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.3.36.tar.gz -> burp-2.3.36.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=5f3a1372187288a3b8e361ca3f0c669b
diff --git a/metadata/md5-cache/app-backup/burp-2.3.36-r1 b/metadata/md5-cache/app-backup/burp-2.3.36-r1
new file mode 100644
index 000000000000..ccd4f0de304d
--- /dev/null
+++ b/metadata/md5-cache/app-backup/burp-2.3.36-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) test? ( dev-libs/check )
+DESCRIPTION=Network backup and restore client and server for Unix and Windows
+EAPI=7
+HOMEPAGE=https://burp.grke.org/
+INHERIT=autotools systemd
+IUSE=acl ipv6 test xattr
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grke/burp/archive/2.3.36.tar.gz -> burp-2.3.36.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
+_md5_=0ded6e44da33c83ba25e81d56fb72f09
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1 b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
index a4283e59b615..44ae8b8a6fbe 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r2
@@ -7,9 +7,9 @@ INHERIT=versionator readme.gentoo-r1 rpm systemd pax-utils
 IUSE=acl java +tsm-cit +tsm-hw
 KEYWORDS=-* amd64
 LICENSE=Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C || ( BSD GPL-2+ ) gSOAP libpng tsm
-RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 )
+RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 ) || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	rpm	142025d51eac82f782a2dcb4f04a4b12	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	pax-utils	74cd9920d64148719fb62c462935c1b5
-_md5_=ec4089e2c21f55df6caaf5c65119802a
+_md5_=b591942ebf0ef3324203e41de360c770
diff --git a/metadata/md5-cache/app-crypt/ccrypt-1.11 b/metadata/md5-cache/app-crypt/ccrypt-1.11-r2
index 6bd2cb046ef0..22526ede166f 100644
--- a/metadata/md5-cache/app-crypt/ccrypt-1.11
+++ b/metadata/md5-cache/app-crypt/ccrypt-1.11-r2
@@ -1,9 +1,11 @@
 DEFINED_PHASES=-
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=Encryption and decryption
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/ccrypt/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=mirror://sourceforge/ccrypt/1.11/ccrypt-1.11.tar.gz
-_md5_=d90818cc0cb77b65a98b33cab4a4ae60
+_md5_=4f4a24f6cb283028c2aca1b83601551d
diff --git a/metadata/md5-cache/app-crypt/ccrypt-1.11-r1 b/metadata/md5-cache/app-crypt/ccrypt-1.11-r3
index 24644d9d44f9..7f8462eb335d 100644
--- a/metadata/md5-cache/app-crypt/ccrypt-1.11-r1
+++ b/metadata/md5-cache/app-crypt/ccrypt-1.11-r3
@@ -1,11 +1,12 @@
 DEFINED_PHASES=configure
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* )
+DEPEND=virtual/libcrypt:= emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Encryption and decryption
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/ccrypt/
 IUSE=emacs
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=mirror://sourceforge/ccrypt/1.11/ccrypt-1.11.tar.gz
-_md5_=039656c8dd228cf3fc4a5ae84e35ccdb
+_md5_=3961dad5f68cd0a7afa4f07245c0d906
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.8.0 b/metadata/md5-cache/app-crypt/johntheripper-1.8.0-r1
index 8531ec4651b8..4b1f430773b8 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.8.0
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=sys-libs/zlib !app-crypt/johntheripper-jumbo
+DEPEND=sys-libs/zlib virtual/libcrypt:= !app-crypt/johntheripper-jumbo
 DESCRIPTION=fast password cracker
 EAPI=7
 HOMEPAGE=https://www.openwall.com/john/
@@ -7,8 +7,8 @@ INHERIT=cuda flag-o-matic toolchain-funcs
 IUSE=custom-cflags openmp cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop
 KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
+RDEPEND=sys-libs/zlib virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://www.openwall.com/john/j/john-1.8.0.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	cuda	c2f1b334711bbbf2130f339636dc7515
-_md5_=5ff30ba2612de9c0c4ffd0e726a5f483
+_md5_=49b21d0a0609a6f70f28c99f881dfbe5
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3-r1 b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3-r2
index 67073812f33b..b6d1e8122436 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3-r2
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses:=
+DEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses:= virtual/libcrypt:=
 DESCRIPTION=Kerberized applications split from the main MIT Kerberos V distribution
 EAPI=7
 HOMEPAGE=http://web.mit.edu/kerberos/www/
 INHERIT=autotools flag-o-matic toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=openafs-krb5-a BSD
-RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses:=
+RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses:= virtual/libcrypt:=
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.3-signed.tar
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=650df2793920baea5704b2e374e56c57
+_md5_=c6e24973fb058f0e4b1749ed6cce2c1b
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r13 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
index 12888398af3f..a3a1c3696997 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r13
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam )
+DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) server? ( virtual/libcrypt:= )
 DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=6
 HOMEPAGE=http://cvs.nongnu.org/
@@ -7,9 +7,9 @@ INHERIT=pam toolchain-funcs
 IUSE=crypt doc kerberos nls pam server
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam )
+RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) server? ( virtual/libcrypt:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=7a3471fed3c4cc0c9b6cede0b959e6e4
+_md5_=3fbd318eefa0d9f4282fea9742fea71e
diff --git a/metadata/md5-cache/games-mud/circlemud-3.1-r1 b/metadata/md5-cache/games-mud/circlemud-3.1-r2
index d7a96d58ad15..c9fe4c626055 100644
--- a/metadata/md5-cache/games-mud/circlemud-3.1-r1
+++ b/metadata/md5-cache/games-mud/circlemud-3.1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl:0=
+DEPEND=dev-libs/openssl:0= virtual/libcrypt:=
 DESCRIPTION=A multi-user dungeon game system server
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.circlemud.org/
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=circlemud
-RDEPEND=dev-libs/openssl:0= acct-group/gamestat
+RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= acct-group/gamestat
 SLOT=0
 SRC_URI=https://www.circlemud.org/pub/CircleMUD/3.x/circle-3.1.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=cd002c657916c60eb6499d6727bf3cdd
+_md5_=41c86bb21fc55f686a3957c3c6db359e
diff --git a/metadata/md5-cache/games-server/crossfire-server-1.71.0-r1 b/metadata/md5-cache/games-server/crossfire-server-1.71.0-r2
index 9584e4e3377b..2444c9ef60e6 100644
--- a/metadata/md5-cache/games-server/crossfire-server-1.71.0-r1
+++ b/metadata/md5-cache/games-server/crossfire-server-1.71.0-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0= )
+DEPEND=net-misc/curl sys-libs/zlib virtual/libcrypt:= X? ( x11-libs/libXaw media-libs/libpng:0= )
 DESCRIPTION=Server for the crossfire clients
-EAPI=6
+EAPI=8
 HOMEPAGE=http://crossfire.real-time.com/
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0= )
+RDEPEND=net-misc/curl sys-libs/zlib virtual/libcrypt:= X? ( x11-libs/libXaw media-libs/libpng:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.maps.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.arch.tar.bz2
-_md5_=e4b5af9428a46b8df5740eb3ca1df58c
+_md5_=d533dd3dc8e3860580fe8ed5835ef965
diff --git a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2 b/metadata/md5-cache/games-strategy/knights-demo-1.32-r3
index f6079c463cbd..ac0cb91da7dd 100644
--- a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
+++ b/metadata/md5-cache/games-strategy/knights-demo-1.32-r3
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=knights
 INHERIT=desktop unpacker wrapper
 KEYWORDS=~amd64 ~x86
 LICENSE=knights-demo
-RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/knights-demo-1.32.run
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7cd821b695ee9a412b60e1e306d0f31a
+_md5_=258d41d8f911303fce7f5102350161b0
diff --git a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5-r1
index 81f2ca49f01f..d271a710acc0 100644
--- a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
+++ b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/flex nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
+DEPEND=virtual/libcrypt:= geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A packet filter and firewall log analyzer
 EAPI=7
 HOMEPAGE=http://fwlogwatch.inside-security.de/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic strip-linguas toolchain-funcs
 IUSE=geoip nls zlib
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-1
-RDEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
+RDEPEND=virtual/libcrypt:= geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://fwlogwatch.inside-security.de/sw/fwlogwatch-1.5.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=6ff8463c95239e1d4c6ce1309f24b434
+_md5_=fd32e313a11052aea21a1ffb43649194
diff --git a/metadata/md5-cache/net-dialup/dwun-0.96e-r4 b/metadata/md5-cache/net-dialup/dwun-0.96e-r5
index ee616a698f78..23a3aac7cb55 100644
--- a/metadata/md5-cache/net-dialup/dwun-0.96e-r4
+++ b/metadata/md5-cache/net-dialup/dwun-0.96e-r5
@@ -1,11 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=Dialer Without a Useful Name (DWUN)
-EAPI=6
+EAPI=7
 HOMEPAGE=http://dwun.sourceforge.net/
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=MIT GPL-2
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=mirror://sourceforge/dwun/dwun-0.96e.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=580aeb0b2ae1ab818ad90f8cd159ae62
+_md5_=cdc9216e8b1f01ed3c3f9d21bd7bbb46
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.20-r3 b/metadata/md5-cache/net-dialup/freeradius-3.0.20-r3
new file mode 100644
index 000000000000..400ffcf75ac8
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.20-r3
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=7
+HOMEPAGE=http://www.freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd +python_single_target_python3_8
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
+RESTRICT=test firebird? ( bindist )
+SLOT=0
+SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.20.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.20.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
+_md5_=ec6699e2ddd3ca69a17094c2019d9c45
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.21-r2 b/metadata/md5-cache/net-dialup/freeradius-3.0.21-r2
deleted file mode 100644
index f3a418d53803..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.21-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=7
-HOMEPAGE=http://www.freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test firebird? ( bindist )
-SLOT=0
-SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.21.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.21.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=e42d8fda155893fc5ea7038bfb681db7
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.20-r2 b/metadata/md5-cache/net-dialup/freeradius-3.0.21-r3
index 243f53257b5b..14772ff9534f 100644
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.20-r2
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.21-r3
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
 DESCRIPTION=Highly configurable free RADIUS server
 EAPI=7
 HOMEPAGE=http://www.freeradius.org/
 INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd +python_single_target_python3_8
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test firebird? ( bindist )
 SLOT=0
-SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.20.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.20.tar.gz
+SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.21.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.21.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=37b35fc9c5a374bf9fc64ab265fcc266
+_md5_=af7db8074500e2132856bf48f96a7ba2
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.22-r1 b/metadata/md5-cache/net-dialup/freeradius-3.0.22-r1
deleted file mode 100644
index 50b4f5b355c9..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.22-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=7
-HOMEPAGE=http://www.freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test firebird? ( bindist )
-SLOT=0
-SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.22.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.22.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=f4328cc1e2ba5a024af4f0202355c8c2
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.22-r2 b/metadata/md5-cache/net-dialup/freeradius-3.0.22-r2
new file mode 100644
index 000000000000..fc7360f88065
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.22-r2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=7
+HOMEPAGE=http://www.freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient-basic ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=test firebird? ( bindist )
+SLOT=0
+SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.22.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.22.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
+_md5_=75ebb33343f059210e56643333b6b607
diff --git a/metadata/md5-cache/net-dialup/radiusclient-ng-0.5.6-r1 b/metadata/md5-cache/net-dialup/radiusclient-ng-0.5.6-r2
index 8d784e6417b4..05d03a0d6c23 100644
--- a/metadata/md5-cache/net-dialup/radiusclient-ng-0.5.6-r1
+++ b/metadata/md5-cache/net-dialup/radiusclient-ng-0.5.6-r2
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=!net-dialup/radiusclient !net-dialup/freeradius-client
+DEPEND=!net-dialup/radiusclient !net-dialup/freeradius-client virtual/libcrypt:=
 DESCRIPTION=RadiusClient NextGeneration - library for RADIUS clients
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/radiusclient-ng.berlios/
 INHERIT=autotools toolchain-funcs
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=BSD
-RDEPEND=!net-dialup/radiusclient !net-dialup/freeradius-client
+RDEPEND=!net-dialup/radiusclient !net-dialup/freeradius-client virtual/libcrypt:=
 SLOT=0
 SRC_URI=mirror://sourceforge/radiusclient-ng.berlios/radiusclient-ng-0.5.6.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=9ba2b8846042e104354f368006704e2f
+_md5_=bac63f4a7c1223e75712a648788ede22
diff --git a/metadata/md5-cache/net-fs/netatalk-3.1.12-r2 b/metadata/md5-cache/net-fs/netatalk-3.1.12-r4
index dcfd82354cee..0e05f7b7967c 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.1.12-r2
+++ b/metadata/md5-cache/net-fs/netatalk-3.1.12-r4
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:0= ) zeroconf? ( net-dns/avahi[dbus] ) virtual/yacc sys-devel/flex
+DEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0= sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb virtual/libcrypt:= acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:0= ) zeroconf? ( net-dns/avahi[dbus] ) virtual/yacc sys-devel/flex
 DESCRIPTION=Open Source AFP server
 EAPI=7
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -8,10 +8,10 @@ INHERIT=autotools flag-o-matic multilib pam systemd
 IUSE=acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf
 KEYWORDS=amd64 arm ~ppc ~ppc64 x86
 LICENSE=GPL-2 BSD
-RDEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:0= ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0= sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb virtual/libcrypt:= acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:0= ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=ldap? ( acl ) tracker? ( dbus )
 RESTRICT=test
 SLOT=0/18.0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.1.12/netatalk-3.1.12.tar.bz2
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=693295adeafd9ea467012767b06a6d76
+_md5_=6a3ac01b8c42943ed3d25b1e774032cb
diff --git a/metadata/md5-cache/net-fs/netatalk-3.1.12-r3 b/metadata/md5-cache/net-fs/netatalk-3.1.12-r5
index 8146fe9f2879..7125d835adde 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.1.12-r3
+++ b/metadata/md5-cache/net-fs/netatalk-3.1.12-r5
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] ) virtual/yacc sys-devel/flex
+DEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0= sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb virtual/libcrypt:= acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] ) virtual/yacc sys-devel/flex
 DESCRIPTION=Open Source AFP server
 EAPI=7
 HOMEPAGE=http://netatalk.sourceforge.net/
@@ -8,10 +8,10 @@ INHERIT=autotools flag-o-matic multilib pam systemd
 IUSE=acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 BSD
-RDEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0= sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb virtual/libcrypt:= acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=ldap? ( acl ) tracker? ( dbus )
 RESTRICT=test
 SLOT=0/18.0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.1.12/netatalk-3.1.12.tar.bz2
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=00693e40970e58a94b149c26a901c5c0
+_md5_=24d6b370263fb1d8849ff2b15510e54d
diff --git a/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2 b/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r3
index a531e40c6078..d74642ecd0d5 100644
--- a/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r2
+++ b/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r3
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst prepare
-DEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 virtual/libiconv x11-libs/gtk+:2
+DEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 virtual/libcrypt:= virtual/libiconv x11-libs/gtk+:2
 DESCRIPTION=GTK frontend to proftpd
 EAPI=7
 HOMEPAGE=https://mange.dynalias.org/linux/gproftpd
 INHERIT=autotools
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 virtual/libiconv x11-libs/gtk+:2
+RDEPEND=>=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 virtual/libcrypt:= virtual/libiconv x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://mange.dynup.net/linux/gproftpd/gproftpd-8.3.2.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=b4050fa8bd3f9d4889975ebff3e66b8a
+_md5_=a562eb5c31ea707faf60ea4ea1abc079
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.7a-r1 b/metadata/md5-cache/net-ftp/proftpd-1.3.7a-r2
index de86ba63ec3e..bc0fa532c7f0 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.7a-r1
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.7a-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
+DEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
 DESCRIPTION=An advanced and very configurable FTP server
 EAPI=7
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
@@ -8,10 +8,10 @@ INHERIT=multilib systemd tmpfiles toolchain-funcs
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
+RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
 REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.7a.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=084398bab86ebad1c767181cd58107fe
+_md5_=873b47e889fd4be7d8197ce746d38f59
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.7b b/metadata/md5-cache/net-ftp/proftpd-1.3.7b-r1
index 73108bcddd87..a94e186a2afe 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.7b
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.7b-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
+DEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
 DESCRIPTION=An advanced and very configurable FTP server
 EAPI=7
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
@@ -8,10 +8,10 @@ INHERIT=multilib systemd tmpfiles toolchain-funcs
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
+RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
 REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.7b.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=b67802431595dff4a096a00d5a8500a6
+_md5_=eb47fd8231dc77e4f354a9e026539b15
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1 b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1-r1
index 64dedd434161..ddddf073d8d4 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare test
-DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
+DEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
 DESCRIPTION=An advanced and very configurable FTP server
 EAPI=7
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
@@ -8,10 +8,10 @@ INHERIT=multilib systemd tmpfiles toolchain-funcs
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
+RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
 REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8rc1.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=bf22d66bdb15b4453d966d629a7c67e7
+_md5_=1517f2425ae0c5516a94081b292164e5
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r3 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r4
index dff0ae44b58e..69e3e013f81a 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r3
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r4
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
+DEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
 DESCRIPTION=Fast, production-quality, standard-conformant FTP server
 EAPI=7
 HOMEPAGE=http://www.pureftpd.org/
@@ -8,9 +8,9 @@ INHERIT=autotools flag-o-matic
 IUSE=anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
+RDEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 REQUIRED_USE=implicittls? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=fd10fa2c80dcacb4fe5e1df2920cb505
+_md5_=3c343a5be3832ce190b1df888beca59d
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-9999 b/metadata/md5-cache/net-ftp/pure-ftpd-9999
index d5087df896c0..c25c4d1db0d7 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-9999
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
+DEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
 DESCRIPTION=Fast, production-quality, standard-conformant FTP server
 EAPI=7
 HOMEPAGE=http://www.pureftpd.org/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic autotools git-r3
 IUSE=anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
+RDEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 REQUIRED_USE=implicittls? ( ssl )
 SLOT=0
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=bb54cd8e27355f1f35d10e6df7ceb3d2
+_md5_=a77e03b98a3479fdf546693a2dc27e63
diff --git a/metadata/md5-cache/net-ftp/pureadmin-0.4-r2 b/metadata/md5-cache/net-ftp/pureadmin-0.4-r3
index 69565486f1e3..d036e026fc0e 100644
--- a/metadata/md5-cache/net-ftp/pureadmin-0.4-r2
+++ b/metadata/md5-cache/net-ftp/pureadmin-0.4-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/libcrypt:= virtual/fam x11-libs/gtk+:2 x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI tool used to make the management of Pure-FTPd a little easier
 EAPI=7
 HOMEPAGE=http://purify.sourceforge.net/
@@ -8,8 +8,8 @@ INHERIT=desktop xdg
 IUSE=doc
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 x11-libs/libX11
+RDEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/libcrypt:= virtual/fam x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/purify/pureadmin-0.4.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=7dcacfba3c85ee8a45b497c7e1fa5d98
+_md5_=2aca3c2825d5739f6e1371623ab3fbe7
diff --git a/metadata/md5-cache/net-irc/atheme-services-7.2.11 b/metadata/md5-cache/net-irc/atheme-services-7.2.11-r1
index 03f8d6d80be2..96477663ed93 100644
--- a/metadata/md5-cache/net-irc/atheme-services-7.2.11
+++ b/metadata/md5-cache/net-irc/atheme-services-7.2.11-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-vcs/git virtual/pkgconfig
 DEFINED_PHASES=compile configure install
-DEPEND=acct-group/atheme-services acct-user/atheme-services >=dev-libs/libmowgli-2.1.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= )
+DEPEND=acct-group/atheme-services acct-user/atheme-services >=dev-libs/libmowgli-2.1.0:2 virtual/libcrypt:= cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) perl? ( dev-lang/perl:= ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=A portable and secure set of open-source and modular IRC services
 EAPI=7
 HOMEPAGE=https://github.com/atheme/atheme
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic perl-functions
 IUSE=cracklib largenet ldap nls +pcre perl profile ssl
 KEYWORDS=amd64
 LICENSE=BSD
-RDEPEND=acct-group/atheme-services acct-user/atheme-services >=dev-libs/libmowgli-2.1.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=acct-group/atheme-services acct-user/atheme-services >=dev-libs/libmowgli-2.1.0:2 virtual/libcrypt:= cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) perl? ( dev-lang/perl:= ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/atheme/atheme/releases/download/v7.2.11/atheme-services-v7.2.11.tar.xz -> atheme-services-7.2.11.tar.xz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	perl-functions	fea344a91ebf37efadf172c6a3de5a72
-_md5_=43031899eaac220917d22e9768992779
+_md5_=03da16605fb533de026b577b70197835
diff --git a/metadata/md5-cache/net-irc/bnc-2.9.4-r1 b/metadata/md5-cache/net-irc/bnc-2.9.4-r2
index c8eeb90cf19e..ba80998c5967 100644
--- a/metadata/md5-cache/net-irc/bnc-2.9.4-r1
+++ b/metadata/md5-cache/net-irc/bnc-2.9.4-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0= )
+DEPEND=virtual/libcrypt:= ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=BNC (BouNCe) is used as a gateway to an IRC Server
-EAPI=6
+EAPI=8
 HOMEPAGE=http://gotbnc.com/
 IUSE=ssl
 KEYWORDS=~alpha amd64 arm ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= )
+RDEPEND=virtual/libcrypt:= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://gotbnc.com/files/bnc2.9.4.tar.gz
-_md5_=e11682f1893aa18b75329fd1f27c8b28
+_md5_=43a44939fc4feff200f65970f77cd90e
diff --git a/metadata/md5-cache/net-irc/emech-3.0.99_p3 b/metadata/md5-cache/net-irc/emech-3.0.99_p3-r1
index c46801998656..7bd03ea712d2 100644
--- a/metadata/md5-cache/net-irc/emech-3.0.99_p3
+++ b/metadata/md5-cache/net-irc/emech-3.0.99_p3-r1
@@ -1,4 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=UNIX compatible IRC bot programmed in the C language
 EAPI=6
 HOMEPAGE=http://www.energymech.net/
@@ -6,7 +7,8 @@ INHERIT=readme.gentoo-r1 toolchain-funcs
 IUSE=debug session tcl
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=http://www.energymech.net/files/emech-3.0.99p3.tar.gz
 _eclasses_=readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=579d905042209a600b8752119c4e4c46
+_md5_=aea898ae4382aa49826cf491233220a9
diff --git a/metadata/md5-cache/net-irc/epic5-2.0.1 b/metadata/md5-cache/net-irc/epic5-2.0.1-r1
index 6e547c62c9a1..687f151d0c32 100644
--- a/metadata/md5-cache/net-irc/epic5-2.0.1
+++ b/metadata/md5-cache/net-irc/epic5-2.0.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install
-DEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems ) valgrind? ( dev-util/valgrind )
+DEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libcrypt:= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=Epic5 IRC Client
 EAPI=7
 HOMEPAGE=http://epicsol.org/
@@ -8,8 +8,8 @@ INHERIT=autotools ruby-single
 IUSE=archive perl tcl ruby socks5 valgrind
 KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems )
+RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libcrypt:= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-2.0.1.tar.xz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	ruby-utils	685587efe9ff6315b82811810827f69a	ruby-single	dd06178c43afcd54225a7d0fca6342a8
-_md5_=f4845b5b4c55caa5bb2ef59f70eb324e
+_md5_=22005931c5006547b2f6a7c00f83bcc5
diff --git a/metadata/md5-cache/net-irc/ircii-20210314 b/metadata/md5-cache/net-irc/ircii-20210314-r1
index ffe321b33122..3143fad55c02 100644
--- a/metadata/md5-cache/net-irc/ircii-20210314
+++ b/metadata/md5-cache/net-irc/ircii-20210314-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses:0= virtual/libiconv
+DEPEND=sys-libs/ncurses:0= virtual/libcrypt:= virtual/libiconv
 DESCRIPTION=An IRC and ICB client that runs under most UNIX platforms
 EAPI=7
 HOMEPAGE=http://eterna.com.au/ircii/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0= virtual/libiconv
+RDEPEND=sys-libs/ncurses:0= virtual/libcrypt:= virtual/libiconv
 SLOT=0
 SRC_URI=https://ircii.warped.com/ircii-20210314.tar.bz2 https://ircii.warped.com/old/ircii-20210314.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=4ae6c4800c47e3a6f92c8df50bdb2673
+_md5_=547868558c07bbed565c394d2f6a18d6
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r2
index 670418c6a085..8b08a2ae86be 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+DEPEND=virtual/libcrypt:= chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
 DESCRIPTION=IRC fileserver using DCC
 EAPI=6
 HOMEPAGE=http://iroffer.dinoex.net/
@@ -7,9 +7,9 @@ INHERIT=l10n toolchain-funcs user
 IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+RDEPEND=virtual/libcrypt:= chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
 REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.30.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.30.tar.gz
 _eclasses_=strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	l10n	f45cb23732f151c1ea9ab1d057c2f541	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	user-info	2e75eaea3582b052ec16d9d5aa74ced3	user	1033b6bed7cf367c4507ea9a3ff503d0
-_md5_=cd75843333b3e0a73d29323850f3b398
+_md5_=065f75dc1f0f799e1cffe3773eff5c5e
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.31 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.31-r1
index 6dd6126009c0..56a626c48c0a 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.31
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.31-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+DEPEND=virtual/libcrypt:= chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
 DESCRIPTION=IRC fileserver using DCC
 EAPI=6
 HOMEPAGE=http://iroffer.dinoex.net/
@@ -7,9 +7,9 @@ INHERIT=l10n toolchain-funcs user
 IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+RDEPEND=virtual/libcrypt:= chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
 REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.31.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.31.tar.gz
 _eclasses_=strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	l10n	f45cb23732f151c1ea9ab1d057c2f541	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	user-info	2e75eaea3582b052ec16d9d5aa74ced3	user	1033b6bed7cf367c4507ea9a3ff503d0
-_md5_=b4fcf7e1bd761dbbebc6cc4127ce803d
+_md5_=1db75eebeedf32360867556472078181
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r1 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r1
deleted file mode 100644
index d55b5123657c..000000000000
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-user/iroffer chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
-DESCRIPTION=IRC fileserver using DCC
-EAPI=7
-HOMEPAGE=http://iroffer.dinoex.net/
-INHERIT=l10n toolchain-funcs
-IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/iroffer chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
-REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.32.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.32.tar.gz
-_eclasses_=strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	l10n	f45cb23732f151c1ea9ab1d057c2f541	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=f5483bd8273d62576b051c84acf068d0
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2
new file mode 100644
index 000000000000..a8a1ef6b7ae8
--- /dev/null
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=virtual/libcrypt:= acct-user/iroffer chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+DESCRIPTION=IRC fileserver using DCC
+EAPI=7
+HOMEPAGE=http://iroffer.dinoex.net/
+INHERIT=l10n toolchain-funcs
+IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:= acct-user/iroffer chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.32.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.32.tar.gz
+_eclasses_=strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	l10n	f45cb23732f151c1ea9ab1d057c2f541	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
+_md5_=fef7fdf7118eaaa0a93755834c6959c3
diff --git a/metadata/md5-cache/net-irc/muh-2.2a-r1 b/metadata/md5-cache/net-irc/muh-2.2a-r2
index 2b1ec0c561f3..3fbc8c84b3ea 100644
--- a/metadata/md5-cache/net-irc/muh-2.2a-r1
+++ b/metadata/md5-cache/net-irc/muh-2.2a-r2
@@ -1,10 +1,12 @@
 DEFINED_PHASES=configure install postinst
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=Persistent IRC bouncer
-EAPI=6
+EAPI=8
 HOMEPAGE=http://mind.riot.org/muh/
 IUSE=ipv6
 KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc x86
 LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=mirror://sourceforge/muh/muh-2.2a.tar.gz
-_md5_=1eea638760d60627af686eb62156d451
+_md5_=6ba8099c68479b031d4ca5c40a0dd675
diff --git a/metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1 b/metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r2
index 96e1a2b5b6b9..38d142788d88 100644
--- a/metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
+++ b/metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install
-DEPEND=ncurses? ( sys-libs/ncurses:= ) ssl? ( dev-libs/openssl:= )
+DEPEND=virtual/libcrypt:= ncurses? ( sys-libs/ncurses:= ) ssl? ( dev-libs/openssl:= )
 DESCRIPTION=Ninja IRC Client
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=ncurses ipv6 ssl
 KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses:= ) ssl? ( dev-libs/openssl:= )
+RDEPEND=virtual/libcrypt:= ncurses? ( sys-libs/ncurses:= ) ssl? ( dev-libs/openssl:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://qoop.org/ninja/stable/ninja-1.5.9pre14.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=f266bb1bb6c2e47aa09bd3137ac59c9f
+_md5_=d3c1485411243c5877d64f93d0f0a7aa
diff --git a/metadata/md5-cache/net-irc/scrollz-2.3 b/metadata/md5-cache/net-irc/scrollz-2.3-r1
index 1472d82b83f2..ad14b9a424f4 100644
--- a/metadata/md5-cache/net-irc/scrollz-2.3
+++ b/metadata/md5-cache/net-irc/scrollz-2.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses:0= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) )
+DEPEND=sys-libs/ncurses:0= virtual/libcrypt:= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) )
 DESCRIPTION=Advanced IRC client based on ircII
 EAPI=7
 HOMEPAGE=https://www.scrollz.info/
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs
 IUSE=gmp gnutls ipv6 ssl
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) )
+RDEPEND=sys-libs/ncurses:0= virtual/libcrypt:= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) )
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=https://www.scrollz.info/download/ScrollZ-2.3.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=d958f743f38910297d38e70f3200e5a6
+_md5_=18091cffe7112e92b5e4260bca82f3b2
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.8 b/metadata/md5-cache/net-irc/unrealircd-5.0.8-r1
index 810ffb728019..4d078bb1a775 100644
--- a/metadata/md5-cache/net-irc/unrealircd-5.0.8
+++ b/metadata/md5-cache/net-irc/unrealircd-5.0.8-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig dev-libs/openssl:0 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= dev-libs/openssl:0= curl? ( net-misc/curl[adns] )
+DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/openssl:0= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] )
 DESCRIPTION=An advanced Internet Relay Chat daemon
 EAPI=7
 HOMEPAGE=https://www.unrealircd.org/
@@ -8,8 +8,8 @@ INHERIT=ssl-cert systemd
 IUSE=class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes
 KEYWORDS=amd64 ppc x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= dev-libs/openssl:0= curl? ( net-misc/curl[adns] )
+RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/openssl:0= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] )
 SLOT=0
 SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.0.8.tar.gz
 _eclasses_=ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=d79cd8bd534b6e1e705c839f233674c0
+_md5_=9ca1660789da9c8be75749f5748651d8
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.9.1 b/metadata/md5-cache/net-irc/unrealircd-5.0.9.1-r1
index b30774481bc8..eae963676509 100644
--- a/metadata/md5-cache/net-irc/unrealircd-5.0.9.1
+++ b/metadata/md5-cache/net-irc/unrealircd-5.0.9.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/openssl:0 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= dev-libs/openssl:0= curl? ( net-misc/curl[adns] )
+DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/openssl:0= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] )
 DESCRIPTION=An advanced Internet Relay Chat daemon
 EAPI=7
 HOMEPAGE=https://www.unrealircd.org/
@@ -8,8 +8,8 @@ INHERIT=autotools ssl-cert systemd
 IUSE=class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= dev-libs/openssl:0= curl? ( net-misc/curl[adns] )
+RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/openssl:0= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] )
 SLOT=0
 SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.0.9.1.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=98d358d6c62a598e1f13896fa48126ac
+_md5_=7c671ec1af7cc4e87ef2b63028820547
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.2.0.2 b/metadata/md5-cache/net-irc/unrealircd-5.2.0.2-r1
index e4fbea4ea072..6fcb68807243 100644
--- a/metadata/md5-cache/net-irc/unrealircd-5.2.0.2
+++ b/metadata/md5-cache/net-irc/unrealircd-5.2.0.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-libs/openssl:0 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= >=net-dns/c-ares-1.7:= dev-libs/openssl:0= curl? ( net-misc/curl[adns] )
+DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] )
 DESCRIPTION=An advanced Internet Relay Chat daemon
 EAPI=7
 HOMEPAGE=https://www.unrealircd.org/
@@ -8,8 +8,8 @@ INHERIT=autotools ssl-cert systemd
 IUSE=class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= >=net-dns/c-ares-1.7:= dev-libs/openssl:0= curl? ( net-misc/curl[adns] )
+RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] )
 SLOT=0
 SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.2.0.2.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=b86b08644a5211937e34a6d9a9a5ec96
+_md5_=edf1c81894f5344771eb76f1824d0c2d
diff --git a/metadata/md5-cache/net-libs/c-client-2007f-r6 b/metadata/md5-cache/net-libs/c-client-2007f-r7
index 2b2d0ceed580..bea20accf3eb 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f-r6
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=ssl? ( dev-libs/openssl:0= ) !net-mail/uw-imap kerberos? ( app-crypt/mit-krb5 ) kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) ) >=app-portage/elt-patches-20170815
+DEPEND=!net-mail/uw-imap ssl? ( dev-libs/openssl:0= ) kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) !pam? ( virtual/libcrypt:= ) ) kerberos? ( app-crypt/mit-krb5 ) >=app-portage/elt-patches-20170815
 DESCRIPTION=UW IMAP c-client library
 EAPI=6
 HOMEPAGE=http://www.washington.edu/imap/
@@ -7,8 +7,8 @@ INHERIT=flag-o-matic libtool toolchain-funcs
 IUSE=doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=ssl? ( dev-libs/openssl:0= ) !net-mail/uw-imap kerberos? ( app-crypt/mit-krb5 )
+RDEPEND=!net-mail/uw-imap ssl? ( dev-libs/openssl:0= ) kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) !pam? ( virtual/libcrypt:= ) ) kerberos? ( app-crypt/mit-krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z chappa? ( mirror://gentoo/c-client-2007f-chappa-115-all.patch.gz )
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e
-_md5_=2faaf09325c5a6989754bcd0da7b89b9
+_md5_=55c17009397750431f65b15e6bb1c2c8
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r2
index a2762d440ef1..685a698aac79 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 INHERIT=flag-o-matic
-IUSE=berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs
+IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
-RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.69.0.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=cdaaa1e5c84b18430d66922edb8288e5
+_md5_=01b54b4b8b7681ed16313d1084c51996
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.70.0 b/metadata/md5-cache/net-libs/courier-authlib-0.70.0-r1
index ef63f39bf797..5077a9a5e805 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.70.0
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.70.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 INHERIT=flag-o-matic
-IUSE=berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs
+IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.70.0.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=9dbb58f3fa9bd08a4b8be89f9f3c31c2
+_md5_=a3d58cc2ac871f48e167efcae30dfb2c
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.71.0 b/metadata/md5-cache/net-libs/courier-authlib-0.71.0-r1
index e6ca98a5769f..82db9687b692 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.71.0
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.71.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 INHERIT=flag-o-matic
-IUSE=berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs
+IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
-RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.71.0.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=cdaaa1e5c84b18430d66922edb8288e5
+_md5_=01b54b4b8b7681ed16313d1084c51996
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.71.1 b/metadata/md5-cache/net-libs/courier-authlib-0.71.1-r1
index 8d6fd0b6626d..7de594e0ee3c 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.71.1
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.71.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1.2 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1.2 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 INHERIT=flag-o-matic
-IUSE=berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs
+IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1.2 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1.2 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.71.1.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=26324eb44d47b2757db2970682fe8a92
+_md5_=38a94ad4ff83be70da3cc5b354367bd2
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.71.2 b/metadata/md5-cache/net-libs/courier-authlib-0.71.2-r1
index 6d4bcc6972a2..a578ee131268 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.71.2
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.71.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.3 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.3 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 INHERIT=flag-o-matic
-IUSE=berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs
+IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.3 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.3 gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.71.2.tar.bz2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=e1fb3277b6e9235fb424c7dc478c60ec
+_md5_=6104eb47d2fa1a759a9c048a93001934
diff --git a/metadata/md5-cache/net-libs/cvm-0.97 b/metadata/md5-cache/net-libs/cvm-0.97-r1
index 343bce875062..3bdc6412382f 100644
--- a/metadata/md5-cache/net-libs/cvm-0.97
+++ b/metadata/md5-cache/net-libs/cvm-0.97-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/cdb:= >=dev-libs/bglibs-2.04:0= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) vpopmail? ( net-mail/vpopmail ) test? ( app-editors/vim dev-db/sqlite )
+DEPEND=dev-db/cdb:= >=dev-libs/bglibs-2.04:0= virtual/libcrypt:= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) vpopmail? ( net-mail/vpopmail ) test? ( app-editors/vim dev-db/sqlite )
 DESCRIPTION=Credential Validation Modules by Bruce Guenter
 EAPI=7
 HOMEPAGE=http://untroubled.org/cvm/
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=mysql postgres test vpopmail
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2+
-RDEPEND=dev-db/cdb:= >=dev-libs/bglibs-2.04:0=
+RDEPEND=dev-db/cdb:= >=dev-libs/bglibs-2.04:0= virtual/libcrypt:= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) vpopmail? ( net-mail/vpopmail )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/cvm/archive/cvm-0.97.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=f20940425821dc7cc9a52c850481755f
+_md5_=d54c691e109e706f8f2b0fc64d1b3e31
diff --git a/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1 b/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r2
index fe1eb1d8e7fc..a9abd9b6fb92 100644
--- a/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1
+++ b/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.225:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] test? ( dev-util/cmocka )
+DEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.225:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] virtual/libcrypt:= test? ( dev-util/cmocka )
 DESCRIPTION=C library for building NETCONF servers and clients
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/libnetconf2
@@ -8,9 +8,9 @@ INHERIT=cmake
 IUSE=doc test
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.225:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server]
+RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.225:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] virtual/libcrypt:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libnetconf2/archive/v1.1.43.tar.gz -> libnetconf2-1.1.43.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=3df9729cc93a08aee74dfddba603c6dc
+_md5_=439a8bfae29ceee8374e646999e8ec28
diff --git a/metadata/md5-cache/net-libs/libnetconf2-1.1.46 b/metadata/md5-cache/net-libs/libnetconf2-1.1.46-r1
index 8526a2a15918..b49c0c56f555 100644
--- a/metadata/md5-cache/net-libs/libnetconf2-1.1.46
+++ b/metadata/md5-cache/net-libs/libnetconf2-1.1.46-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] test? ( dev-util/cmocka )
+DEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] virtual/libcrypt:= test? ( dev-util/cmocka )
 DESCRIPTION=C library for building NETCONF servers and clients
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/libnetconf2
@@ -8,9 +8,9 @@ INHERIT=cmake
 IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server]
+RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] virtual/libcrypt:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libnetconf2/archive/v1.1.46.tar.gz -> libnetconf2-1.1.46.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=fe8da58e775311041e0b0623e56f05c6
+_md5_=2c3e99d7eba24bea4a54c44750698e61
diff --git a/metadata/md5-cache/net-libs/libnetconf2-2.0.1 b/metadata/md5-cache/net-libs/libnetconf2-2.0.1-r1
index 832de23700d7..d90d321b49b4 100644
--- a/metadata/md5-cache/net-libs/libnetconf2-2.0.1
+++ b/metadata/md5-cache/net-libs/libnetconf2-2.0.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] test? ( dev-util/cmocka )
+DEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] virtual/libcrypt:= test? ( dev-util/cmocka )
 DESCRIPTION=C library for building NETCONF servers and clients
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/libnetconf2
@@ -8,9 +8,9 @@ INHERIT=cmake
 IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.0:= net-libs/libssh:0=[server]
+RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] virtual/libcrypt:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libnetconf2/archive/v2.0.1.tar.gz -> libnetconf2-2.0.1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=e1691e38994e4ed8c2721e95ba2b6124
+_md5_=61720a1337370aed814fee23de64dce9
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.0 b/metadata/md5-cache/net-libs/libpcap-1.10.0-r1
index 2246966d64c9..a1d7c889ed8f 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.0
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/flex virtual/yacc dbus? ( virtual/pkgconfig ) verify-sig? ( app-crypt/openpgp-keys-tcpdump ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
+DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
 DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
@@ -8,8 +8,8 @@ INHERIT=autotools multilib-minimal verify-sig
 IUSE=bluetooth dbus netlink rdma remote static-libs usb yydebug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
+RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.0.tar.gz -> libpcap-1.10.0-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.0.tar.gz.sig -> libpcap-1.10.0-upstream.tar.gz.sig )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=9f13f75156ecd5a222142c0a56449a28
+_md5_=6d845addc71499951cbfc5d8f972fe4e
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.1 b/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
index 3b869e66391e..e26492c863c1 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.1
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/flex virtual/yacc dbus? ( virtual/pkgconfig ) verify-sig? ( app-crypt/openpgp-keys-tcpdump ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
+DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
 DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
@@ -8,8 +8,8 @@ INHERIT=autotools multilib-minimal verify-sig
 IUSE=bluetooth dbus netlink rdma remote static-libs usb yydebug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
+RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz -> libpcap-1.10.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig -> libpcap-1.10.1-upstream.tar.gz.sig )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=1c322c2284bbf7ed71ac4531eab4d231
+_md5_=0593c4d74e506ee1964685dd92e79602
diff --git a/metadata/md5-cache/net-libs/libpcap-9999 b/metadata/md5-cache/net-libs/libpcap-9999
index c26dc710c025..c1c0d31d5c4e 100644
--- a/metadata/md5-cache/net-libs/libpcap-9999
+++ b/metadata/md5-cache/net-libs/libpcap-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/flex virtual/yacc dbus? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
+DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
 DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
@@ -8,7 +8,7 @@ INHERIT=autotools multilib-minimal git-r3
 IUSE=bluetooth dbus netlink rdma remote static-libs usb yydebug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
+RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb: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(-)?] )
 SLOT=0
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=992c2cf05e5bb5dc46dad7055cab569e
+_md5_=1cc43e577eaaab4e717d5397666f9b19
diff --git a/metadata/md5-cache/net-libs/xrootd-5.0.3 b/metadata/md5-cache/net-libs/xrootd-5.0.3-r1
index d4d0e2cf4136..53fccb3b3db9 100644
--- a/metadata/md5-cache/net-libs/xrootd-5.0.3
+++ b/metadata/md5-cache/net-libs/xrootd-5.0.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
@@ -8,10 +8,10 @@ INHERIT=cmake python-single-r1
 IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
+RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
 REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v5.0.3/xrootd-5.0.3.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75
-_md5_=1f629e4a59f56b88d02e8995003194fc
+_md5_=5ae863462044b8f45cd3d47d30823090
diff --git a/metadata/md5-cache/net-libs/xrootd-5.1.1 b/metadata/md5-cache/net-libs/xrootd-5.1.1-r1
index 6ad7261d4cf0..5deb8a0f3e2d 100644
--- a/metadata/md5-cache/net-libs/xrootd-5.1.1
+++ b/metadata/md5-cache/net-libs/xrootd-5.1.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
@@ -8,10 +8,10 @@ INHERIT=cmake python-single-r1
 IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
+RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
 REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v5.1.1/xrootd-5.1.1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75
-_md5_=6c55b5273ec748cae7ec56453cbafc63
+_md5_=e54a3a4db3200f18adc37a1e06c56d03
diff --git a/metadata/md5-cache/net-libs/xrootd-5.2.0 b/metadata/md5-cache/net-libs/xrootd-5.2.0-r1
index ddb408efebf9..ebc282641673 100644
--- a/metadata/md5-cache/net-libs/xrootd-5.2.0
+++ b/metadata/md5-cache/net-libs/xrootd-5.2.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
@@ -8,10 +8,10 @@ INHERIT=cmake python-single-r1
 IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
+RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib virtual/libcrypt:= fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
 REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v5.2.0/xrootd-5.2.0.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75
-_md5_=133021bcaa288253af3c1697e7d21e59
+_md5_=88ae543a055f3f40ede5d7875a8d8aa9
diff --git a/metadata/md5-cache/net-mail/checkpassword-0.90-r4 b/metadata/md5-cache/net-mail/checkpassword-0.90-r5
index 7a5a1469c13c..e9ac21c8f16f 100644
--- a/metadata/md5-cache/net-mail/checkpassword-0.90-r4
+++ b/metadata/md5-cache/net-mail/checkpassword-0.90-r5
@@ -1,4 +1,5 @@
 DEFINED_PHASES=install prepare
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=A uniform password checking interface for root applications
 EAPI=7
 HOMEPAGE=https://cr.yp.to/checkpwd.html
@@ -6,8 +7,9 @@ INHERIT=fixheadtails flag-o-matic toolchain-funcs
 IUSE=static
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
+RDEPEND=virtual/libcrypt:=
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://cr.yp.to/checkpwd/checkpassword-0.90.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=8346a91b1619de2d2d468a37685dbeee
+_md5_=f5222be1c05526164428148e3c160656
diff --git a/metadata/md5-cache/net-mail/dbmail-3.2.3-r3 b/metadata/md5-cache/net-mail/dbmail-3.2.3-r4
index baf01d69f0e6..e1f22a414d42 100644
--- a/metadata/md5-cache/net-mail/dbmail-3.2.3-r3
+++ b/metadata/md5-cache/net-mail/dbmail-3.2.3-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app-text/xmlto dev-db/libzdb >=dev-libs/glib-2.16 dev-libs/gmime:2.6 dev-libs/libevent sys-libs/zlib ldap? ( >=net-nds/openldap-2.3.33 ) sieve? ( >=mail-filter/libsieve-2.2.1 ) ssl? ( dev-libs/openssl:0= )
+DEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app-text/xmlto dev-db/libzdb >=dev-libs/glib-2.16 dev-libs/gmime:2.6 dev-libs/libevent:= sys-libs/zlib virtual/libcrypt:= ldap? ( >=net-nds/openldap-2.3.33 ) sieve? ( >=mail-filter/libsieve-2.2.1 ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Fast and scalable sql based email services
 EAPI=7
 HOMEPAGE=https://www.dbmail.org/
@@ -8,8 +8,8 @@ INHERIT=readme.gentoo-r1 systemd
 IUSE=ldap sieve ssl
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app-text/xmlto dev-db/libzdb >=dev-libs/glib-2.16 dev-libs/gmime:2.6 dev-libs/libevent sys-libs/zlib ldap? ( >=net-nds/openldap-2.3.33 ) sieve? ( >=mail-filter/libsieve-2.2.1 ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app-text/xmlto dev-db/libzdb >=dev-libs/glib-2.16 dev-libs/gmime:2.6 dev-libs/libevent:= sys-libs/zlib virtual/libcrypt:= ldap? ( >=net-nds/openldap-2.3.33 ) sieve? ( >=mail-filter/libsieve-2.2.1 ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/dbmail/dbmail/archive/v3.2.3.tar.gz -> dbmail-3.2.3.tar.gz
 _eclasses_=readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=8e420f224ab7808f2c6b3f410a504418
+_md5_=56eebee033e7174c6657a67d16f84e70
diff --git a/metadata/md5-cache/net-mail/dbmail-3.2.5 b/metadata/md5-cache/net-mail/dbmail-3.2.5-r1
index ad224d23c51f..ad84e968e1ed 100644
--- a/metadata/md5-cache/net-mail/dbmail-3.2.5
+++ b/metadata/md5-cache/net-mail/dbmail-3.2.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) jemalloc? ( dev-libs/jemalloc ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent ssl? ( dev-libs/openssl:0= )
+DEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) jemalloc? ( dev-libs/jemalloc ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent:= virtual/libcrypt:= ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Fast and scalable sql based email services
 EAPI=7
 HOMEPAGE=https://www.dbmail.org/
@@ -8,8 +8,8 @@ INHERIT=systemd readme.gentoo-r1
 IUSE=+doc jemalloc ldap sieve ssl static systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) jemalloc? ( dev-libs/jemalloc ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent ssl? ( dev-libs/openssl:0= ) acct-group/dbmail acct-user/dbmail
+RDEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) jemalloc? ( dev-libs/jemalloc ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent:= virtual/libcrypt:= ssl? ( dev-libs/openssl:0= ) acct-group/dbmail acct-user/dbmail
 SLOT=0
 SRC_URI=https://github.com/dbmail/dbmail/archive/v3.2.5.tar.gz -> dbmail-3.2.5.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=969e578f19676751599e2334b99ad7a6
+_md5_=2daf8c2e6c74c4a5a43f5ffa4784c2a8
diff --git a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1 b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r2
index a0a2e8a8454b..4045b4363404 100644
--- a/metadata/md5-cache/net-mail/tpop3d-1.5.5-r1
+++ b/metadata/md5-cache/net-mail/tpop3d-1.5.5-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( sys-libs/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+DEPEND=gdbm? ( sys-libs/gdbm:= ) sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1:= ) pam? ( >=net-mail/mailbase-0.00-r8 sys-libs/pam ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 DESCRIPTION=An extensible POP3 server with vmail-sql/MySQL support
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/tpop3d/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic autotools
 IUSE=authexternal debug flatfile gdbm ldap maildir mbox mysql offensive pam passwd perl postgres +sha1 shadow ssl tcpd
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( sys-libs/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+RDEPEND=gdbm? ( sys-libs/gdbm:= ) sha1? ( >=dev-libs/openssl-0.9.6:0= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) perl? ( >=dev-lang/perl-5.6.1:= ) pam? ( >=net-mail/mailbase-0.00-r8 sys-libs/pam ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=mirror://nongnu/tpop3d/tpop3d-1.5.5.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=16c73fbce67cd1a214546d3d569935ae
+_md5_=5f3d721b03f98d74a15850dd3b2f2965
diff --git a/metadata/md5-cache/net-misc/dropbear-2020.81-r2 b/metadata/md5-cache/net-misc/dropbear-2020.81-r3
index 35ab91449d33..6469f2d71e4e 100644
--- a/metadata/md5-cache/net-misc/dropbear-2020.81-r2
+++ b/metadata/md5-cache/net-misc/dropbear-2020.81-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) static? ( zlib? ( sys-libs/zlib[static-libs(+)] ) )
+DEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2 >=dev-libs/libtommath-1.2.0 virtual/libcrypt zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) static? ( virtual/libcrypt[static-libs(+)] zlib? ( sys-libs/zlib[static-libs(+)] ) )
 DESCRIPTION=small SSH 2 client/server designed for small memory environments
 EAPI=7
 HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
@@ -7,9 +7,9 @@ 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
 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 )
+RDEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2 >=dev-libs/libtommath-1.2.0 virtual/libcrypt 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	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=d33e7b63a2765c69a2f465b8cccf5c5e
+_md5_=015a05b775b5e06084bff62662c62cdc
diff --git a/metadata/md5-cache/net-misc/frr-7.5.1-r3 b/metadata/md5-cache/net-misc/frr-7.5.1-r4
index 72be4478894a..c5dfb2f28a55 100644
--- a/metadata/md5-cache/net-misc/frr-7.5.1-r3
+++ b/metadata/md5-cache/net-misc/frr-7.5.1-r4
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/clippy sys-devel/flex virtual/yacc doc? ( dev-python/sphinx ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-1.0.184 <net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= grpc? ( net-libs/grpc ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-1.0.184 <net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) )
 DESCRIPTION=The FRRouting Protocol Suite
 EAPI=7
 HOMEPAGE=https://frrouting.org/
@@ -8,10 +8,10 @@ INHERIT=autotools pam python-single-r1 systemd
 IUSE=doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-1.0.184 <net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= grpc? ( net-libs/grpc ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp ) python_single_target_python3_8? ( dev-python/ipaddr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ipaddr[python_targets_python3_9(-)] ) !net-misc/quagga
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-1.0.184 <net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_8? ( dev-python/ipaddr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ipaddr[python_targets_python3_9(-)] ) !net-misc/quagga
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FRRouting/frr/archive/frr-7.5.1.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	969dff6876159a10dfdad9e01d265d1c	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=d00f3406e45b081707c982be2a8b79df
+_md5_=8c5eddcddb45bdba5add6320adc97037
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.10 b/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
index 870d1eccc765..3668489c0174 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.10
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
+DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
@@ -8,10 +8,10 @@ INHERIT=systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
+RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
 REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.10.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=e6a78a6f1230bad4b2aa8855de9aa87f
+_md5_=01efa62757f022209c31dbc740458db7
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.11 b/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
index 002d53eed3b4..d7beb636037e 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.11
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
+DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
@@ -8,10 +8,10 @@ INHERIT=systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
+RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
 REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.11.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=30e9ed859cf55af04edc4f57eb07669d
+_md5_=c7f6db3fd200a43ed43ea6f9c426898a
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.7 b/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
index 7819901e37c8..e6772c2228a3 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.7
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
+DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
@@ -8,10 +8,10 @@ INHERIT=systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
+RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
 REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.7.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=58411d537af18a2f3b4f0edf48a43ff7
+_md5_=9bee5657aab113a3180cbea4c9a608f6
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.9 b/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
index 712e31b12849..77518899926f 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.9
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
+DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
@@ -8,10 +8,10 @@ INHERIT=systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
+RDEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.11:= sys-libs/readline:0= seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) zsh-completion? ( app-shells/zsh ) virtual/tmpfiles
 REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.9.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=d72d814e4c2e0cdb8d09feca533ea80a
+_md5_=0d764fdfded33b38adec48426c02d2cd
diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r11 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r13
index a2f254bff468..049d83711521 100644
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r11
+++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r13
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/xz-utils filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/ncurses:0 pam? ( >=sys-auth/pambase-20080219.1 )
+DEPEND=sys-libs/ncurses:0= virtual/libcrypt:= 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/
@@ -8,8 +8,8 @@ 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
 LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0 pam? ( >=sys-auth/pambase-20080219.1 ) filecaps? ( sys-libs/libcap )
+RDEPEND=sys-libs/ncurses:0= virtual/libcrypt:= 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_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	fcaps	ac252c3cc67b265cd7ea456f8d58e150
-_md5_=3441b1f5b02d07cc4659feaf1c7a141d
+_md5_=6d72227359d3ba9cf201fa1bf5d98c12
diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r12 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r14
index 9f1077569c52..b14ff8ab0ba2 100644
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r12
+++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r14
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/xz-utils filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/ncurses:= pam? ( >=sys-auth/pambase-20080219.1 )
+DEPEND=sys-libs/ncurses:= virtual/libcrypt:= 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/
@@ -8,8 +8,8 @@ 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
 LICENSE=BSD
-RDEPEND=sys-libs/ncurses:= pam? ( >=sys-auth/pambase-20080219.1 ) filecaps? ( sys-libs/libcap )
+RDEPEND=sys-libs/ncurses:= virtual/libcrypt:= 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
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	fcaps	ac252c3cc67b265cd7ea456f8d58e150
-_md5_=e6f9e9d58a89b1edcf64183c2f4393a7
+_md5_=dcbeb950f0cd5ae8e0ed2a09a3781165
diff --git a/metadata/md5-cache/net-misc/nxplayer-5.1.24.1 b/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1
index f85fb1e1ca30..3b2540195fcf 100644
--- a/metadata/md5-cache/net-misc/nxplayer-5.1.24.1
+++ b/metadata/md5-cache/net-misc/nxplayer-5.1.24.1-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://www.nomachine.com
 INHERIT=versionator wrapper
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=nomachine
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:0
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:0 || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.24_1_i686.tar.gz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=385ab7c6ba1571c0702710bb888c18dd
+_md5_=9d4d980a59fd7222dd5112636c21ae96
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4-r1
index 703a21d0e48c..b2aa39683321 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/quagga acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/gawk sys-devel/libtool:2 test? ( dev-util/dejagnu )
+DEPEND=acct-group/quagga acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp:= ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/gawk sys-devel/libtool:2 test? ( dev-util/dejagnu )
 DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=7
 HOMEPAGE=https://www.quagga.net/
@@ -8,9 +8,9 @@ INHERIT=autotools flag-o-matic pam readme.gentoo-r1 systemd tmpfiles
 IUSE=bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test
 KEYWORDS=~alpha amd64 arm ~hppa ppc ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=acct-group/quagga acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
+RDEPEND=acct-group/quagga acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp:= ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=d3f47dc07ec4d8dbccdca87d72f8a93d
+_md5_=654b35c52b4acf2169b8c162d096d612
diff --git a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6-r1 b/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6-r2
index 2d19eaa25887..abd07f3622e5 100644
--- a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6-r1
+++ b/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6-r2
@@ -1,13 +1,14 @@
+BDEPEND=sys-devel/flex virtual/yacc
 DEFINED_PHASES=compile install postinst
-DEPEND=sys-devel/flex virtual/yacc
+DEPEND=virtual/libcrypt:=
 DESCRIPTION=ARIN rwhois daemon
 EAPI=7
 HOMEPAGE=http://projects.arin.net/rwhois/
 INHERIT=flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=acct-group/rwhoisd acct-user/rwhoisd
+RDEPEND=virtual/libcrypt:= acct-group/rwhoisd acct-user/rwhoisd
 SLOT=0
 SRC_URI=https://github.com/arineng/rwhoisd/archive/1.5.9.6.tar.gz -> rwhoisd-1.5.9.6.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=561f7cb1202ee7bd7156f76734923d1d
+_md5_=93a2f794f87eae6c762ad1742b4a0113
diff --git a/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214-r1 b/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214-r1
deleted file mode 100644
index 8add53fc692b..000000000000
--- a/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0 net-nds/openldap dev-libs/popt dev-libs/glib:2 sys-libs/readline gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Manage LDAP entries with a text editor
-EAPI=5
-HOMEPAGE=http://www.lichteblau.com/ldapvi/
-INHERIT=autotools
-IUSE=gnutls sasl
-KEYWORDS=amd64 ~hppa ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 net-nds/openldap dev-libs/popt dev-libs/glib:2 sys-libs/readline gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) sasl? ( dev-libs/cyrus-sasl:2 )
-SLOT=0
-SRC_URI=mirror://gentoo/ldapvi-1.7_p20101214.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=823261a8950b01f35a418f7283fcc496
diff --git a/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214-r2 b/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214-r2
new file mode 100644
index 000000000000..4ea69b8aa9dc
--- /dev/null
+++ b/metadata/md5-cache/net-nds/ldapvi-1.7_p20101214-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/popt dev-libs/glib:2 net-nds/openldap sys-libs/readline:= sys-libs/ncurses:0= virtual/libcrypt:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) sasl? ( dev-libs/cyrus-sasl:2 )
+DESCRIPTION=Manage LDAP entries with a text editor
+EAPI=7
+HOMEPAGE=http://www.lichteblau.com/ldapvi/
+INHERIT=autotools
+IUSE=gnutls sasl
+KEYWORDS=amd64 ~hppa ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt dev-libs/glib:2 net-nds/openldap sys-libs/readline:= sys-libs/ncurses:0= virtual/libcrypt:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) sasl? ( dev-libs/cyrus-sasl:2 )
+SLOT=0
+SRC_URI=mirror://gentoo/ldapvi-1.7_p20101214.tar.bz2
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=51ff1c8c22ff5c3683baf2e161a3088c
diff --git a/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4 b/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r5
index 5aee8878337a..288af8eaaf7a 100644
--- a/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4
+++ b/metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r5
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libnsl sys-libs/pam skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
+DEPEND=net-libs/libnsl:= sys-libs/pam virtual/libcrypt:= skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=An updated version of Cisco's TACACS+ server
 EAPI=7
 HOMEPAGE=http://www.shrubbery.net/tac_plus/
@@ -8,8 +8,8 @@ INHERIT=autotools
 IUSE=debug finger maxsess tcpd skey static-libs
 KEYWORDS=amd64 ppc x86
 LICENSE=HPND RSA GPL-2
-RDEPEND=net-libs/libnsl sys-libs/pam skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
+RDEPEND=net-libs/libnsl:= sys-libs/pam virtual/libcrypt:= skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=ftp://ftp.shrubbery.net/pub/tac_plus/tacacs+-F4.0.4.19.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=0367e364aa97f91928714bb96b206638
+_md5_=523aba65d282be6b36c27f609c0876a1
diff --git a/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a b/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a-r2
index 9a50e1dffc27..63239096d018 100644
--- a/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a
+++ b/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libnsl sys-libs/pam skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
+DEPEND=net-libs/libnsl:= sys-libs/pam virtual/libcrypt:= skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=An updated version of Cisco's TACACS+ server
 EAPI=7
 HOMEPAGE=http://www.shrubbery.net/tac_plus/
@@ -8,8 +8,8 @@ INHERIT=autotools
 IUSE=debug finger maxsess tcpd skey static-libs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=HPND RSA GPL-2
-RDEPEND=net-libs/libnsl sys-libs/pam skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
+RDEPEND=net-libs/libnsl:= sys-libs/pam virtual/libcrypt:= skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=ftp://ftp.shrubbery.net/pub/tac_plus/tacacs+-F4.0.4.27a.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=ce1f6262a1844f781d8d0f1d5f0b7748
+_md5_=7f639df9be777e3f7dc29ba03fba0aee
diff --git a/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a-r1 b/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a-r3
index 5ff748f56371..c5e871d1b1c8 100644
--- a/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a-r1
+++ b/metadata/md5-cache/net-nds/tac_plus-4.0.4.27a-r3
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libnsl sys-libs/pam skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
+DEPEND=net-libs/libnsl:= sys-libs/pam virtual/libcrypt:= skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=An updated version of Cisco's TACACS+ server
 EAPI=7
 HOMEPAGE=http://www.shrubbery.net/tac_plus/
@@ -8,8 +8,8 @@ INHERIT=autotools pam
 IUSE=debug finger maxsess tcpd skey static-libs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=HPND RSA GPL-2
-RDEPEND=net-libs/libnsl sys-libs/pam skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
+RDEPEND=net-libs/libnsl:= sys-libs/pam virtual/libcrypt:= skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=ftp://ftp.shrubbery.net/pub/tac_plus/tacacs+-F4.0.4.27a.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=64c6c707ab642792249f3bf75b68dd92
+_md5_=5feac606139eb91d82cd4684187e4003
diff --git a/metadata/md5-cache/net-nds/yp-tools-4.2.3 b/metadata/md5-cache/net-nds/yp-tools-4.2.3-r1
index ab2d80987c62..82d3b123ff7e 100644
--- a/metadata/md5-cache/net-nds/yp-tools-4.2.3
+++ b/metadata/md5-cache/net-nds/yp-tools-4.2.3-r1
@@ -1,6 +1,6 @@
-BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libtirpc:= >=net-libs/libnsl-1.2.0:0= nls? ( virtual/libintl )
+DEPEND=net-libs/libtirpc:= >=net-libs/libnsl-1.2.0:0= virtual/libcrypt:= nls? ( virtual/libintl )
 DESCRIPTION=Network Information Service tools
 EAPI=7
 HOMEPAGE=https://www.thkukuk.de/nis/
@@ -8,8 +8,8 @@ INHERIT=autotools systemd
 IUSE=nls
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
-RDEPEND=net-libs/libtirpc:= >=net-libs/libnsl-1.2.0:0= nls? ( virtual/libintl )
+RDEPEND=net-libs/libtirpc:= >=net-libs/libnsl-1.2.0:0= virtual/libcrypt:= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/thkukuk/yp-tools/archive/v4.2.3.tar.gz -> yp-tools-4.2.3.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=e5f49a16a3a0b8adb62518d5160cd19c
+_md5_=cdc76929ba7ae69a3abc75afa8a4cf71
diff --git a/metadata/md5-cache/net-p2p/dbhub-0.451-r1 b/metadata/md5-cache/net-p2p/dbhub-0.451-r2
index e470ea12f696..743f93dbfc6e 100644
--- a/metadata/md5-cache/net-p2p/dbhub-0.451-r1
+++ b/metadata/md5-cache/net-p2p/dbhub-0.451-r2
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
-DEPEND=perl? ( dev-lang/perl ) switch-user? ( sys-libs/libcap )
+DEPEND=virtual/libcrypt:= perl? ( dev-lang/perl:= ) switch-user? ( sys-libs/libcap )
 DESCRIPTION=Hub software for Direct Connect, fork of opendchub
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/dbhub/
@@ -8,8 +8,8 @@ INHERIT=autotools flag-o-matic
 IUSE=debug nls perl switch-user
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl ) switch-user? ( sys-libs/libcap )
+RDEPEND=virtual/libcrypt:= perl? ( dev-lang/perl:= ) switch-user? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbhub/dbhub-0.451.tbz2
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=a36293dd517109f1e34f6b20ae46a391
+_md5_=62769d67e558eb542d6559589625a17b
diff --git a/metadata/md5-cache/net-p2p/opendchub-0.8.2 b/metadata/md5-cache/net-p2p/opendchub-0.8.2-r1
index 3d033240ebd1..7a19172b6b0f 100644
--- a/metadata/md5-cache/net-p2p/opendchub-0.8.2
+++ b/metadata/md5-cache/net-p2p/opendchub-0.8.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=perl? ( dev-lang/perl )
+DEPEND=dev-libs/openssl:= virtual/libcrypt:= perl? ( dev-lang/perl:= ) !perl? ( sys-libs/libcap )
 DESCRIPTION=hub software for Direct Connect
 EAPI=7
 HOMEPAGE=http://opendchub.sf.net
@@ -8,8 +8,8 @@ INHERIT=autotools flag-o-matic
 IUSE=perl
 KEYWORDS=~amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl )
+RDEPEND=dev-libs/openssl:= virtual/libcrypt:= perl? ( dev-lang/perl:= ) !perl? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendchub/opendchub-0.8.2.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=9a5e191b9d0a615f3d516f6dfe4c8304
+_md5_=16dd3d7e5ea43f7b505bfe492b107261
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r1
index 461eb9a03f3f..3a9db508e630 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://resilio.com/
 INHERIT=pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=virtual/tmpfiles
+RDEPEND=|| ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] ) virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb ) x86? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_i386.deb )
 _eclasses_=pax-utils	74cd9920d64148719fb62c462935c1b5	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	user	1033b6bed7cf367c4507ea9a3ff503d0
-_md5_=26a92518853c70500f7a8b4f650beae9
+_md5_=ce70c001162e140d84535e3761ecb6df
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.29 b/metadata/md5-cache/net-proxy/haproxy-1.8.29-r1
index 881affbe6ebf..03a79631fa3c 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.29
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.29-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/1.8
 SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.29.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=08db864ca6ed08e9d9966079cd097d5a
+_md5_=29ec032441476ed4063af9f472c5fd62
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.30 b/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1
index f5178a7f586d..ec4e389a8083 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.30
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.30-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/1.8
 SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.30.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=08db864ca6ed08e9d9966079cd097d5a
+_md5_=29ec032441476ed4063af9f472c5fd62
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.14-r2 b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r3
index b1dfa27d366c..1f20e9aafe5f 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.14-r2
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.14-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=amd64 arm ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.14.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=494202b9a097bc25a3ddd737dc77bb75
+_md5_=1720417c7abee76c91042fde60a5691f
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.21 b/metadata/md5-cache/net-proxy/haproxy-2.0.21-r1
index d3d0a6426fc6..f3e41d0bd546 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.21
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.21-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.21.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=fc0e439e4237b6f2416230c0db7036f6
+_md5_=0790b649f1ac59ae2ac93614eaec1561
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.22 b/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1
index 0dbb5f7f7a82..7cea126c3f2f 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.22
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.22-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.22.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=fc0e439e4237b6f2416230c0db7036f6
+_md5_=0790b649f1ac59ae2ac93614eaec1561
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.9999 b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
index 145a3aa54c2a..9f1c5fafa3c2 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,8 +8,8 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info git-r3
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=eb98c0dbb058ac691e085062cbdcc96e
+_md5_=789e07b942d97b7437801c54209276fd
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.12 b/metadata/md5-cache/net-proxy/haproxy-2.2.12-r1
index a24cca2daecc..bfdb4de0d044 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.12
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.12-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.12.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=fc0e439e4237b6f2416230c0db7036f6
+_md5_=0790b649f1ac59ae2ac93614eaec1561
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.13 b/metadata/md5-cache/net-proxy/haproxy-2.2.13-r1
index 5a7c34b1ec4b..7eb24dd5e8d4 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.13
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.13-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.13.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=fc0e439e4237b6f2416230c0db7036f6
+_md5_=0790b649f1ac59ae2ac93614eaec1561
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.14 b/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1
index 8aae06844bcf..4ec98054a0ee 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.14
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.14-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.14.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=fc0e439e4237b6f2416230c0db7036f6
+_md5_=0790b649f1ac59ae2ac93614eaec1561
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.5-r1 b/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2
index 89c7bf4eefb8..17b14c667a87 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.5-r1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.5-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=amd64 arm ppc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.5.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=25184c3df9221caff5ff795984d15e2b
+_md5_=7fc67f404f0580f37f56b9b85d41c184
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.9999 b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
index 67e075dfb328..83078ae59ddf 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,8 +8,8 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info git-r3
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=fc0e439e4237b6f2416230c0db7036f6
+_md5_=0790b649f1ac59ae2ac93614eaec1561
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.10 b/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1
index a5d3071d2e2d..fd00888591bf 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.10
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.10-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
 SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.10.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=847bc108becc044486dad3a5a3824768
+_md5_=96ab93ae3223435b7727504c3f9cba58
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.9 b/metadata/md5-cache/net-proxy/haproxy-2.3.9-r1
index 9309407c3ca5..e0c070f4f56a 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.9
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
 SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.9.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=847bc108becc044486dad3a5a3824768
+_md5_=96ab93ae3223435b7727504c3f9cba58
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.9999 b/metadata/md5-cache/net-proxy/haproxy-2.3.9999
index 95c5814837b5..bf7d8a39935e 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,8 +8,8 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info git-r3
 IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=fc0e439e4237b6f2416230c0db7036f6
+_md5_=0790b649f1ac59ae2ac93614eaec1561
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.0 b/metadata/md5-cache/net-proxy/haproxy-2.4.0-r1
index 6c651b9d80d2..3171a8f8585e 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.0
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.0.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=ffb922680f24c609acaab773ca32d1fc
+_md5_=8a118be030f909723c3b8254162f6e49
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.1 b/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1
index d42e531bb1db..872358bd2b19 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.1
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info
 IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c
-_md5_=ffb922680f24c609acaab773ca32d1fc
+_md5_=8a118be030f909723c3b8254162f6e49
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.9999 b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
index 51bc938e1244..15788c065a15 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
@@ -8,8 +8,8 @@ INHERIT=toolchain-funcs flag-o-matic systemd linux-info git-r3
 IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl kernel_linux
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0=[zlib?] ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=ffb922680f24c609acaab773ca32d1fc
+_md5_=8a118be030f909723c3b8254162f6e49
diff --git a/metadata/md5-cache/net-proxy/squid-4.15-r1 b/metadata/md5-cache/net-proxy/squid-4.15-r2
index 875395ee3200..5bcb48c506d5 100644
--- a/metadata/md5-cache/net-proxy/squid-4.15-r1
+++ b/metadata/md5-cache/net-proxy/squid-4.15-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit )
+DEPEND=acct-group/squid acct-user/squid virtual/libcrypt:= caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5:= ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit )
 DESCRIPTION=A full-featured web proxy cache
 EAPI=7
 HOMEPAGE=http://www.squid-cache.org/
@@ -8,10 +8,10 @@ INHERIT=autotools flag-o-matic linux-info pam systemd toolchain-funcs
 IUSE=caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux kernel_linux
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=acct-group/squid acct-user/squid caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 samba? ( net-fs/samba ) perl? ( dev-lang/perl ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=acct-group/squid acct-user/squid virtual/libcrypt:= caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) gnutls? ( >=net-libs/gnutls-3.1.5:= ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0 samba? ( net-fs/samba ) perl? ( dev-lang/perl ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.15.tar.xz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=85811d9d34ef970334948507a5da17c7
+_md5_=35cba7421e33003a2b8875176ed4eb4c
diff --git a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r7 b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r8
index 92fd358f04d9..2f30c286da1b 100644
--- a/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r7
+++ b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=dev-libs/openssl:0= kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-2.6.30 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=dev-libs/openssl:0= virtual/libcrypt:= kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-2.6.30 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
 EAPI=6
 HOMEPAGE=http://ipsec-tools.sourceforge.net/
@@ -7,8 +7,8 @@ INHERIT=flag-o-matic autotools linux-info pam systemd
 IUSE=hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats kernel_linux
 KEYWORDS=amd64 arm ~ia64 ~mips ppc ppc64 x86
 LICENSE=BSD GPL-2
-RDEPEND=dev-libs/openssl:0= kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:0= ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2 https://dev.gentoo.org/~juippis/distfiles/tmp/ipsec-tools-add-openssl-1.1.x-support.patch
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	pam	41ce39f668e11d31ff4734f3b5794f7d	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=06a0696215ec985f9ef8f303d0f19fbe
+_md5_=906fd7610c7df835c5a5fab95f503ee0
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32 b/metadata/md5-cache/net-vpn/libreswan-3.32-r2
index 243aebb5321c..724e71e43d72 100644
--- a/metadata/md5-cache/net-vpn/libreswan-3.32
+++ b/metadata/md5-cache/net-vpn/libreswan-3.32-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
 DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=7
 HOMEPAGE=https://libreswan.org/
@@ -8,9 +8,9 @@ INHERIT=systemd toolchain-funcs
 IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=9c5a879046a1a83940d57e0799bbded6
+_md5_=3fe0497a84521c42373499e01636dbee
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32-r1 b/metadata/md5-cache/net-vpn/libreswan-3.32-r3
index cd5f839fc31c..77f950ba8299 100644
--- a/metadata/md5-cache/net-vpn/libreswan-3.32-r1
+++ b/metadata/md5-cache/net-vpn/libreswan-3.32-r3
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
 DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=7
 HOMEPAGE=https://libreswan.org/
@@ -8,9 +8,9 @@ INHERIT=systemd toolchain-funcs
 IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=330b08cb89a2f8172dfc16cb8cdf5fc2
+_md5_=e1b7961a271aa57b391157458373c24e
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.2 b/metadata/md5-cache/net-vpn/libreswan-4.2-r1
index bc776295c3c7..922ee0ea9046 100644
--- a/metadata/md5-cache/net-vpn/libreswan-4.2
+++ b/metadata/md5-cache/net-vpn/libreswan-4.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
 DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=7
 HOMEPAGE=https://libreswan.org/
@@ -8,9 +8,9 @@ INHERIT=systemd toolchain-funcs
 IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-4.2.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=cc526226037661e13c4dd458a0ce51de
+_md5_=025def8cf06ad842822646bd561f2136
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.3 b/metadata/md5-cache/net-vpn/libreswan-4.3-r1
index 88b40781fdb7..fdf6fd1ed5ac 100644
--- a/metadata/md5-cache/net-vpn/libreswan-4.3
+++ b/metadata/md5-cache/net-vpn/libreswan-4.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
 DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=7
 HOMEPAGE=https://libreswan.org/
@@ -8,9 +8,9 @@ INHERIT=systemd toolchain-funcs
 IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-4.3.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=ee01220232915ff8e98b985e23ec068c
+_md5_=2098b449ab9c65e70bc838256fcf0df2
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.4 b/metadata/md5-cache/net-vpn/libreswan-4.4-r2
index 90fee66f5e31..c6880479a3fd 100644
--- a/metadata/md5-cache/net-vpn/libreswan-4.4
+++ b/metadata/md5-cache/net-vpn/libreswan-4.4-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
 DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=7
 HOMEPAGE=https://libreswan.org/
@@ -8,9 +8,9 @@ INHERIT=systemd toolchain-funcs
 IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-4.4.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=d808e867abf157207f32a0f3309b4f6b
+_md5_=2263fbe4d9dfb697af73f68566961043
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.4-r1 b/metadata/md5-cache/net-vpn/libreswan-4.4-r3
index e25d12f7cb79..892a45acb918 100644
--- a/metadata/md5-cache/net-vpn/libreswan-4.4-r1
+++ b/metadata/md5-cache/net-vpn/libreswan-4.4-r3
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
 DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=7
 HOMEPAGE=https://libreswan.org/
@@ -8,9 +8,9 @@ INHERIT=systemd toolchain-funcs
 IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-4.4.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	systemd	bd82a2f06f5594b2ed0889539a4f9a9f
-_md5_=f0004bdacfc10f83aceff1afef2672c2
+_md5_=6c1cd0adf74ac9045fc12423d2cdff6f
diff --git a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2 b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2-r1
index 536956f607e1..11baafea8ffa 100644
--- a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
+++ b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst
-DEPEND=sys-libs/pam >=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0=
-DESCRIPTION=pam module to authenticate users via PostgreSQL
+DEPEND=>=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0= sys-libs/pam virtual/libcrypt:=
+DESCRIPTION=PAM module to authenticate users via PostgreSQL
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/pam-pgsql/
 INHERIT=pam
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/pam >=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0=
+RDEPEND=>=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0= sys-libs/pam virtual/libcrypt:=
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-pgsql/pam-pgsql-0.7.3.2.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=76de58c420a509a4e6b2753161b519f0
+_md5_=f4bd7a9bd8a699d6f354c14beb896cb7
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.8.1-r1 b/metadata/md5-cache/sys-auth/pam_mysql-0.8.1-r2
index e22a1b038476..37fda81a6817 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.8.1-r1
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.8.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= openssl? ( dev-libs/openssl:0= ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= virtual/libcrypt:= openssl? ( dev-libs/openssl:0= ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=pam_mysql is a module for pam to authenticate users with mysql
 EAPI=6
 HOMEPAGE=https://github.com/NigelCunningham/pam-MySQL
@@ -7,8 +7,8 @@ INHERIT=autotools pam
 IUSE=openssl
 KEYWORDS=~alpha amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= openssl? ( dev-libs/openssl:0= )
+RDEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= virtual/libcrypt:= openssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/NigelCunningham/pam-MySQL/archive/v0.8.1.tar.gz -> pam_mysql-0.8.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=2feb4db91b6095355cf5c8b50e6ac001
+_md5_=597ef2e34c236f4e9f79aaf450e60863
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.8.2 b/metadata/md5-cache/sys-auth/pam_mysql-0.8.2-r1
index 4f1ec87766ee..c47692e5c166 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.8.2
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.8.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= openssl? ( dev-libs/openssl:0= )
+DEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= virtual/libcrypt:= openssl? ( dev-libs/openssl:0= )
 DESCRIPTION=pam_mysql is a module for pam to authenticate users with mysql
 EAPI=7
 HOMEPAGE=https://github.com/NigelCunningham/pam-MySQL
@@ -8,8 +8,8 @@ INHERIT=autotools pam
 IUSE=openssl
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= openssl? ( dev-libs/openssl:0= )
+RDEPEND=>=sys-libs/pam-0.72:0= dev-db/mysql-connector-c:0= virtual/libcrypt:= openssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/NigelCunningham/pam-MySQL/archive/v0.8.2.tar.gz -> pam_mysql-0.8.2.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=fbdd022c72a9d4804a5c07be2e8a08cf
+_md5_=30604143465661d80afea65d250d5b9b
diff --git a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2 b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r3
index f51e5aa728a8..1e18a6ff3bc5 100644
--- a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2
+++ b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r3
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/pam-0.75
+DEFINED_PHASES=configure install postinst
+DEPEND=virtual/libcrypt:= >=sys-libs/pam-0.75
 DESCRIPTION=PAM module for authenticating against an SMB (such as the Win_x families) server
 EAPI=7
 HOMEPAGE=http://www.csn.ul.ie/~airlied/pam_smb/
 INHERIT=pam toolchain-funcs
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/pam-0.75
+RDEPEND=virtual/libcrypt:= >=sys-libs/pam-0.75
 SLOT=0
 SRC_URI=mirror://samba/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz http://www.csn.ul.ie/~airlied/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=311999329ae1f9f33abb2a8ec1559d0a
+_md5_=b6d05c9df737b8999ac1e0f3a880d3f0
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.9-r1 b/metadata/md5-cache/sys-block/partimage-0.6.9-r2
index f3744b2a1da0..6d60ba89c0c2 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.9-r1
+++ b/metadata/md5-cache/sys-block/partimage-0.6.9-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=!static? ( pam? ( sys-libs/pam ) ) app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= ssl? ( dev-libs/openssl:0= ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!static? ( pam? ( sys-libs/pam ) ) app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= !nologin? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Console-based application to efficiently save raw partition data to image file
 EAPI=6
 HOMEPAGE=http://www.partimage.org/
@@ -7,8 +7,8 @@ INHERIT=autotools flag-o-matic pam user
 IUSE=nls nologin pam ssl static
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=!static? ( pam? ( sys-libs/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= ssl? ( dev-libs/openssl:0= ) )
+RDEPEND=!static? ( pam? ( sys-libs/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= !nologin? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d	user-info	2e75eaea3582b052ec16d9d5aa74ced3	user	1033b6bed7cf367c4507ea9a3ff503d0
-_md5_=ff9015580ed1320c3f8fc97fdc4c8929
+_md5_=4c93b483e92d18b43b7a5776692a6590
diff --git a/metadata/md5-cache/sys-boot/mokutil-0.3.0_p20170405 b/metadata/md5-cache/sys-boot/mokutil-0.3.0_p20170405
new file mode 100644
index 000000000000..c9b38e3052d0
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/mokutil-0.3.0_p20170405
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/openssl:= sys-libs/efivar:= virtual/libcrypt:=
+DESCRIPTION=The utility to manipulate machines owner keys which managed in shim
+EAPI=7
+HOMEPAGE=https://github.com/lcp/mokutil
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/openssl:= sys-libs/efivar:= virtual/libcrypt:=
+SLOT=0
+SRC_URI=https://github.com/lcp/mokutil/archive/e19adc575c1f9d8f08b7fbc594a0887ace63f83f.tar.gz -> mokutil-0.3.0_p20170405.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=af64ae863071314d5bed85d73134c015
diff --git a/metadata/md5-cache/sys-boot/mokutil-0.4.0 b/metadata/md5-cache/sys-boot/mokutil-0.4.0
deleted file mode 100644
index 0000d999ea41..000000000000
--- a/metadata/md5-cache/sys-boot/mokutil-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/openssl:= sys-libs/efivar:= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The utility to manipulate machines owner keys which managed in shim
-EAPI=6
-HOMEPAGE=https://github.com/lcp/mokutil
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:= sys-libs/efivar:=
-SLOT=0
-SRC_URI=https://github.com/lcp/mokutil/archive/e19adc575c1f9d8f08b7fbc594a0887ace63f83f.tar.gz -> mokutil-0.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=16cfd172c54e8c8000508de86efdeaaf
diff --git a/metadata/md5-cache/sys-boot/mokutil-0.5.0 b/metadata/md5-cache/sys-boot/mokutil-0.5.0
new file mode 100644
index 000000000000..85b6276aa551
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/mokutil-0.5.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/openssl:= sys-libs/efivar:= virtual/libcrypt:=
+DESCRIPTION=The utility to manipulate machines owner keys which managed in shim
+EAPI=7
+HOMEPAGE=https://github.com/lcp/mokutil
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/openssl:= sys-libs/efivar:= virtual/libcrypt:=
+SLOT=0
+SRC_URI=https://github.com/lcp/mokutil/archive/0.5.0.tar.gz -> mokutil-0.5.0.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=7c6208cc619e560ec98a0042cc2d9c66
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.238 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.238
new file mode 100644
index 000000000000..e7e31c6c7fdb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.238
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.238
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-248.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-248.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-248.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-248.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-248.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-248.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-248.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-248.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-248.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	kernel-2	66af59cfd68077668c584c41aea800ef
+_md5_=7d71b111e5d4cd56b8d800489f044418
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.196 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.196
new file mode 100644
index 000000000000..ad87f366a8fd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.196
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.196
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-195.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-195.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-195.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-195.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-195.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-195.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-195.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-195.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-195.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	kernel-2	66af59cfd68077668c584c41aea800ef
+_md5_=392f9a886179177756de3d7683c3775a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.274 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.274
new file mode 100644
index 000000000000..0e1b8bd36041
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.274
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.274
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-276.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-276.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-276.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-276.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-276.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-276.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-276.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-276.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-276.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	kernel-2	66af59cfd68077668c584c41aea800ef
+_md5_=541a2ac4b5a36a6958fcf1c8007b1375
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.274 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.274
new file mode 100644
index 000000000000..ebe171b03c6f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.274
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.274
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-278.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-278.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-278.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-278.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-278.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-278.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-278.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-278.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-278.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	kernel-2	66af59cfd68077668c584c41aea800ef
+_md5_=dc827f2e91c83ab7accfcd188d33069a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.47 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.47
new file mode 100644
index 000000000000..446966374d39
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.47
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.47
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-51.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-51.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-51.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-51.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-51.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-51.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-51.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	kernel-2	66af59cfd68077668c584c41aea800ef
+_md5_=b993531ce457051c73d85c3fb2948ad8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.129 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.129
new file mode 100644
index 000000000000..ee3548dc94b2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.129
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=7
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.129
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-133.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-133.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-133.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-133.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-133.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-133.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-133.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	kernel-2	66af59cfd68077668c584c41aea800ef
+_md5_=2a2d70a15fdcdbaa33bad0e97110abf4
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2021a b/metadata/md5-cache/sys-libs/timezone-data-2021a-r1
index e4baa7a9cb73..144cc0622250 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2021a
+++ b/metadata/md5-cache/sys-libs/timezone-data-2021a-r1
@@ -11,4 +11,4 @@ RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2021a.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2021a.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5
-_md5_=15e264cf57172cde6ff21de52a7fe5aa
+_md5_=ba63b05ffe7ffcb62e80fbd0b00feabe
diff --git a/metadata/md5-cache/www-apache/pwauth-2.3.10 b/metadata/md5-cache/www-apache/pwauth-2.3.10-r1
index cf7334bdec8b..2b53d0577d36 100644
--- a/metadata/md5-cache/www-apache/pwauth-2.3.10
+++ b/metadata/md5-cache/www-apache/pwauth-2.3.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup
-DEPEND=pam? ( sys-libs/pam )
+DEPEND=pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
 DESCRIPTION=A Unix Web Authenticator
 EAPI=7
 HOMEPAGE=https://github.com/phokz/pwauth/tree/master/pwauth
@@ -7,8 +7,8 @@ INHERIT=flag-o-matic pam toolchain-funcs
 IUSE=faillog pam ignore-case domain-aware
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-1.1
-RDEPEND=pam? ( sys-libs/pam )
+RDEPEND=pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
 SLOT=0
 SRC_URI=https://pwauth.googlecode.com/files/pwauth-2.3.10.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=5cfd9191e959706c63790088569a944e
+_md5_=79c0227b3ec5bd9eadc94db462f5a165
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100 b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
deleted file mode 100644
index 40119952188d..000000000000
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libgamin virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm:= ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
-DESCRIPTION=Lightweight high-performance web server
-EAPI=7
-HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
-INHERIT=autotools flag-o-matic lua-single readme.gentoo-r1 systemd toolchain-funcs tmpfiles
-IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm:= ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
-REQUIRED_USE=kerberos? ( ssl ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) webdav? ( sqlite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.tar.xz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-utils	a2553e8a65058f277bf0b2da4be361b0	lua-single	20268f317853c44164a3065f1e6ff68b	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=a25ddebbdf9b489fb95e88ab4e1f1876
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r101 b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r101
new file mode 100644
index 000000000000..42e3a1fd2ba6
--- /dev/null
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r101
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libgamin virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm:= ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1:= ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
+DESCRIPTION=Lightweight high-performance web server
+EAPI=7
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
+INHERIT=autotools flag-o-matic lua-single readme.gentoo-r1 systemd toolchain-funcs tmpfiles
+IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm:= ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1:= ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
+REQUIRED_USE=kerberos? ( ssl ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) webdav? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.tar.xz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-utils	a2553e8a65058f277bf0b2da4be361b0	lua-single	20268f317853c44164a3065f1e6ff68b	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=92c24a0b5c6c15856eaa032986a1b873
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.58 b/metadata/md5-cache/www-servers/lighttpd-1.4.58
deleted file mode 100644
index 2c670b3aca80..000000000000
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.58
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gdbm? ( sys-libs/gdbm:= ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls ) memcached? ( dev-libs/libmemcached ) nss? ( dev-libs/nss ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
-DESCRIPTION=Lightweight high-performance web server
-EAPI=7
-HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
-INHERIT=autotools flag-o-matic lua-single readme.gentoo-r1 systemd tmpfiles toolchain-funcs
-IUSE=brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb minimal mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gdbm? ( sys-libs/gdbm:= ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls ) memcached? ( dev-libs/libmemcached ) nss? ( dev-libs/nss ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) mysql? ( dbi ) postgres? ( dbi ) sqlite? ( dbi ) webdav? ( sqlite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-utils	a2553e8a65058f277bf0b2da4be361b0	lua-single	20268f317853c44164a3065f1e6ff68b	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=6252f9d0fbd25916607abb655696bcd5
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.58-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.58-r1
new file mode 100644
index 000000000000..2ce0ef1f943a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.58-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=virtual/libcrypt:= brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gdbm? ( sys-libs/gdbm:= ) gnutls? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) maxminddb? ( dev-libs/libmaxminddb:= ) mbedtls? ( net-libs/mbedtls:= ) memcached? ( dev-libs/libmemcached ) nss? ( dev-libs/nss ) pcre? ( >=dev-libs/libpcre-3.1:= ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
+DESCRIPTION=Lightweight high-performance web server
+EAPI=7
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
+INHERIT=autotools flag-o-matic lua-single readme.gentoo-r1 systemd tmpfiles toolchain-funcs
+IUSE=brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb minimal mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:= brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gdbm? ( sys-libs/gdbm:= ) gnutls? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) maxminddb? ( dev-libs/libmaxminddb:= ) mbedtls? ( net-libs/mbedtls:= ) memcached? ( dev-libs/libmemcached ) nss? ( dev-libs/nss ) pcre? ( >=dev-libs/libpcre-3.1:= ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) mysql? ( dbi ) postgres? ( dbi ) sqlite? ( dbi ) webdav? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-utils	a2553e8a65058f277bf0b2da4be361b0	lua-single	20268f317853c44164a3065f1e6ff68b	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	bd82a2f06f5594b2ed0889539a4f9a9f	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=5e6559065d04d2eef492aefc04f3a3d4
diff --git a/metadata/md5-cache/www-servers/thttpd-2.27.1 b/metadata/md5-cache/www-servers/thttpd-2.27.1-r1
index 419dcdb386f7..7d112b7c100d 100644
--- a/metadata/md5-cache/www-servers/thttpd-2.27.1
+++ b/metadata/md5-cache/www-servers/thttpd-2.27.1-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=virtual/libcrypt:= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Fork of thttpd, a small, fast, multiplexing webserver
 EAPI=6
 HOMEPAGE=https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd
 INHERIT=autotools flag-o-matic toolchain-funcs user
 KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://github.com/blueness/sthttpd/archive/v2.27.1.tar.gz -> thttpd-2.27.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	user-info	2e75eaea3582b052ec16d9d5aa74ced3	user	1033b6bed7cf367c4507ea9a3ff503d0
-_md5_=25196c73629d741d0cf1f6154e9cac31
+_md5_=66f4f6e7a71106b0310aca71fcd36e1e
diff --git a/metadata/md5-cache/www-servers/thttpd-9999 b/metadata/md5-cache/www-servers/thttpd-9999
index 563b314b42a6..7ab2473089d2 100644
--- a/metadata/md5-cache/www-servers/thttpd-9999
+++ b/metadata/md5-cache/www-servers/thttpd-9999
@@ -1,11 +1,12 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=virtual/libcrypt:= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Fork of thttpd, a small, fast, multiplexing webserver
 EAPI=6
 HOMEPAGE=https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd
 INHERIT=autotools flag-o-matic toolchain-funcs user git-r3
 LICENSE=BSD GPL-2
 PROPERTIES=live
+RDEPEND=virtual/libcrypt:=
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	user-info	2e75eaea3582b052ec16d9d5aa74ced3	user	1033b6bed7cf367c4507ea9a3ff503d0	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=1dae9ff4d32370b0aac37f76cb155619
+_md5_=0263a914b18f144336699cb815a974b0
diff --git a/metadata/md5-cache/x11-misc/alock-1.0.0 b/metadata/md5-cache/x11-misc/alock-1.0.0-r1
index d5f5033d1a33..e48f8056d5bd 100644
--- a/metadata/md5-cache/x11-misc/alock-1.0.0
+++ b/metadata/md5-cache/x11-misc/alock-1.0.0-r1
@@ -1,14 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc )
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( sys-libs/pam ) doc? ( app-text/asciidoc )
+DEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( sys-libs/pam )
 DESCRIPTION=locks the local X display until a password is entered
-EAPI=6
+EAPI=7
 HOMEPAGE=https://darkshed.net/projects/alock https://github.com/mgumz/alock
 INHERIT=toolchain-funcs
 IUSE=doc imlib pam
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( sys-libs/pam ) doc? ( app-text/asciidoc )
+RDEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=https://github.com/mgumz/alock/archive/v1.0.0.tar.gz -> alock-1.0.0.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=5114043eadc076043def8925d92f607c
+_md5_=b932a778eb4c23a588ab54c9aa738185
diff --git a/metadata/md5-cache/x11-misc/slock-1.4 b/metadata/md5-cache/x11-misc/slock-1.4-r1
index 587c51f16abf..fea8f4848829 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4
+++ b/metadata/md5-cache/x11-misc/slock-1.4-r1
@@ -1,14 +1,15 @@
+BDEPEND=filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-base/xorg-proto
+DEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-base/xorg-proto
 DESCRIPTION=simple X display locker
-EAPI=6
+EAPI=7
 HOMEPAGE=https://tools.suckless.org/slock
 INHERIT=fcaps savedconfig toolchain-funcs
 IUSE=+filecaps savedconfig
 KEYWORDS=amd64 ~arm64 ~hppa x86
 LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr filecaps? ( sys-libs/libcap )
+RDEPEND=virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/slock-1.4.tar.gz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
-_md5_=0b51a5562fd2114826139d67f03e87b2
+_md5_=6baff7141d50f71bf9908fd336b9dcf0
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r7 b/metadata/md5-cache/x11-misc/wdm-1.28-r8
index f39fdedb7ee8..d4bbc4071ecf 100644
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r7
+++ b/metadata/md5-cache/x11-misc/wdm-1.28-r8
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft )
+DEPEND=virtual/libcrypt:= >=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft )
 DESCRIPTION=WINGs Display Manager
 EAPI=7
 HOMEPAGE=https://github.com/voins/wdm
@@ -8,8 +8,8 @@ INHERIT=autotools pam toolchain-funcs
 IUSE=pam selinux truetype
 KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft ) pam? ( >=sys-auth/pambase-20080219.1 )
+RDEPEND=virtual/libcrypt:= >=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://voins.program.ru/wdm/wdm-1.28.tar.bz2
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	pam	41ce39f668e11d31ff4734f3b5794f7d
-_md5_=cb7b604d8f514d1617b9e81dab0720c2
+_md5_=a9d1a26d2a014ad4eddc61cf1f581396
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 57735682a080..6ad65e48eef5 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -743,7 +743,7 @@ app-admin/ansible-modules-hashivault 4.6.2: Ansible module for hashicorp vault
 app-admin/ansible-molecule 3.3.4: A toolkit designed to aid in the development and testing of Ansible roles
 app-admin/apache-tools 2.4.46-r1 2.4.47-r1 2.4.48-r1: Useful Apache tools - htdigest, htpasswd, ab, htdbm
 app-admin/apachetop 0.19.7: A realtime Apache log analyzer
-app-admin/apg 2.3.0b_p20150129: Another Password Generator
+app-admin/apg 2.3.0b_p20150129-r1: Another Password Generator
 app-admin/augeas 1.11.0 1.11.0-r1 1.12.0: A library for changing configuration files
 app-admin/authbind 2.1.2: Bind sockets to privileged ports without root
 app-admin/aws-elb-tools 1.0.15.1-r1: Serves as the client interface to the Elastic Load Balancing web service
@@ -763,7 +763,7 @@ app-admin/clog 1.3.0: clog is a colorized log tail utility
 app-admin/clsync 0.4.5 9999: Live sync tool based on inotify, written in GNU C
 app-admin/clustershell 1.8.3: Python framework for efficient cluster administration
 app-admin/conky 1.11.6-r2 1.12.1 1.12.1-r1 1.12.2: An advanced, highly configurable system monitor for X
-app-admin/conserver 8.2.6-r1: Serial Console Manager
+app-admin/conserver 8.2.6-r2: Serial Console Manager
 app-admin/consul 1.7.11 1.7.14 1.8.12 1.9.6: A tool for service discovery, monitoring and configuration
 app-admin/consul-replicate 0.2.0: Consul cross-DC KV replication daemon
 app-admin/consul-template 0.25.0 0.25.1 0.25.2: Generic template rendering and notifications with Consul
@@ -773,7 +773,7 @@ app-admin/cronolog 1.6.2-r5: Log rotation software
 app-admin/cygwin-rebase 4.4.4 9999: Core of the automatic rebase facility during postinstall on Cygwin
 app-admin/dio 1.5.2-r2: A device I/O monitoring tool
 app-admin/diradm 2.9.7.1: A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP
-app-admin/doas 6.8.1: Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
+app-admin/doas 6.8.1-r1: Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
 app-admin/docker-bench 0.2.2: Docker Bench for Security runs the CIS Docker Benchmark
 app-admin/doctl 1.57.0 9999: A command line tool for DigitalOcean services
 app-admin/drush 6.7.0-r2: Command line shell and scripting interface for Drupal
@@ -840,7 +840,7 @@ app-admin/mei-amt-check 0_p20170515: AMT status checker
 app-admin/metalog 20200113-r1: A highly configurable replacement for syslogd/klogd
 app-admin/mktwpol 1.0.1: Bash scripts to install tripwire and generate tripwire policy files
 app-admin/mongo-tools 4.2.11 4.2.12 100.2.0 100.2.1 100.3.0: A high-performance, open source, schema-free document-oriented database
-app-admin/monit 5.27.1 5.27.2 5.28.0: Monitoring and managing daemons or similar programs running on a Unix system
+app-admin/monit 5.27.1-r1 5.27.2-r1 5.28.0-r1: Monitoring and managing daemons or similar programs running on a Unix system
 app-admin/mtail 3.0.0_rc35 3.0.0_rc36: A tool for extracting metrics from application logs
 app-admin/multilog-watch 1.12-r1: Watches a multilog file for irregularities
 app-admin/needrestart 3.3 3.5 9999: Restart daemons after library updates
@@ -865,7 +865,7 @@ app-admin/puppet-agent 6.19.1-r1 7.6.1 7.8.0: general puppet client utils along
 app-admin/puppet-lint 2.4.2: A linter for puppet DSL
 app-admin/puppetdb 7.3.1 7.4.1: PuppetDB collects data generated by Puppet.
 app-admin/puppetserver 7.1.2 7.2.0: Puppet Server is the next-generation application for managing Puppet agents.
-app-admin/pwcrypt 1.2.2-r2: An improved version of cli-crypt (encrypts data sent to it from the cli)
+app-admin/pwcrypt 1.2.2-r3: An improved version of cli-crypt (encrypts data sent to it from the cli)
 app-admin/pwgen 2.08: Password Generator
 app-admin/pwman3 0.10.0-r1 0.11.1: A lightweight password-manager with multiple database backends
 app-admin/pydf 12-r2: Enhanced df with colors
@@ -893,7 +893,7 @@ app-admin/sshguard 2.4.1-r1 2.4.2 99999: protects hosts from brute force attacks
 app-admin/stow 2.3.1: GNU Stow is a symlink farm manager
 app-admin/su-exec 0.2: Switch user and group id and exec
 app-admin/sud 1.3-r1: A daemon to execute processes with special privileges in a nosuid environment
-app-admin/sudo 1.9.6_p1-r1 1.9.7_p1 9999: Allows users or groups to run commands as other users
+app-admin/sudo 1.9.6_p1-r2 1.9.7_p1-r1 9999: Allows users or groups to run commands as other users
 app-admin/superadduser 1.15: Interactive adduser script from Slackware
 app-admin/supervisor 4.2.0 4.2.1 4.2.2: A system for controlling process state under UNIX
 app-admin/swatchdog 3.2.4-r1: Simple log watcher
@@ -901,7 +901,7 @@ app-admin/sxid 4.2-r2: suid, sgid file and directory checking
 app-admin/sysklogd 2.2.2 2.2.3 9999: Standard log daemons
 app-admin/syslog-ng 3.30.1 3.30.1-r1 3.31.2 3.32.1: syslog replacement with advanced filtering features
 app-admin/syslog-summary 1.14-r5: Summarizes the contents of a syslog log file
-app-admin/sysrqd 17-r1: Daemon providing access to the kernel sysrq functions via network
+app-admin/sysrqd 17-r2: Daemon providing access to the kernel sysrq functions via network
 app-admin/sysstat 12.5.3 12.5.4: System performance tools for Linux
 app-admin/system-config-printer 1.5.15: Graphical user interface for CUPS administration
 app-admin/systemdgenie 0.99.0: Systemd managment utility
@@ -1037,7 +1037,7 @@ app-backup/borgbackup 1.1.15 1.1.16 9999: Deduplicating backup program with comp
 app-backup/borgmatic 1.5.13 1.5.14 1.5.15: Automatically create, prune and verify backups with borgbackup
 app-backup/borgweb 0.2.0-r2 0.3.0: Browser-based user interface for BorgBackup
 app-backup/btrbk 0.29.1 0.31.2 9999: Tool for creating snapshots and remote backups of btrfs subvolumes
-app-backup/burp 2.2.18-r1 2.3.36: Network backup and restore client and server for Unix and Windows
+app-backup/burp 2.2.18-r2 2.3.36-r1: Network backup and restore client and server for Unix and Windows
 app-backup/ccollect 0.8: Pseudo incremental backup with different exclude lists using hardlinks and rsync
 app-backup/cdbackup 0.7.1-r1: Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s
 app-backup/cdbkup 1.0-r4: Performs full/incremental backups of local/remote filesystems onto CD-R(W)s
@@ -1072,7 +1072,7 @@ app-backup/snapper 0.8.15-r2 0.8.16-r1 0.9.0-r1: Command-line program for btrfs
 app-backup/spideroak-bin 7.5.0-r1: Secure free online backup, storage, and sharing system
 app-backup/synology-cloud-station-backup 4469: Back up your files from multiple client computers to a centralized Synology NAS
 app-backup/tarsnap 1.0.39: Online backups for the truly paranoid
-app-backup/tsm 8.1.6.0-r1: IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API
+app-backup/tsm 8.1.6.0-r2: IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API
 app-backup/untangle-https-backup 0.0.10-r1: Back up Untangle configurations via the web admin UI
 app-backup/vzdump 1.2: A utility to make consistent snapshots of running OpenVZ containers
 app-backup/zbackup 1.4.4-r2 9999: A versatile deduplicating backup tool
@@ -1166,7 +1166,7 @@ app-crypt/bcwipe 1.9.13: Secure file removal utility
 app-crypt/bsign 0.4.5-r1: embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files
 app-crypt/cardpeek 0.8.4: Tool to read the contents of smartcards
 app-crypt/ccid 1.4.33 1.4.34: CCID free software driver
-app-crypt/ccrypt 1.11 1.11-r1: Encryption and decryption
+app-crypt/ccrypt 1.11-r2 1.11-r3: Encryption and decryption
 app-crypt/certbot 1.15.0 1.16.0 9999: Let's encrypt client to automate deployment of X.509 certificates
 app-crypt/certbot-apache 1.15.0 1.16.0 9999: Apache plugin for certbot (Let's Encrypt Client)
 app-crypt/certbot-dns-nsone 0.39.0-r1: NS1 DNS Authenticator plugin for Certbot (Let's Encrypt Client)
@@ -1209,7 +1209,7 @@ app-crypt/jacksum 1.7.0-r1: Java utility for computing and verifying checksums:
 app-crypt/jetring 0.27 0.30: GPG keyring maintenance using changesets
 app-crypt/jitterentropy 2.2.0 3.0.1: Hardware RNG based on CPU timing jitter
 app-crypt/jitterentropy-rngd 1.1.0 1.2.2: Jitter RNG daemon
-app-crypt/johntheripper 1.8.0: fast password cracker
+app-crypt/johntheripper 1.8.0-r1: fast password cracker
 app-crypt/johntheripper-jumbo 1.9.0-r3 9999: Fast password cracker
 app-crypt/kali-archive-keyring 2015.2: GnuPG archive keys of the Kali archive
 app-crypt/kbfs 2.6.0 2.8.0 2.10.1 2.11.0-r1 9999: Keybase Filesystem (KBFS)
@@ -1232,7 +1232,7 @@ app-crypt/md6sum 1.0-r2: A C implementation of MD6
 app-crypt/mhash 0.9.9.9-r2: Library providing a uniform interface to a large number of hash algorithms
 app-crypt/minisign 0.9 9999: Dead simple tool to sign files and verify signatures
 app-crypt/mit-krb5 1.18.2-r4 1.18.3-r2 1.19.1-r1: MIT Kerberos V
-app-crypt/mit-krb5-appl 1.0.3-r1: Kerberized applications split from the main MIT Kerberos V distribution
+app-crypt/mit-krb5-appl 1.0.3-r2: Kerberized applications split from the main MIT Kerberos V distribution
 app-crypt/monkeysphere 0.44: Leverage the OpenPGP web of trust for OpenSSH and Web authentication
 app-crypt/moolticute 0.43.19 9999: Mooltipass crossplatform daemon/tools
 app-crypt/nasty 0.6-r1: Proof-of-concept GPG passphrase recovery tool
@@ -11175,7 +11175,7 @@ dev-vcs/bfg 1.13.0: A faster alternative to git-filter-branch for removing bad d
 dev-vcs/colorcvs 1.4-r2: A tool based on colorgcc to beautify cvs output
 dev-vcs/colorsvn 0.3.3: Subversion output colorizer
 dev-vcs/cssc 1.4.1: The GNU Project's replacement for SCCS
-dev-vcs/cvs 1.12.12-r13: Concurrent Versions System - source code revision control tools
+dev-vcs/cvs 1.12.12-r14: Concurrent Versions System - source code revision control tools
 dev-vcs/cvs-fast-export 1.57: fast-export history from a CVS repository or RCS collection
 dev-vcs/cvs2cl 2.71-r1: produces a GNU-style ChangeLog for CVS-controlled sources
 dev-vcs/cvsgraph 1.7.0: CVS/RCS repository grapher
@@ -11700,7 +11700,7 @@ games-misc/wumpus 1.4-r2: Classic Hunt the Wumpus Adventure Game
 games-misc/xcowsay 1.5.1: Displays a cute cow and message on your desktop
 games-misc/xcruiser 0.30-r1: Fly about 3D-formed file system
 games-misc/xpenguins 2.2-r2: Cute little penguins invading your desktop
-games-mud/circlemud 3.1-r1: A multi-user dungeon game system server
+games-mud/circlemud 3.1-r2: A multi-user dungeon game system server
 games-mud/crystal 0.2.4-r1: The crystal MUD client
 games-mud/gmudix 1.0-r1: GTK+ MUD client with many features and an easy scripting language
 games-mud/gnome-mud 0.11.2-r2 9999: GNOME MUD client
@@ -11874,7 +11874,7 @@ games-rpg/xu4 0.9-r1: A remake of the computer game Ultima IV
 games-rpg/zsdx 1.9.0-r1: Free 2D Zelda fangame
 games-rpg/zsxd 1.9.0-r1: Free 2D Zelda fangame parody
 games-server/bedrock-server 1.16.220.02 1.17.1.01: The official bedrock (non-java) based server for the sandbox video game
-games-server/crossfire-server 1.71.0-r1: Server for the crossfire clients
+games-server/crossfire-server 1.71.0-r2: Server for the crossfire clients
 games-server/etqw-ded 1.5-r1: Enemy Territory: Quake Wars dedicated server
 games-server/mednafen-server 0.5.2-r1: Server for Mednafen emulator
 games-server/minecraft-server 1.16.5 1.17: The official server for the sandbox video game
@@ -11935,7 +11935,7 @@ games-strategy/hedgewars 1.0.0-r100: A turn-based strategy, artillery, action an
 games-strategy/ja2-stracciatella 0.17.0: An improved, cross-platform, stable Jagged Alliance 2 runtime
 games-strategy/ja2-stracciatella-data 1-r1: A port of Jagged Alliance 2 to SDL (data files)
 games-strategy/julius 1.4.1: Feature-faithful open source re-implementation of Caesar III
-games-strategy/knights-demo 1.32-r2: Anglo-Saxon medieval army battles and resource management
+games-strategy/knights-demo 1.32-r3: Anglo-Saxon medieval army battles and resource management
 games-strategy/lgeneral 1.4.3: A Panzer General clone written in SDL
 games-strategy/liquidwar 5.6.5: Unique multiplayer wargame
 games-strategy/majesty-demo 1.0.0-r1: Control your own kingdom in this simulation
@@ -14479,7 +14479,7 @@ net-analyzer/fping 5.0: A utility to ping multiple hosts at once
 net-analyzer/fprobe 1.1-r3 1.1-r4: libpcap-based tool to collect network traffic data and emit it as NetFlow flows
 net-analyzer/fragroute 1.2.6-r4: Testing of network intrusion detection systems, firewalls and TCP/IP stacks
 net-analyzer/ftester 1.0: Firewall and Intrusion Detection System testing tool
-net-analyzer/fwlogwatch 1.5: A packet filter and firewall log analyzer
+net-analyzer/fwlogwatch 1.5-r1: A packet filter and firewall log analyzer
 net-analyzer/gensink 4.1-r2: A simple TCP benchmark suite
 net-analyzer/gnome-nettool 3.8.1: Graphical front-ends to various networking command-line
 net-analyzer/goaccess 1.4.2 9999: A real-time web log analyzer and interactive viewer that runs in a terminal
@@ -14701,9 +14701,9 @@ net-dialup/accel-ppp 1.12.0_p20210430 9999: High performance PPTP, PPPoE and L2T
 net-dialup/cistronradius 1.6.8-r2: Authentication and accounting server for terminal servers using RADIUS
 net-dialup/cutecom 0.51.0-r1: A serial terminal, like minicom, written in Qt
 net-dialup/dial 1.2-r2: A simple client for DWUN
-net-dialup/dwun 0.96e-r4: Dialer Without a Useful Name (DWUN)
+net-dialup/dwun 0.96e-r5: Dialer Without a Useful Name (DWUN)
 net-dialup/fbgetty 0.1.698-r1: An extended getty for the framebuffer console
-net-dialup/freeradius 3.0.20-r2 3.0.21-r2 3.0.22-r1: Highly configurable free RADIUS server
+net-dialup/freeradius 3.0.20-r3 3.0.21-r3 3.0.22-r2: Highly configurable free RADIUS server
 net-dialup/freeradius-client 1.1.7-r1: FreeRADIUS Client framework
 net-dialup/isdn-firmware 2005.8.15.2: ISDN firmware for active ISDN cards (AVM, Eicon, etc.)
 net-dialup/kpnadsl4linux 1.11: ADSL4Linux, a PPTP start/stop/etc. program especially for Dutch users
@@ -14721,7 +14721,7 @@ net-dialup/ppp 2.4.9-r3: Point-to-Point Protocol (PPP)
 net-dialup/ppp-scripts 0: Common set of scripts for various PPP implementations
 net-dialup/pppconfig 2.3.21: A text menu based utility for configuring ppp
 net-dialup/pptpclient 1.10.0: Linux client for PPTP
-net-dialup/radiusclient-ng 0.5.6-r1: RadiusClient NextGeneration - library for RADIUS clients
+net-dialup/radiusclient-ng 0.5.6-r2: RadiusClient NextGeneration - library for RADIUS clients
 net-dialup/rp-l2tp 0.4-r4: User-space implementation of L2TP for Linux and other UNIX systems
 net-dialup/rp-pppoe 3.14 3.15: A user-mode PPPoE client and server suite for Linux
 net-dialup/sendpage 1.1.0-r4: Dialup alphapaging software
@@ -14816,7 +14816,7 @@ net-fs/docker-volume-netshare 0.35: Docker NFS, AWS EFS, Ceph & Samba/CIFS Volum
 net-fs/libnfs 4.0.0 9999: Client library for accessing NFS shares over a network
 net-fs/mc 2021.03.06.22.16.44 2021.03.12.03.36.59 2021.03.23.05.46.11: Minio client provides alternatives for ls, cat on cloud storage and filesystems
 net-fs/minio 2021.04.18.19.26.29-r2: An Amazon S3 compatible object storage server
-net-fs/netatalk 3.1.12-r2 3.1.12-r3: Open Source AFP server
+net-fs/netatalk 3.1.12-r4 3.1.12-r5: Open Source AFP server
 net-fs/nfs-utils 2.5.3-r1 2.5.4: NFS client and server daemons
 net-fs/nfs4-acl-tools 0.3.7: Commandline and GUI tools that deal directly with NFSv4 ACLs
 net-fs/openafs 1.8.7: The OpenAFS distributed file system
@@ -14835,14 +14835,14 @@ net-ftp/frox 0.7.18-r7: A transparent ftp proxy
 net-ftp/ftp 0.17.23.0.2.1: Standard Linux FTP client
 net-ftp/ftpbase 0.01-r4: FTP layout package
 net-ftp/gftp 2.0.19-r3: Gnome based FTP Client
-net-ftp/gproftpd 8.3.2-r2: GTK frontend to proftpd
+net-ftp/gproftpd 8.3.2-r3: GTK frontend to proftpd
 net-ftp/lftp 4.9.2 9999: A sophisticated ftp/sftp/http/https/torrent client and file transfer program
 net-ftp/linksys-tftp 1.2.1-r3: TFTP client suitable for uploading to the Linksys WRT54G Wireless Router
 net-ftp/ncftp 3.2.6-r3: An extremely configurable ftp client
-net-ftp/proftpd 1.3.7a-r1 1.3.7b 1.3.8_rc1: An advanced and very configurable FTP server
+net-ftp/proftpd 1.3.7a-r2 1.3.7b-r1 1.3.8_rc1-r1: An advanced and very configurable FTP server
 net-ftp/profxp 3_pre2-r2: FXP (server-to-server FTP) commandline client written in Perl
-net-ftp/pure-ftpd 1.0.49-r3 9999: Fast, production-quality, standard-conformant FTP server
-net-ftp/pureadmin 0.4-r2: GUI tool used to make the management of Pure-FTPd a little easier
+net-ftp/pure-ftpd 1.0.49-r4 9999: Fast, production-quality, standard-conformant FTP server
+net-ftp/pureadmin 0.4-r3: GUI tool used to make the management of Pure-FTPd a little easier
 net-ftp/tftp-hpa 5.2-r2: Port of the OpenBSD TFTP server
 net-ftp/tnftp 20141104 20151004: NetBSD FTP client with several advanced features
 net-ftp/uftpd 2.13: The no nonsense TFTP/FTP server
@@ -14911,23 +14911,23 @@ net-im/yowsup 3.2.3_p20190905: A library that enables you to build applications
 net-im/ysm 2.9.9.1-r2: A console ICQ client supporting versions 7/8
 net-im/zoom 5.4.53391.1108-r3 5.6.22045.0607 5.7.26030.0627: Video conferencing and web conferencing service
 net-irc/anope 2.0.9: Anope IRC Services
-net-irc/atheme-services 7.2.11: A portable and secure set of open-source and modular IRC services
-net-irc/bnc 2.9.4-r1: BNC (BouNCe) is used as a gateway to an IRC Server
+net-irc/atheme-services 7.2.11-r1: A portable and secure set of open-source and modular IRC services
+net-irc/bnc 2.9.4-r2: BNC (BouNCe) is used as a gateway to an IRC Server
 net-irc/cgiirc 0.5.10: A perl/CGI program to use IRC from a web browser
 net-irc/dccserver 0.5-r1: linux implementation of the mirc dccserver command
 net-irc/eggdrop 1.8.4-r1 1.9.0 1.9.1: An IRC bot extensible with C or TCL
-net-irc/emech 3.0.99_p3: UNIX compatible IRC bot programmed in the C language
-net-irc/epic5 2.0.1: Epic5 IRC Client
+net-irc/emech 3.0.99_p3-r1: UNIX compatible IRC bot programmed in the C language
+net-irc/epic5 2.0.1-r1: Epic5 IRC Client
 net-irc/ergo 2.7.0-r1: A modern IRC server written in Go
 net-irc/hexchat 2.14.3-r101 9999: Graphical IRC client based on XChat
 net-irc/ii 1.8 9999: A minimalist FIFO and filesystem-based IRC client
 net-irc/inspircd 3.10.0 3.10.0-r1: Inspire IRCd - The Stable, High-Performance Modular IRCd
 net-irc/irccloud-desktop-bin 0.16.0-r1: IRCCloud Desktop Client
-net-irc/ircii 20210314: An IRC and ICB client that runs under most UNIX platforms
+net-irc/ircii 20210314-r1: An IRC and ICB client that runs under most UNIX platforms
 net-irc/ircmap 0.99-r1: Scripts to treate diagrams of IRC networks using the LINKS command
 net-irc/ircstats 1.2: IRCStats is a Linux log analyzer
 net-irc/irker 2.19: Submission tools for IRC notifications
-net-irc/iroffer-dinoex 3.30-r1 3.31 3.32-r1: IRC fileserver using DCC
+net-irc/iroffer-dinoex 3.30-r2 3.31-r1 3.32-r2: IRC fileserver using DCC
 net-irc/irssi 1.2.3 9999: A modular textUI IRC client with IPv6 support
 net-irc/irssi-xmpp 0.54: An irssi plugin providing Jabber/XMPP support
 net-irc/irssistats 0.75-r1: Generates HTML IRC stats based on irssi logs
@@ -14937,9 +14937,9 @@ net-irc/limnoria 9999 20210527 20210617: Python based extensible IRC infobot and
 net-irc/limnoria-plugins-chantracker 1.5_p20210530 1.5_p20210619: supybot ban management and channel flood/spam/repeat protections plugin
 net-irc/limnoria-plugins-jlu5 20200105_p20210530 20200105_p20210610: A collection of plugins for the Limnoria IRC bot.
 net-irc/limnoria-plugins-progval 20210523 20210616: Collection of plugins for Supybot/Limnoria I wrote or forked.
-net-irc/muh 2.2a-r1: Persistent IRC bouncer
+net-irc/muh 2.2a-r2: Persistent IRC bouncer
 net-irc/ngircd 26.1: An IRC server written from scratch
-net-irc/ninja 1.5.9_pre14-r1: Ninja IRC Client
+net-irc/ninja 1.5.9_pre14-r2: Ninja IRC Client
 net-irc/onis 0.8.2-r1: onis not irc stats
 net-irc/pisg 0.73-r1: Perl IRC Statistics Generator
 net-irc/polari 3.36.3: An IRC client for Gnome
@@ -14948,10 +14948,10 @@ net-irc/quassel 0.13.1-r2 9999: Qt/KDE IRC client supporting a remote daemon for
 net-irc/quasselgrep 0_p20200830: Tool for searching quassel logs from the commandline
 net-irc/rbot 0.9.15_p20160325-r2: A ruby IRC bot
 net-irc/rhapsody 0.28b: IRC client intended to be displayed on a text console
-net-irc/scrollz 2.3: Advanced IRC client based on ircII
+net-irc/scrollz 2.3-r1: Advanced IRC client based on ircII
 net-irc/sic 1.2-r1: An extremely simple IRC client
 net-irc/telepathy-idle 0.2.2: Full-featured IRC connection manager for Telepathy
-net-irc/unrealircd 5.0.8 5.0.9.1 5.2.0.2: An advanced Internet Relay Chat daemon
+net-irc/unrealircd 5.0.8-r1 5.0.9.1-r1 5.2.0.2-r1: An advanced Internet Relay Chat daemon
 net-irc/weechat 3.1 3.2 9999: Portable and multi-interface IRC client
 net-irc/znc 1.8.1 1.8.2 9999: An advanced IRC Bouncer
 net-irc/znc-clientbuffer 1.0.48: A ZNC module which provides client specific buffers
@@ -14966,12 +14966,12 @@ net-libs/axtls 2.1.5-r100: Embedded client/server TLSv1 SSL library and small HT
 net-libs/balde 0.1.1: A microframework for C based on GLib and bad intentions
 net-libs/balde-markdown 0.1: A balde extension that adds Markdown support
 net-libs/biblesync 2.1.0: A multicast protocol to support Bible software shared co-navigation
-net-libs/c-client 2007f-r6: UW IMAP c-client library
+net-libs/c-client 2007f-r7: UW IMAP c-client library
 net-libs/canlock 2b: A library for creating and verifying Usenet cancel locks
-net-libs/courier-authlib 0.69.0-r1 0.70.0 0.71.0 0.71.1 0.71.2: Courier authentication library
+net-libs/courier-authlib 0.69.0-r2 0.70.0-r1 0.71.0-r1 0.71.1-r1 0.71.2-r1: Courier authentication library
 net-libs/courier-unicode 2.1 2.1-r1 2.1.2 2.2.3: Unicode library used by the courier mail server
 net-libs/cppzmq 4.6.0: High-level CPP Binding for ZeroMQ
-net-libs/cvm 0.97: Credential Validation Modules by Bruce Guenter
+net-libs/cvm 0.97-r1: Credential Validation Modules by Bruce Guenter
 net-libs/czmq 4.2.0: High-level C Binding for ZeroMQ
 net-libs/daq 2.0.7: Data Acquisition library, for packet I/O
 net-libs/davix 0.7.6: High-performance file management over WebDAV/HTTP
@@ -15049,7 +15049,7 @@ net-libs/libmrss 0.19.2-r1: A C-library for parsing and writing RSS 0.91/0.92/1.
 net-libs/libnatpmp 20150609: An alternative protocol to UPnP IGD specification
 net-libs/libndp 1.8: Library for Neighbor Discovery Protocol
 net-libs/libnet 1.0.2a-r7 1.2 1.2.9999: library providing an API for commonly used low-level network functions
-net-libs/libnetconf2 1.1.43-r1 1.1.46 2.0.1: C library for building NETCONF servers and clients
+net-libs/libnetconf2 1.1.43-r2 1.1.46-r1 2.0.1-r1: C library for building NETCONF servers and clients
 net-libs/libnetfilter_acct 1.0.3: Library providing interface to extended accounting infrastructure
 net-libs/libnetfilter_conntrack 1.0.6 1.0.7 1.0.8: Programming interface (API) to the in-kernel connection tracking state table
 net-libs/libnetfilter_cthelper 1.0.0-r1: Userspace library for interface to user-space helper for conntrack
@@ -15073,7 +15073,7 @@ net-libs/liboping 1.10.0-r2: Protocol independent ANSI-C ping library and comman
 net-libs/libosmo-dsp 0.4.0 9999: A library with SDR DSP primitives
 net-libs/libosmocore 0.10.2 9999: Utility functions for OsmocomBB, OpenBSC and related projects
 net-libs/libotr 4.1.1: (OTR) Messaging allows you to have private conversations over instant messaging
-net-libs/libpcap 1.10.0 1.10.1 9999: A system-independent library for user-level network packet capture
+net-libs/libpcap 1.10.0-r1 1.10.1-r1 9999: A system-independent library for user-level network packet capture
 net-libs/libpcapnav 0.8-r1: Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file
 net-libs/libpri 1.6.0: Primary Rate ISDN (PRI) library
 net-libs/libprotoident 2.0.14_p1 9999: A library that performs application layer protocol identification for flows
@@ -15154,7 +15154,7 @@ net-libs/usrsctp 0.9.3.0_p20201102 0.9.5.0: A cross-platform userland SCTP stack
 net-libs/wandio 4.2.3_p1-r1: C library for simple and efficient file IO
 net-libs/webkit-gtk 2.32.1: Open source web browser engine
 net-libs/wvstreams 4.6.1_p14-r2 99999: A network programming library in C++
-net-libs/xrootd 5.0.3 5.1.1 5.2.0: Extended ROOT remote file server
+net-libs/xrootd 5.0.3-r1 5.1.1-r1 5.2.0-r1: Extended ROOT remote file server
 net-libs/xrootd-ceph 5.0.3 5.1.1 5.2.0: xrootd OSS plug-in for interfacing with Ceph storage platform
 net-libs/zeromq 4.3.3-r1 4.3.4-r1: A brokerless kernel
 net-libs/zmqpp 4.2.0: ZeroMQ 'highlevel' C++ bindings
@@ -15164,13 +15164,13 @@ net-mail/asmail 2.1-r1: A small mail monitor similar to xbiff
 net-mail/automx2 2021.4: Email client autoconfiguration service
 net-mail/autorespond 2.0.4 2.0.5: Autoresponder add on package for qmailadmin
 net-mail/b4 0.7.2: Utility for fetching patchsets from public-inbox
-net-mail/checkpassword 0.90-r4: A uniform password checking interface for root applications
+net-mail/checkpassword 0.90-r5: A uniform password checking interface for root applications
 net-mail/checkpassword-pam 0.99-r1: checkpassword-compatible authentication program w/pam support
 net-mail/cmd5checkpw 0.30-r2 0.30-r3: A checkpassword compatible authentication program that used CRAM-MD5 authentication mode
 net-mail/courier-imap 4.18.2 5.1.2 5.1.3: An IMAP daemon designed specifically for maildirs
 net-mail/courierpassd 1.1.2-r1: Courierpassd is a utility for changing a user's password from across a network
 net-mail/cyrus-imapd 3.0.13-r1 3.0.14-r1 3.0.15-r1 3.4.1-r1: The Cyrus IMAP Server
-net-mail/dbmail 3.2.3-r3 3.2.5: Fast and scalable sql based email services
+net-mail/dbmail 3.2.3-r4 3.2.5-r1: Fast and scalable sql based email services
 net-mail/django-mailman3 1.3.4: Django-based interfaces interacting with Mailman 3
 net-mail/dot-forward 0.71-r4: reads sendmail's .forward files under qmail
 net-mail/dovecot 2.3.13-r101 2.3.14-r1 2.3.14.1-r1 2.3.15-r1: An IMAP and POP3 server written with security primarily in mind
@@ -15245,7 +15245,7 @@ net-mail/smtptools 0.2.3-r1: A collection of tools to send or receive mails with
 net-mail/swaks 20201014.0: Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH
 net-mail/t-prot 3.4: TOFU protection - display filter for RFC822 messages
 net-mail/tnef 1.4.18: Decodes MS-TNEF MIME attachments
-net-mail/tpop3d 1.5.5-r1: An extensible POP3 server with vmail-sql/MySQL support
+net-mail/tpop3d 1.5.5-r2: An extensible POP3 server with vmail-sql/MySQL support
 net-mail/vchkuser 0.4: qmail-spp plugin to check recipient existance with vpopmail
 net-mail/vpopmail 5.4.33-r7: Collection of programs to manage virtual email on Qmail servers
 net-mail/vqadmin 2.3.7: A web based control pannel to manage Virtual Qmail Domains
@@ -15316,7 +15316,7 @@ net-misc/dhcping 1.2: Utility to send DHCP requests to DHCP servers to see if re
 net-misc/dibbler 1.0.1-r3: Portable DHCPv6 implementation (server, client and relay)
 net-misc/dleyna-server 0.7.0 0.7.0-r1: Service that allows to discover and manipulate DLNA Digital Media servers (DMS)
 net-misc/drive 0.3.9.1 0.3.9.1-r1: Google Drive client for the commandline
-net-misc/dropbear 2020.81-r2: small SSH 2 client/server designed for small memory environments
+net-misc/dropbear 2020.81-r3: small SSH 2 client/server designed for small memory environments
 net-misc/dropbox 125.4.3474: Dropbox daemon (pretends to be GUI-less)
 net-misc/dropbox-cli 2020.03.04-r1: Cli interface for dropbox (python), part of nautilus-dropbox
 net-misc/econnman 1.1-r2: ConnMan User Interface written with EFL & python
@@ -15336,7 +15336,7 @@ net-misc/fakeidentd 2.6-r1: A static, secure identd. One source file only!
 net-misc/fatrat 1.2.0_beta2_p20161204: Qt5-based download/upload manager
 net-misc/felix 3.1.3: Calico's per-host agent, responsible for programming routes and security policy
 net-misc/freerdp 2.2.0 2.3.2 2.9999 9999: Free implementation of the Remote Desktop Protocol
-net-misc/frr 7.5.1-r3: The FRRouting Protocol Suite
+net-misc/frr 7.5.1-r4: The FRRouting Protocol Suite
 net-misc/gallery-dl 1.17.3 1.17.4 9999: Download image galleries and collections from several image hosting sites
 net-misc/gcap 0.1.1-r1: Command line tool for downloading Youtube closed captions
 net-misc/geoipupdate 2.3.1 3.1.1 4.3.0: performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
@@ -15396,7 +15396,7 @@ net-misc/linux-eoip 0.5: Linux support for proprietary MIkrotik EoIP protocol
 net-misc/linuxptp 2.0-r1: The Linux Precision Time Protocol (PTP) implementation
 net-misc/liveice 2000530-r2: Live Source Client For IceCast
 net-misc/lksctp-tools 1.0.18-r1 1.0.19: Tools for Linux Kernel Stream Control Transmission Protocol implementation
-net-misc/lldpd 1.0.7 1.0.9 1.0.10 1.0.11: Implementation of IEEE 802.1ab (LLDP)
+net-misc/lldpd 1.0.7-r1 1.0.9-r1 1.0.10-r1 1.0.11-r1: Implementation of IEEE 802.1ab (LLDP)
 net-misc/lyricwikia 0.1.11-r1: Python API to get song lyrics from LyricWikia
 net-misc/mcproxy 1.1.1-r1: A multicast proxy for IGMP/MLD
 net-misc/megatools 1.10.3: Command line tools and C library for accessing Mega cloud storage
@@ -15427,7 +15427,7 @@ net-misc/netkit-bootparamd 0.17-r4: Netkit - bootparamd
 net-misc/netkit-bootpd 2.4-r1: Netkit - bootp
 net-misc/netkit-fingerd 0.17-r3: Netkit - fingerd and finger client
 net-misc/netkit-routed 0.17-r5: Netkit - routed
-net-misc/netkit-rsh 0.17-r11 0.17-r12: Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}
+net-misc/netkit-rsh 0.17-r13 0.17-r14: Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}
 net-misc/netkit-talk 0.17-r6: Netkit - talkd
 net-misc/netkit-telnetd 0.17-r12: Standard Linux telnet client and server
 net-misc/netkit-timed 0.17-r10: Netkit - timed
@@ -15443,7 +15443,7 @@ net-misc/npapi-sdk 0.27.2 9999: NPAPI headers bundle
 net-misc/ntp 4.2.8_p15: Network Time Protocol suite/programs
 net-misc/ntpsec 1.2.0-r3 1.2.1 9999: The NTP reference implementation, refactored
 net-misc/nx 3.5.99.25 3.5.99.26: NX compression technology core libraries
-net-misc/nxplayer 5.1.24.1: Client for NoMachine remote servers
+net-misc/nxplayer 5.1.24.1-r1: Client for NoMachine remote servers
 net-misc/nyx 2.1.0-r2: Utility to monitor real time Tor status information
 net-misc/ofono 1.31: Open Source mobile telephony (GSM/UMTS) daemon
 net-misc/oidc-agent 4.0.2: Agent and tools for managing OpenID Connect tokens on the command line
@@ -15480,7 +15480,7 @@ net-misc/pyhoca-cli 0.6.1.2: X2Go command line client
 net-misc/pyhoca-gui 0.6.1.1: X2Go graphical client applet
 net-misc/python-x2go 0.6.1.3: X2Go client-side Python API
 net-misc/qtm 1.3.19-r1: Qt blogging client
-net-misc/quagga 1.2.4: A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
+net-misc/quagga 1.2.4-r1: A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 net-misc/r8168 8.048.03-r1: r8168 driver for Realtek 8111/8168 PCI-E NICs
 net-misc/rabbitmq-server 3.8.14: RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
 net-misc/radvd 2.19-r1: Linux IPv6 Router Advertisement Daemon
@@ -15493,7 +15493,7 @@ net-misc/remmina 1.4.13 1.4.16 1.4.17 1.4.18: A GTK+ RDP, SPICE, VNC, XDMCP and
 net-misc/rinetd 0.62-r2: redirects TCP connections from one IP address and port to another
 net-misc/rsync 3.2.3-r4 9999: File transfer program to keep remote files into sync
 net-misc/rwbs 0.27-r2: Roger Wilco base station
-net-misc/rwhoisd 1.5.9.6-r1: ARIN rwhois daemon
+net-misc/rwhoisd 1.5.9.6-r2: ARIN rwhois daemon
 net-misc/rygel 0.40.1: Rygel is an open source UPnP/DLNA MediaServer
 net-misc/s3cmd 2.1.0 2.1.0-r1: Command line client for Amazon S3
 net-misc/s6-networking 2.3.0.2 2.3.0.3 2.3.0.4 2.3.1.1 2.3.2.0: Suite of small networking utilities for Unix systems
@@ -15590,7 +15590,7 @@ net-nds/389-ds-base 1.4.4.13: 389 Directory Server (core libraries and daemons)
 net-nds/adtool 1.3.3-r1: Utility for Active Directory administration
 net-nds/gssproxy 0.8.4: daemon to proxy GSSAPI context establishment and channel handling
 net-nds/jxplorer 3.3.1.2-r1: Fully functional LDAP browser written in Java
-net-nds/ldapvi 1.7_p20101214-r1: Manage LDAP entries with a text editor
+net-nds/ldapvi 1.7_p20101214-r2: Manage LDAP entries with a text editor
 net-nds/led 1.111: A general purpose LDAP editor
 net-nds/nsscache 0.39: commandline tool to sync directory services to local cache
 net-nds/openldap 2.4.57-r1 2.4.58-r1 2.4.59-r1 2.5.4: LDAP suite of application and development tools
@@ -15598,8 +15598,8 @@ net-nds/phpldapadmin 1.2.5: phpLDAPadmin is a web-based tool for managing all as
 net-nds/rpcbind 1.2.6 9999: portmap replacement which supports RPC over various protocols
 net-nds/shelldap 1.5.1: A handy shell-like interface for browsing LDAP servers and editing their content
 net-nds/smbldap-tools 0.9.10-r1: Samba LDAP management tools
-net-nds/tac_plus 4.0.4.19-r4 4.0.4.27a 4.0.4.27a-r1: An updated version of Cisco's TACACS+ server
-net-nds/yp-tools 4.2.3: Network Information Service tools
+net-nds/tac_plus 4.0.4.19-r5 4.0.4.27a-r2 4.0.4.27a-r3: An updated version of Cisco's TACACS+ server
+net-nds/yp-tools 4.2.3-r1: Network Information Service tools
 net-news/amphetadesk 0.93.1-r1: AmphetaDesk is a free syndicated news aggregator
 net-news/canto-curses 0.9.9: The ncurses client for canto-daemon
 net-news/canto-daemon 0.9.7: Daemon part of Canto-NG RSS reader
@@ -15629,7 +15629,7 @@ net-p2p/bittornado 0.4.1_p20160925-r2 0.4.1_p20160925-r3 0.4.1_p20160925-r4: Joh
 net-p2p/classified-ads 0.13-r1: Program for displaying classified advertisement items
 net-p2p/cpuminer-opt 3.16.4 9999: Optimized multi algo CPU miner
 net-p2p/ctorrent 3.3.2-r4: Enhanced CTorrent is a BitTorrent console client written in C and C++
-net-p2p/dbhub 0.451-r1: Hub software for Direct Connect, fork of opendchub
+net-p2p/dbhub 0.451-r2: Hub software for Direct Connect, fork of opendchub
 net-p2p/deluge 2.0.3-r8 9999: BitTorrent client with a client/server model
 net-p2p/ed2k_hash 0.4.0-r2: Tool for generating eDonkey2000 links
 net-p2p/eiskaltdcpp 2.4.2 9999: Qt/DC++ based client for DirectConnect and ADC protocols
@@ -15648,9 +15648,9 @@ net-p2p/mktorrent 1.1_p20180912: Simple command line utility to create BitTorren
 net-p2p/mldonkey 3.1.7-r2: Multi-network P2P application written in Ocaml, with Gtk, web & telnet interface
 net-p2p/ncdc 1.22.1 9999: ncurses directconnect client
 net-p2p/nicotine+ 2.2.2 3.0.2 3.0.4 3.0.6: A fork of nicotine, a Soulseek client in Python
-net-p2p/opendchub 0.8.2: hub software for Direct Connect
+net-p2p/opendchub 0.8.2-r1: hub software for Direct Connect
 net-p2p/qbittorrent 4.3.1 4.3.3 4.3.4.1 4.3.5 9999: BitTorrent client in C++ and Qt
-net-p2p/resilio-sync 2.6.3: Resilient, fast and scalable file synchronization tool
+net-p2p/resilio-sync 2.6.3-r1: Resilient, fast and scalable file synchronization tool
 net-p2p/retroshare 0.6.5-r2: P2P private sharing application
 net-p2p/rtorrent 0.9.7 0.9.7-r1 0.9.8: BitTorrent Client using libtorrent
 net-p2p/syncthing 1.15.1 1.17.0: Open Source Continuous File Synchronization
@@ -15703,7 +15703,7 @@ net-proxy/adzapper 20110915-r2: Redirector for squid to intercept advertising, p
 net-proxy/cntlm 0.93_beta5-r3: Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy
 net-proxy/dante 1.4.1-r2: A free socks4,5 and msproxy implementation
 net-proxy/dnsproxy 1.17: The dnsproxy daemon is a proxy for DNS queries
-net-proxy/haproxy 1.8.29 1.8.30 2.0.14-r2 2.0.21 2.0.22 2.0.9999 2.2.5-r1 2.2.12 2.2.13 2.2.14 2.2.9999 2.3.9 2.3.10 2.3.9999 2.4.0 2.4.1 2.4.9999: A TCP/HTTP reverse proxy for high availability environments
+net-proxy/haproxy 1.8.29-r1 1.8.30-r1 2.0.14-r3 2.0.21-r1 2.0.22-r1 2.0.9999 2.2.5-r2 2.2.12-r1 2.2.13-r1 2.2.14-r1 2.2.9999 2.3.9-r1 2.3.10-r1 2.3.9999 2.4.0-r1 2.4.1-r1 2.4.9999: A TCP/HTTP reverse proxy for high availability environments
 net-proxy/haproxy-dataplaneapi 2.2.0 2.3.0: haproxy dataplane api / sidecar
 net-proxy/hatop 0.8.0: Ncurses client and real-time monitoring and displaying of HAProxy status
 net-proxy/havp 0.92a-r3: HTTP AntiVirus Proxy
@@ -15719,7 +15719,7 @@ net-proxy/redsocks 0.5 0.5-r1 9999: Transparent redirector of any TCP connection
 net-proxy/rejik 3.2.10 3.2.11: A squid redirector used for blocking unwanted content
 net-proxy/shadowsocks-libev 3.3.5: A lightweight secured SOCKS5 proxy for embedded devices and low end boxes
 net-proxy/sqtop 2015.02.08: Squid Top - top for Squid
-net-proxy/squid 4.15-r1: A full-featured web proxy cache
+net-proxy/squid 4.15-r2: A full-featured web proxy cache
 net-proxy/squidguard 1.6.0: Combined filter, redirector and access controller plugin for Squid
 net-proxy/squirm 1.26-r1: A redirector for Squid
 net-proxy/sshuttle 1.0.5: Transparent proxy server that works as a poor man's VPN using ssh
@@ -15745,9 +15745,9 @@ net-vpn/httptunnel 3.3_p20180119: httptunnel can create IP tunnels through firew
 net-vpn/i2p 0.9.48: A privacy-centric, anonymous network
 net-vpn/i2pd 2.38.0-r3: A C++ daemon for accessing the I2P anonymous network
 net-vpn/iodine 0.7.0-r2: IP over DNS tunnel
-net-vpn/ipsec-tools 0.8.2-r7: A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
+net-vpn/ipsec-tools 0.8.2-r8: A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
 net-vpn/isatapd 0.9.7-r2: Creates and maintains an ISATAP tunnel (rfc5214)
-net-vpn/libreswan 3.32 3.32-r1 4.2 4.3 4.4 4.4-r1: IPsec implementation for Linux, fork of Openswan
+net-vpn/libreswan 3.32-r2 3.32-r3 4.2-r1 4.3-r1 4.4-r2 4.4-r3: IPsec implementation for Linux, fork of Openswan
 net-vpn/logmein-hamachi 2.1.0.198 2.1.0.203: LogMeIn Hamachi VPN tunneling engine
 net-vpn/mullvad-netns 0.2 0.3 9999: Script to run a command within a Mullvad network namespace
 net-vpn/networkmanager-fortisslvpn 1.2.8-r2 1.2.10: NetworkManager Fortinet SSLVPN compatible plugin
@@ -17321,7 +17321,7 @@ sys-auth/nss-pam-ldapd 0.9.11-r3: NSS module for name lookups using LDAP
 sys-auth/nss_ldap 265-r5 265-r9: NSS LDAP Module
 sys-auth/oath-toolkit 2.6.2: Toolkit for using one-time password authentication with HOTP/TOTP algorithms
 sys-auth/otpcalc 0.97.9: A One Time Password and S/Key calculator for GTK+
-sys-auth/pam-pgsql 0.7.3.2: pam module to authenticate users via PostgreSQL
+sys-auth/pam-pgsql 0.7.3.2-r1: PAM module to authenticate users via PostgreSQL
 sys-auth/pam-script 1.1.8 1.1.9: PAM module for running scripts during authorization, password change and session
 sys-auth/pam_abl 0.6.0: PAM module for blacklisting hosts and users repeatedly failed authentication
 sys-auth/pam_blue 0.9.0-r1: PAM module providing ability to authenticate via a bluetooth compatible device
@@ -17331,11 +17331,11 @@ sys-auth/pam_krb5 4.9: Kerberos V PAM Authentication Module
 sys-auth/pam_ldap 186-r3: PAM LDAP Module
 sys-auth/pam_mktemp 1.1.1: Create per-user private temporary directories during login
 sys-auth/pam_mount 2.16-r3 2.17 2.18: A PAM module that can mount volumes for a user session
-sys-auth/pam_mysql 0.8.1-r1 0.8.2: pam_mysql is a module for pam to authenticate users with mysql
+sys-auth/pam_mysql 0.8.1-r2 0.8.2-r1: pam_mysql is a module for pam to authenticate users with mysql
 sys-auth/pam_p11 0.3.1: PAM module for authenticating against PKCS#11 tokens
 sys-auth/pam_require 0.7-r1: Allows you to require a special group or user to access a service
 sys-auth/pam_skey 1.1.5-r6: PAM interface for the S/Key authentication system
-sys-auth/pam_smb 2.0.0_rc6-r2: PAM module for authenticating against an SMB (such as the Win_x families) server
+sys-auth/pam_smb 2.0.0_rc6-r3: PAM module for authenticating against an SMB (such as the Win_x families) server
 sys-auth/pam_ssh 2.3: Uses ssh-agent to provide single sign-on
 sys-auth/pam_ssh_agent_auth 0.10.3 9999: Simple module to authenticate users against their ssh-agent keys
 sys-auth/pam_u2f 1.1.0 1.1.1: PAM module for FIDO2 and U2F keys
@@ -17395,7 +17395,7 @@ sys-block/noflushd 2.8: A daemon to spin down your disks and force accesses to b
 sys-block/open-iscsi 2.1.3 2.1.4-r1: A performant, transport independent, multi-platform implementation of RFC3720
 sys-block/open-isns 0.98 0.101: iSNS server and client for Linux
 sys-block/parted 3.4: Create, destroy, resize, check, copy partitions and file systems
-sys-block/partimage 0.6.9-r1: Console-based application to efficiently save raw partition data to image file
+sys-block/partimage 0.6.9-r2: Console-based application to efficiently save raw partition data to image file
 sys-block/partitionmanager 20.12.3 21.04.2: Utility for management of disks, partitions and file systems
 sys-block/perccli 7.5.007.0529 7.5.007.0529-r2: LINUX PERCCLI Utility For All Dell HBA/PERC Controllers
 sys-block/qla-fc-firmware 20101015: QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards
@@ -17436,7 +17436,7 @@ sys-boot/makebootfat 1.4: Command line utility able to create bootable USB disks
 sys-boot/mbr 1.1.11-r1: A replacement master boot record for IBM-PC compatible computers
 sys-boot/mbr-gpt 0.0.1-r1: An MBR that can handle BIOS-based boot on GPT
 sys-boot/milo 2.4.18: The Alpha MIniLOader, for Alpha Machines without SRM
-sys-boot/mokutil 0.4.0: The utility to manipulate machines owner keys which managed in shim
+sys-boot/mokutil 0.3.0_p20170405 0.5.0: The utility to manipulate machines owner keys which managed in shim
 sys-boot/netboot 0.10.2-r2: Allows to remote boot a computer over an IP network
 sys-boot/nettrom 2.3.3: NetWinder ARM bootloader and utilities
 sys-boot/os-prober 1.77 1.78: Utility to detect other OSs on a set of drives
@@ -17776,7 +17776,7 @@ sys-kernel/dracut-crypt-ssh 1.0.7: Early unlocking of encrypted systems via ssh
 sys-kernel/genkernel 3.5.3.3 4.0.10 4.1.2-r3 4.2.1-r1 9999: Gentoo automatic kernel building scripts
 sys-kernel/gentoo-kernel 5.4.120 5.4.125 5.4.126 5.4.127 5.4.128 5.10.38 5.10.43 5.10.44 5.10.45 5.10.46 5.11.22 5.12.10 5.12.11 5.12.12 5.12.13: Linux kernel built with Gentoo patches
 sys-kernel/gentoo-kernel-bin 5.4.120 5.4.120-r1 5.4.125 5.4.125-r1 5.4.126 5.4.126-r1 5.4.127 5.4.127-r1 5.4.128 5.10.38 5.10.38-r1 5.10.43 5.10.43-r1 5.10.44 5.10.44-r1 5.10.45 5.10.45-r1 5.10.46 5.12.10 5.12.10-r1 5.12.11 5.12.11-r1 5.12.12 5.12.12-r1 5.12.13: Pre-built Linux kernel with genpatches
-sys-kernel/gentoo-sources 4.4.264 4.4.270 4.4.271 4.4.272 4.4.273 4.9.264 4.9.270 4.9.271 4.9.272 4.9.273 4.14.228 4.14.234 4.14.235 4.14.236 4.14.237 4.19.184 4.19.192 4.19.193 4.19.194 4.19.195 5.4.109 5.4.123 5.4.124 5.4.125 5.4.126 5.4.127 5.4.128 5.10.27 5.10.40 5.10.41 5.10.42 5.10.43-r1 5.10.44 5.10.45 5.10.46 5.12.7 5.12.8 5.12.9 5.12.10 5.12.11 5.12.12 5.12.13 5.12.14 5.13.0: Full sources including the Gentoo patchset for the 5.13 kernel tree
+sys-kernel/gentoo-sources 4.4.264 4.4.270 4.4.271 4.4.272 4.4.273 4.4.274 4.9.264 4.9.270 4.9.271 4.9.272 4.9.273 4.9.274 4.14.228 4.14.234 4.14.235 4.14.236 4.14.237 4.14.238 4.19.184 4.19.192 4.19.193 4.19.194 4.19.195 4.19.196 5.4.109 5.4.123 5.4.124 5.4.125 5.4.126 5.4.127 5.4.128 5.4.129 5.10.27 5.10.40 5.10.41 5.10.42 5.10.43-r1 5.10.44 5.10.45 5.10.46 5.10.47 5.12.7 5.12.8 5.12.9 5.12.10 5.12.11 5.12.12 5.12.13 5.12.14 5.13.0: Full sources including the Gentoo patchset for the 5.13 kernel tree
 sys-kernel/git-sources 5.13_rc1 5.13_rc2 5.13_rc3 5.13_rc4 5.13_rc5 5.13_rc6 5.13_rc7: The very latest -git version of the Linux kernel
 sys-kernel/installkernel-gentoo 1 2 3: Gentoo fork of installkernel script from debianutils
 sys-kernel/installkernel-systemd-boot 0 1: Wrap kernel-install from systemd-boot as installkernel
@@ -17871,7 +17871,7 @@ sys-libs/talloc 2.3.2: Samba talloc library
 sys-libs/tapi 1.30 2.0.0: Text-based Application Programming Interface
 sys-libs/tdb 1.4.3: Simple database API
 sys-libs/tevent 0.10.2: Samba tevent library
-sys-libs/timezone-data 2021a: Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+sys-libs/timezone-data 2021a-r1: Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
 sys-libs/uclibc-ng 1.0.30-r1 1.0.32 1.0.33 1.0.35 9999: C library for developing embedded Linux systems
 sys-libs/uid_wrapper 1.2.7 1.2.8: Wrapper to fake privilege separation
 sys-libs/zlib 1.2.11-r4: Standard (de)compression library
@@ -18170,7 +18170,7 @@ www-apache/modsec-flameeyes 20130216 99999999: Flameeyes's Ruleset for ModSecuri
 www-apache/modsecurity-crs 3.3.0: OWASP ModSecurity Core Rule Set
 www-apache/mpm_itk 2.4.7_p4-r1: Run virtual hosts under separate users/groups
 www-apache/passenger 6.0.6 6.0.8 6.0.9: Passenger makes deployment of Ruby on Rails applications a breeze
-www-apache/pwauth 2.3.10: A Unix Web Authenticator
+www-apache/pwauth 2.3.10-r1: A Unix Web Authenticator
 www-apps/Apache-Gallery 1.0_rc3-r1: Apache gallery for mod_perl
 www-apps/agendav 2.2.0: multilanguage CalDAV web client
 www-apps/airdcpp-webui 2.10.0 2.11.0: Web interface for airdcpp-webclient
@@ -18305,7 +18305,7 @@ www-servers/fnord 1.11-r2: Yet another small httpd
 www-servers/gatling 0.16-r3: High performance web server
 www-servers/gunicorn 20.1.0: A WSGI HTTP Server for UNIX
 www-servers/h2o 2.2.6 9999: H2O - the optimized HTTP/1, HTTP/2 server
-www-servers/lighttpd 1.4.55-r100 1.4.58: Lightweight high-performance web server
+www-servers/lighttpd 1.4.55-r101 1.4.58-r1: Lightweight high-performance web server
 www-servers/mongrel2 1.11.0-r1: A language agnostic web server focused on web applications
 www-servers/monkeyd 1.6.9-r1 9999: A small, fast, and scalable web server
 www-servers/moonbridge 1.0.1: Network Server for Lua Applications
@@ -18318,7 +18318,7 @@ www-servers/resin 4.0.48-r1: A fast Servlet and JSP engine
 www-servers/servefile 0.5.1: Serve a single file via HTTP
 www-servers/sniproxy 0.6.0-r1: Proxies incoming HTTP and TLS connections based on the hostname
 www-servers/spawn-fcgi 1.6.4-r1: A FCGI spawner for lighttpd and cherokee and other webservers
-www-servers/thttpd 2.27.1 9999: Fork of thttpd, a small, fast, multiplexing webserver
+www-servers/thttpd 2.27.1-r1 9999: Fork of thttpd, a small, fast, multiplexing webserver
 www-servers/tomcat 7.0.109 8.5.66 8.5.68 9.0.46 9.0.48 10.0.6 10.0.7: Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
 www-servers/tornado 6.0.4 6.1: Python web framework and asynchronous networking library
 www-servers/uwsgi 2.0.19.1-r102 2.0.19.1-r103: uWSGI server for Python web applications
@@ -18572,7 +18572,7 @@ x11-misc/3dfm 1.0-r1: OpenGL-based 3D File Manager
 x11-misc/accessx 0951-r2: Interface to the XKEYBOARD extension in X11
 x11-misc/alacarte 3.36.0: Simple GNOME menu editor
 x11-misc/albert 0.17.2: A fast and flexible keyboard launcher
-x11-misc/alock 1.0.0: locks the local X display until a password is entered
+x11-misc/alock 1.0.0-r1: locks the local X display until a password is entered
 x11-misc/appmenu-gtk-module 0.7.3-r1: Application menu module for GTK
 x11-misc/apwal 0.4.5-r2: A simple application launcher and combined editor
 x11-misc/arandr 0.1.10-r1: Another XRandR GUI
@@ -18736,7 +18736,7 @@ x11-misc/simpleswitcher 20191008 99999999: lightweight EWMH window switcher with
 x11-misc/sisctrl 0.0.20051202-r1: tool that allows you to tune SiS drivers from X
 x11-misc/skippy 0.5.0-r1: A full-screen task-switcher providing Apple Expose-like functionality
 x11-misc/slim 1.3.6-r5 9999: Simple Login Manager
-x11-misc/slock 1.4: simple X display locker
+x11-misc/slock 1.4-r1: simple X display locker
 x11-misc/slop 7.5 9999: Application that queries the user for a selection for printing
 x11-misc/snixembed 0.2.2 0.3.0: Proxy StatusNotifierItems as XEmbedded systemtray-spec icons
 x11-misc/spacefm 1.0.6-r1 9999: A multi-panel tabbed file manager
@@ -18772,7 +18772,7 @@ x11-misc/vnc2swf 0.5.0-r1: A tool for recording Flash SWF movies from VNC sessio
 x11-misc/vym 2.7.1 9999: View Your Mind, a mindmap tool
 x11-misc/wayv 0.3-r3: Wayv is hand-writing/gesturing recognition software for X
 x11-misc/wbar 2.3.4-r3: A fast, lightweight quick launch bar
-x11-misc/wdm 1.28-r7: WINGs Display Manager
+x11-misc/wdm 1.28-r8: WINGs Display Manager
 x11-misc/whaw 0.2: Window manager independent Window Layout tool
 x11-misc/wininfo 0.7-r1: An X app that follows your pointer providing information about the windows below
 x11-misc/wmctrl 1.07-r2: Command line tool to interact with an EWMH/NetWM compatible X Window Manager
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ef7d4004407d..917eb4661c90 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 30 Jun 2021 18:36:46 +0000
+Wed, 30 Jun 2021 18:51:41 +0000