2021-05-13 14:05:34 UTC

150 files changed, 317 insertions, 522 deletions

diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.46 b/metadata/md5-cache/app-admin/apache-tools-2.4.46
index 2a09ecec6caf..20c056938852 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.46
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.46
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
 DEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) sys-devel/libtool
 DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
@@ -12,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.46.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=9affca4f1746da6c4156b6ad2ee59ad3
+_md5_=9130e569f27c9f18db66941df36a595f
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.47 b/metadata/md5-cache/app-admin/apache-tools-2.4.47
index f1ff6ebb637b..112b45b3e722 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.47
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.47
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
 DEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) sys-devel/libtool
 DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
@@ -12,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.47.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=9aa97450136797a2d986245a8b91af34
+_md5_=3b9134e93b7eee3fd071d1912566e6df
diff --git a/metadata/md5-cache/app-arch/tar-1.32-r1 b/metadata/md5-cache/app-arch/tar-1.32-r1
index d13f26cf3943..abaa9c31e20c 100644
--- a/metadata/md5-cache/app-arch/tar-1.32-r1
+++ b/metadata/md5-cache/app-arch/tar-1.32-r1
@@ -3,12 +3,10 @@ DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/
 DESCRIPTION=Use this to make tarballs :)
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/tar/
-INHERIT=flag-o-matic
 IUSE=acl elibc_glibc minimal nls selinux userland_GNU xattr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.32.tar.bz2 https://alpha.gnu.org/gnu/tar/tar-1.32.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=50f0214bca10b7911853b8cc7cdae101
+_md5_=1bb217a02e9bca3ca600785a23abfac0
diff --git a/metadata/md5-cache/app-arch/tar-1.33 b/metadata/md5-cache/app-arch/tar-1.33
index a1f085ed3eb1..d2dc6e28a68b 100644
--- a/metadata/md5-cache/app-arch/tar-1.33
+++ b/metadata/md5-cache/app-arch/tar-1.33
@@ -4,12 +4,10 @@ DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) xattr? ( elibc_glib
 DESCRIPTION=Use this to make tarballs :)
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/tar/
-INHERIT=flag-o-matic
 IUSE=acl elibc_glibc minimal nls selinux userland_GNU xattr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.33.tar.xz https://alpha.gnu.org/gnu/tar/tar-1.33.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=d1bced5884ff64f19001313ab1a0e362
+_md5_=a44e1f70407a2b9de3280460c6407235
diff --git a/metadata/md5-cache/app-arch/tar-1.34 b/metadata/md5-cache/app-arch/tar-1.34
index 160612772c54..15c3b7c34e33 100644
--- a/metadata/md5-cache/app-arch/tar-1.34
+++ b/metadata/md5-cache/app-arch/tar-1.34
@@ -4,12 +4,10 @@ DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) xattr? ( elibc_glib
 DESCRIPTION=Use this to make tarballs :)
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/tar/
-INHERIT=flag-o-matic
 IUSE=acl elibc_glibc minimal nls selinux userland_GNU xattr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.34.tar.xz https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=5e934c22b9d7e59acd9eb7d770cba138
+_md5_=c3e3fef7fd79e3c22ffd0ed445a9c3e3
diff --git a/metadata/md5-cache/app-arch/unrar-6.0.4 b/metadata/md5-cache/app-arch/unrar-6.0.4
index 23d121632cdc..9a3447493966 100644
--- a/metadata/md5-cache/app-arch/unrar-6.0.4
+++ b/metadata/md5-cache/app-arch/unrar-6.0.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=7
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
-INHERIT=flag-o-matic multilib toolchain-funcs
+INHERIT=multilib toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0/6
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.0.4.tar.gz -> unrar-6.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=6533f4f190a1a73a20556fef600b65c5
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9c7b01049806e318da2a4c216f0ea099
diff --git a/metadata/md5-cache/app-arch/unrar-6.0.5 b/metadata/md5-cache/app-arch/unrar-6.0.5
index b90c75998b70..22db90ae0d9c 100644
--- a/metadata/md5-cache/app-arch/unrar-6.0.5
+++ b/metadata/md5-cache/app-arch/unrar-6.0.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=7
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
-INHERIT=flag-o-matic multilib toolchain-funcs
+INHERIT=multilib toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0/6
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.0.5.tar.gz -> unrar-6.0.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=88803a2b3f85700b46359c7780ee8a45
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=89a7ec9d68dea230693a41d9eacfceea
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.5 b/metadata/md5-cache/app-arch/xz-utils-5.2.5
index 4ea2e16789f7..113e5cdf4825 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.5
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.5
@@ -4,7 +4,7 @@ DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
-INHERIT=multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
+INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript
 IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
@@ -12,5 +12,5 @@ RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-5.2.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=0c8ac55779f4143f11f8fa93b64ea893
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=fbdf248150b26b55c7b5670172b068a9
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index e0843b07a894..77fe6dec55af 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -4,12 +4,12 @@ DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
-INHERIT=multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript git-r3 autotools
+INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript git-r3 autotools
 IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 PROPERTIES=live
 RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 RESTRICT=!extra-filters? ( test )
 SLOT=0
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f759a9b32069d65f9222369a76ec342a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=17bcb6b2e2938e2931a8b90d0ffac532
diff --git a/metadata/md5-cache/app-doc/abs-guide-10 b/metadata/md5-cache/app-doc/abs-guide-10
index cacc5c5210c1..d0992c38d174 100644
--- a/metadata/md5-cache/app-doc/abs-guide-10
+++ b/metadata/md5-cache/app-doc/abs-guide-10
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst unpack
 DESCRIPTION=An in-depth exploration of the art of shell scripting
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.tldp.org/LDP/abs/html
 IUSE=pdf
 KEYWORDS=~alpha amd64 hppa ~mips ppc sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://bash.deta.in/abs-guide-final.tar.bz2 pdf? ( http://bash.deta.in/abs-guide.pdf )
-_md5_=47347cae5fc99a1c75d75fe2a853b791
+_md5_=c480a79fa118c62ea05b33672321dea6
diff --git a/metadata/md5-cache/app-doc/tldp-howto-20120707 b/metadata/md5-cache/app-doc/tldp-howto-20120707
index 053b1aada36f..bb21059fa65c 100644
--- a/metadata/md5-cache/app-doc/tldp-howto-20120707
+++ b/metadata/md5-cache/app-doc/tldp-howto-20120707
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DESCRIPTION=The Linux Documentation Project HOWTOs
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.tldp.org
 IUSE=+html htmlsingle pdf text
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
@@ -9,4 +9,4 @@ REQUIRED_USE=|| ( html htmlsingle pdf text )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=html? ( http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html/Linux-html-HOWTOs-20120707.tar.bz2 ) htmlsingle? ( http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Linux-html-single-HOWTOs-20120707.tar.bz2 ) pdf? ( http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/pdf/Linux-pdf-HOWTOs-20120707.tar.bz2 ) text? ( http://www.ibiblio.org/pub/Linux/docs/HOWTO/Linux-HOWTOs-20120707.tar.bz2 )
-_md5_=ddc27609ae26d09189b10f0721f662ae
+_md5_=29a1cbbf4cb8a2328d0910a75fac38da
diff --git a/metadata/md5-cache/app-shells/bash-2.05b_p13 b/metadata/md5-cache/app-shells/bash-2.05b_p13
index be1aa3d729b3..04bae0ac10be 100644
--- a/metadata/md5-cache/app-shells/bash-2.05b_p13
+++ b/metadata/md5-cache/app-shells/bash-2.05b_p13
@@ -11,4 +11,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline?
 SLOT=2.05b
 SRC_URI=mirror://gnu/bash/bash-2.05b.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-001 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-002 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-003 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-004 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-005 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-006 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-007 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-008 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-009 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-010 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-011 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-012 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-013 mirror://gnu/bash/bash-2.05b-patches/bash205b-001 mirror://gnu/bash/bash-2.05b-patches/bash205b-002 mirror://gnu/bash/bash-2.05b-patches/bash205b-003 mirror://gnu/bash/bash-2.05b-patches/bash205b-004 mirror://gnu/bash/bash-2.05b-patches/bash205b-005 mirror://gnu/bash/bash-2.05b-patches/bash205b-006 mirror://gnu/bash/bash-2.05b-patches/bash205b-007 mirror://gnu/bash/bash-2.05b-patches/bash205b-008 mirror://gnu/bash/bash-2.05b-patches/bash205b-009 mirror://gnu/bash/bash-2.05b-patches/bash205b-010 mirror://gnu/bash/bash-2.05b-patches/bash205b-011 mirror://gnu/bash/bash-2.05b-patches/bash205b-012 mirror://gnu/bash/bash-2.05b-patches/bash205b-013
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=adba0f9a0cc8dfdc1938d457bb6c1ac9
+_md5_=0d0a347f2b199207e69c055e3431521d
diff --git a/metadata/md5-cache/app-shells/bash-3.0_p22 b/metadata/md5-cache/app-shells/bash-3.0_p22
index cebd26692e56..1d4260f66e81 100644
--- a/metadata/md5-cache/app-shells/bash-3.0_p22
+++ b/metadata/md5-cache/app-shells/bash-3.0_p22
@@ -11,4 +11,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline?
 SLOT=3.0
 SRC_URI=mirror://gnu/bash/bash-3.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-001 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-002 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-003 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-004 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-005 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-006 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-007 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-008 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-009 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-010 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-011 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-012 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-013 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-014 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-015 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-016 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-017 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-018 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-019 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-020 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-021 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-022 mirror://gnu/bash/bash-3.0-patches/bash30-001 mirror://gnu/bash/bash-3.0-patches/bash30-002 mirror://gnu/bash/bash-3.0-patches/bash30-003 mirror://gnu/bash/bash-3.0-patches/bash30-004 mirror://gnu/bash/bash-3.0-patches/bash30-005 mirror://gnu/bash/bash-3.0-patches/bash30-006 mirror://gnu/bash/bash-3.0-patches/bash30-007 mirror://gnu/bash/bash-3.0-patches/bash30-008 mirror://gnu/bash/bash-3.0-patches/bash30-009 mirror://gnu/bash/bash-3.0-patches/bash30-010 mirror://gnu/bash/bash-3.0-patches/bash30-011 mirror://gnu/bash/bash-3.0-patches/bash30-012 mirror://gnu/bash/bash-3.0-patches/bash30-013 mirror://gnu/bash/bash-3.0-patches/bash30-014 mirror://gnu/bash/bash-3.0-patches/bash30-015 mirror://gnu/bash/bash-3.0-patches/bash30-016 mirror://gnu/bash/bash-3.0-patches/bash30-017 mirror://gnu/bash/bash-3.0-patches/bash30-018 mirror://gnu/bash/bash-3.0-patches/bash30-019 mirror://gnu/bash/bash-3.0-patches/bash30-020 mirror://gnu/bash/bash-3.0-patches/bash30-021 mirror://gnu/bash/bash-3.0-patches/bash30-022
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=f6759fb11b53c87d4c3dd0f0002b9cc7
+_md5_=00469c7dc319f9b219e3415c8dd341d8
diff --git a/metadata/md5-cache/app-shells/bash-3.1_p23 b/metadata/md5-cache/app-shells/bash-3.1_p23
index 801189c3f2be..bf28adca20b8 100644
--- a/metadata/md5-cache/app-shells/bash-3.1_p23
+++ b/metadata/md5-cache/app-shells/bash-3.1_p23
@@ -11,4 +11,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline?
 SLOT=3.1
 SRC_URI=mirror://gnu/bash/bash-3.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-006 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-007 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-008 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-009 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-010 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-011 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-012 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-013 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-014 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-015 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-016 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-017 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-018 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-019 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-020 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-021 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-022 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-023 mirror://gnu/bash/bash-3.1-patches/bash31-001 mirror://gnu/bash/bash-3.1-patches/bash31-002 mirror://gnu/bash/bash-3.1-patches/bash31-003 mirror://gnu/bash/bash-3.1-patches/bash31-004 mirror://gnu/bash/bash-3.1-patches/bash31-005 mirror://gnu/bash/bash-3.1-patches/bash31-006 mirror://gnu/bash/bash-3.1-patches/bash31-007 mirror://gnu/bash/bash-3.1-patches/bash31-008 mirror://gnu/bash/bash-3.1-patches/bash31-009 mirror://gnu/bash/bash-3.1-patches/bash31-010 mirror://gnu/bash/bash-3.1-patches/bash31-011 mirror://gnu/bash/bash-3.1-patches/bash31-012 mirror://gnu/bash/bash-3.1-patches/bash31-013 mirror://gnu/bash/bash-3.1-patches/bash31-014 mirror://gnu/bash/bash-3.1-patches/bash31-015 mirror://gnu/bash/bash-3.1-patches/bash31-016 mirror://gnu/bash/bash-3.1-patches/bash31-017 mirror://gnu/bash/bash-3.1-patches/bash31-018 mirror://gnu/bash/bash-3.1-patches/bash31-019 mirror://gnu/bash/bash-3.1-patches/bash31-020 mirror://gnu/bash/bash-3.1-patches/bash31-021 mirror://gnu/bash/bash-3.1-patches/bash31-022 mirror://gnu/bash/bash-3.1-patches/bash31-023
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=11203f3bbec31f637b5105bbe894648f
+_md5_=ebcc8dbbef394871bf2cb18566c5204d
diff --git a/metadata/md5-cache/app-shells/bash-3.2_p57 b/metadata/md5-cache/app-shells/bash-3.2_p57
index b6596906fa6e..19add1581dd4 100644
--- a/metadata/md5-cache/app-shells/bash-3.2_p57
+++ b/metadata/md5-cache/app-shells/bash-3.2_p57
@@ -11,4 +11,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline?
 SLOT=3.2
 SRC_URI=mirror://gnu/bash/bash-3.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-001 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-002 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-003 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-004 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-005 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-006 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-007 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-008 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-009 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-010 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-011 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-012 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-013 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-014 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-015 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-016 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-017 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-018 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-019 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-020 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-021 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-022 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-023 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-024 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-025 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-026 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-027 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-028 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-029 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-030 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-031 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-032 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-033 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-034 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-035 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-036 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-037 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-038 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-039 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-040 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-041 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-042 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-043 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-044 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-045 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-046 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-047 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-048 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-049 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-050 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-051 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-052 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-053 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-054 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-055 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-056 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-057 mirror://gnu/bash/bash-3.2-patches/bash32-001 mirror://gnu/bash/bash-3.2-patches/bash32-002 mirror://gnu/bash/bash-3.2-patches/bash32-003 mirror://gnu/bash/bash-3.2-patches/bash32-004 mirror://gnu/bash/bash-3.2-patches/bash32-005 mirror://gnu/bash/bash-3.2-patches/bash32-006 mirror://gnu/bash/bash-3.2-patches/bash32-007 mirror://gnu/bash/bash-3.2-patches/bash32-008 mirror://gnu/bash/bash-3.2-patches/bash32-009 mirror://gnu/bash/bash-3.2-patches/bash32-010 mirror://gnu/bash/bash-3.2-patches/bash32-011 mirror://gnu/bash/bash-3.2-patches/bash32-012 mirror://gnu/bash/bash-3.2-patches/bash32-013 mirror://gnu/bash/bash-3.2-patches/bash32-014 mirror://gnu/bash/bash-3.2-patches/bash32-015 mirror://gnu/bash/bash-3.2-patches/bash32-016 mirror://gnu/bash/bash-3.2-patches/bash32-017 mirror://gnu/bash/bash-3.2-patches/bash32-018 mirror://gnu/bash/bash-3.2-patches/bash32-019 mirror://gnu/bash/bash-3.2-patches/bash32-020 mirror://gnu/bash/bash-3.2-patches/bash32-021 mirror://gnu/bash/bash-3.2-patches/bash32-022 mirror://gnu/bash/bash-3.2-patches/bash32-023 mirror://gnu/bash/bash-3.2-patches/bash32-024 mirror://gnu/bash/bash-3.2-patches/bash32-025 mirror://gnu/bash/bash-3.2-patches/bash32-026 mirror://gnu/bash/bash-3.2-patches/bash32-027 mirror://gnu/bash/bash-3.2-patches/bash32-028 mirror://gnu/bash/bash-3.2-patches/bash32-029 mirror://gnu/bash/bash-3.2-patches/bash32-030 mirror://gnu/bash/bash-3.2-patches/bash32-031 mirror://gnu/bash/bash-3.2-patches/bash32-032 mirror://gnu/bash/bash-3.2-patches/bash32-033 mirror://gnu/bash/bash-3.2-patches/bash32-034 mirror://gnu/bash/bash-3.2-patches/bash32-035 mirror://gnu/bash/bash-3.2-patches/bash32-036 mirror://gnu/bash/bash-3.2-patches/bash32-037 mirror://gnu/bash/bash-3.2-patches/bash32-038 mirror://gnu/bash/bash-3.2-patches/bash32-039 mirror://gnu/bash/bash-3.2-patches/bash32-040 mirror://gnu/bash/bash-3.2-patches/bash32-041 mirror://gnu/bash/bash-3.2-patches/bash32-042 mirror://gnu/bash/bash-3.2-patches/bash32-043 mirror://gnu/bash/bash-3.2-patches/bash32-044 mirror://gnu/bash/bash-3.2-patches/bash32-045 mirror://gnu/bash/bash-3.2-patches/bash32-046 mirror://gnu/bash/bash-3.2-patches/bash32-047 mirror://gnu/bash/bash-3.2-patches/bash32-048 mirror://gnu/bash/bash-3.2-patches/bash32-049 mirror://gnu/bash/bash-3.2-patches/bash32-050 mirror://gnu/bash/bash-3.2-patches/bash32-051 mirror://gnu/bash/bash-3.2-patches/bash32-052 mirror://gnu/bash/bash-3.2-patches/bash32-053 mirror://gnu/bash/bash-3.2-patches/bash32-054 mirror://gnu/bash/bash-3.2-patches/bash32-055 mirror://gnu/bash/bash-3.2-patches/bash32-056 mirror://gnu/bash/bash-3.2-patches/bash32-057
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=f5b5be46768c9d6eb32dc9f6d8102767
+_md5_=b0def8a0c175a53bbe9ef4f00dc01a77
diff --git a/metadata/md5-cache/app-shells/bash-4.0_p44 b/metadata/md5-cache/app-shells/bash-4.0_p44
index b0a5de68c76d..4ffc81814039 100644
--- a/metadata/md5-cache/app-shells/bash-4.0_p44
+++ b/metadata/md5-cache/app-shells/bash-4.0_p44
@@ -11,4 +11,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline?
 SLOT=4.0
 SRC_URI=mirror://gnu/bash/bash-4.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-001 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-002 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-003 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-004 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-005 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-006 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-007 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-008 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-009 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-010 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-011 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-012 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-013 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-014 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-015 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-016 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-017 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-018 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-019 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-020 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-021 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-022 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-023 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-024 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-025 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-026 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-027 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-028 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-029 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-030 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-031 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-032 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-033 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-034 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-035 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-036 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-037 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-038 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-039 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-040 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-041 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-042 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-043 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-044 mirror://gnu/bash/bash-4.0-patches/bash40-001 mirror://gnu/bash/bash-4.0-patches/bash40-002 mirror://gnu/bash/bash-4.0-patches/bash40-003 mirror://gnu/bash/bash-4.0-patches/bash40-004 mirror://gnu/bash/bash-4.0-patches/bash40-005 mirror://gnu/bash/bash-4.0-patches/bash40-006 mirror://gnu/bash/bash-4.0-patches/bash40-007 mirror://gnu/bash/bash-4.0-patches/bash40-008 mirror://gnu/bash/bash-4.0-patches/bash40-009 mirror://gnu/bash/bash-4.0-patches/bash40-010 mirror://gnu/bash/bash-4.0-patches/bash40-011 mirror://gnu/bash/bash-4.0-patches/bash40-012 mirror://gnu/bash/bash-4.0-patches/bash40-013 mirror://gnu/bash/bash-4.0-patches/bash40-014 mirror://gnu/bash/bash-4.0-patches/bash40-015 mirror://gnu/bash/bash-4.0-patches/bash40-016 mirror://gnu/bash/bash-4.0-patches/bash40-017 mirror://gnu/bash/bash-4.0-patches/bash40-018 mirror://gnu/bash/bash-4.0-patches/bash40-019 mirror://gnu/bash/bash-4.0-patches/bash40-020 mirror://gnu/bash/bash-4.0-patches/bash40-021 mirror://gnu/bash/bash-4.0-patches/bash40-022 mirror://gnu/bash/bash-4.0-patches/bash40-023 mirror://gnu/bash/bash-4.0-patches/bash40-024 mirror://gnu/bash/bash-4.0-patches/bash40-025 mirror://gnu/bash/bash-4.0-patches/bash40-026 mirror://gnu/bash/bash-4.0-patches/bash40-027 mirror://gnu/bash/bash-4.0-patches/bash40-028 mirror://gnu/bash/bash-4.0-patches/bash40-029 mirror://gnu/bash/bash-4.0-patches/bash40-030 mirror://gnu/bash/bash-4.0-patches/bash40-031 mirror://gnu/bash/bash-4.0-patches/bash40-032 mirror://gnu/bash/bash-4.0-patches/bash40-033 mirror://gnu/bash/bash-4.0-patches/bash40-034 mirror://gnu/bash/bash-4.0-patches/bash40-035 mirror://gnu/bash/bash-4.0-patches/bash40-036 mirror://gnu/bash/bash-4.0-patches/bash40-037 mirror://gnu/bash/bash-4.0-patches/bash40-038 mirror://gnu/bash/bash-4.0-patches/bash40-039 mirror://gnu/bash/bash-4.0-patches/bash40-040 mirror://gnu/bash/bash-4.0-patches/bash40-041 mirror://gnu/bash/bash-4.0-patches/bash40-042 mirror://gnu/bash/bash-4.0-patches/bash40-043 mirror://gnu/bash/bash-4.0-patches/bash40-044
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=19151fdd4e70b2fd207433eb59a25e4f
+_md5_=da040a8ae0714b3d1bbe1e61562ea297
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p17 b/metadata/md5-cache/app-shells/bash-4.1_p17
index 4448e16fe934..2a00f125d4c4 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p17
+++ b/metadata/md5-cache/app-shells/bash-4.1_p17
@@ -11,4 +11,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline?
 SLOT=4.1
 SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-010 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-011 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-012 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-013 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-014 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-015 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-016 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-017 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-010 mirror://gnu/bash/bash-4.1-patches/bash41-011 mirror://gnu/bash/bash-4.1-patches/bash41-012 mirror://gnu/bash/bash-4.1-patches/bash41-013 mirror://gnu/bash/bash-4.1-patches/bash41-014 mirror://gnu/bash/bash-4.1-patches/bash41-015 mirror://gnu/bash/bash-4.1-patches/bash41-016 mirror://gnu/bash/bash-4.1-patches/bash41-017
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=2f25369eb02a2c7eb4a714572596b710
+_md5_=6aa11cf5daa3b0b9ca43b8f9bbf17d91
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p53 b/metadata/md5-cache/app-shells/bash-4.2_p53
index 56415ac421e4..a1ec48b1273d 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p53
+++ b/metadata/md5-cache/app-shells/bash-4.2_p53
@@ -12,4 +12,4 @@ RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline?
 SLOT=4.2
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-038 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-039 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-040 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-041 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-042 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-043 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-044 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-045 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-046 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-047 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-048 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-049 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-050 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-051 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-052 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-053 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-038 mirror://gnu/bash/bash-4.2-patches/bash42-039 mirror://gnu/bash/bash-4.2-patches/bash42-040 mirror://gnu/bash/bash-4.2-patches/bash42-041 mirror://gnu/bash/bash-4.2-patches/bash42-042 mirror://gnu/bash/bash-4.2-patches/bash42-043 mirror://gnu/bash/bash-4.2-patches/bash42-044 mirror://gnu/bash/bash-4.2-patches/bash42-045 mirror://gnu/bash/bash-4.2-patches/bash42-046 mirror://gnu/bash/bash-4.2-patches/bash42-047 mirror://gnu/bash/bash-4.2-patches/bash42-048 mirror://gnu/bash/bash-4.2-patches/bash42-049 mirror://gnu/bash/bash-4.2-patches/bash42-050 mirror://gnu/bash/bash-4.2-patches/bash42-051 mirror://gnu/bash/bash-4.2-patches/bash42-052 mirror://gnu/bash/bash-4.2-patches/bash42-053
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=1cb07bc7077750475c46cbdd74e03829
+_md5_=750e38641b538fa52599c4eeafbfb1b3
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p48-r2 b/metadata/md5-cache/app-shells/bash-4.3_p48-r2
index 326638715754..ec5b0d812003 100644
--- a/metadata/md5-cache/app-shells/bash-4.3_p48-r2
+++ b/metadata/md5-cache/app-shells/bash-4.3_p48-r2
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls
 DESCRIPTION=The standard GNU Bourne again shell
 EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-INHERIT=flag-o-matic toolchain-funcs multilib
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nl
 SLOT=4.3
 SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-034 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-035 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-036 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-037 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-038 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-039 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-040 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-041 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-042 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-043 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-044 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-045 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-046 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-047 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-048 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-034 mirror://gnu/bash/bash-4.3-patches/bash43-035 mirror://gnu/bash/bash-4.3-patches/bash43-036 mirror://gnu/bash/bash-4.3-patches/bash43-037 mirror://gnu/bash/bash-4.3-patches/bash43-038 mirror://gnu/bash/bash-4.3-patches/bash43-039 mirror://gnu/bash/bash-4.3-patches/bash43-040 mirror://gnu/bash/bash-4.3-patches/bash43-041 mirror://gnu/bash/bash-4.3-patches/bash43-042 mirror://gnu/bash/bash-4.3-patches/bash43-043 mirror://gnu/bash/bash-4.3-patches/bash43-044 mirror://gnu/bash/bash-4.3-patches/bash43-045 mirror://gnu/bash/bash-4.3-patches/bash43-046 mirror://gnu/bash/bash-4.3-patches/bash43-047 mirror://gnu/bash/bash-4.3-patches/bash43-048
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=b5b26e2e35683853ec942615e28635aa
+_md5_=107d5701c907829976ab9c8ef367a1db
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p23-r2 b/metadata/md5-cache/app-shells/bash-4.4_p23-r2
index e15cb02287a3..91991360c9f1 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p23-r2
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23-r2
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-l
 DESCRIPTION=The standard GNU Bourne again shell
 EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-INHERIT=flag-o-matic toolchain-funcs multilib prefix
+INHERIT=flag-o-matic toolchain-funcs prefix
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 SLOT=4.4
 SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-013 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-014 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-015 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-016 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-017 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-018 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-019 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-020 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-021 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-022 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-023 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-013 mirror://gnu/bash/bash-4.4-patches/bash44-014 mirror://gnu/bash/bash-4.4-patches/bash44-015 mirror://gnu/bash/bash-4.4-patches/bash44-016 mirror://gnu/bash/bash-4.4-patches/bash44-017 mirror://gnu/bash/bash-4.4-patches/bash44-018 mirror://gnu/bash/bash-4.4-patches/bash44-019 mirror://gnu/bash/bash-4.4-patches/bash44-020 mirror://gnu/bash/bash-4.4-patches/bash44-021 mirror://gnu/bash/bash-4.4-patches/bash44-022 mirror://gnu/bash/bash-4.4-patches/bash44-023
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=72e4d465d535f278f34bd1b9dd855bd9
+_md5_=c5d1caf4f33d78675f976e4c487e6e38
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p18 b/metadata/md5-cache/app-shells/bash-5.0_p18
index b1d69d778722..c56690292856 100644
--- a/metadata/md5-cache/app-shells/bash-5.0_p18
+++ b/metadata/md5-cache/app-shells/bash-5.0_p18
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-l
 DESCRIPTION=The standard GNU Bourne again shell
 EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-INHERIT=flag-o-matic toolchain-funcs multilib prefix
+INHERIT=flag-o-matic toolchain-funcs prefix
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-010 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-011 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-012 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-013 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-014 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-015 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-016 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-017 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-018 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-010 mirror://gnu/bash/bash-5.0-patches/bash50-011 mirror://gnu/bash/bash-5.0-patches/bash50-012 mirror://gnu/bash/bash-5.0-patches/bash50-013 mirror://gnu/bash/bash-5.0-patches/bash50-014 mirror://gnu/bash/bash-5.0-patches/bash50-015 mirror://gnu/bash/bash-5.0-patches/bash50-016 mirror://gnu/bash/bash-5.0-patches/bash50-017 mirror://gnu/bash/bash-5.0-patches/bash50-018
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=1d6b10d2ab2e98fefa55a74e34a28e92
+_md5_=ff2459ce9f834b7a3c4fcbb83188d23c
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p4 b/metadata/md5-cache/app-shells/bash-5.1_p4
index 15547a1d00e8..34cc88bd2001 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p4
+++ b/metadata/md5-cache/app-shells/bash-5.1_p4
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-l
 DESCRIPTION=The standard GNU Bourne again shell
 EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-INHERIT=flag-o-matic toolchain-funcs multilib prefix
+INHERIT=flag-o-matic toolchain-funcs prefix
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 mirror://gnu/bash/bash-5.1-patches/bash51-001 mirror://gnu/bash/bash-5.1-patches/bash51-002 mirror://gnu/bash/bash-5.1-patches/bash51-003 mirror://gnu/bash/bash-5.1-patches/bash51-004
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=35ea4bf94cc91b38d39a5b14ccb50bc0
+_md5_=7ff98d077fa1507c74621935ff1154d2
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p8 b/metadata/md5-cache/app-shells/bash-5.1_p8
index c88e2751a7ce..624949bab238 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p8
+++ b/metadata/md5-cache/app-shells/bash-5.1_p8
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-l
 DESCRIPTION=The standard GNU Bourne again shell
 EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-INHERIT=flag-o-matic toolchain-funcs multilib prefix
+INHERIT=flag-o-matic toolchain-funcs prefix
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 mirror://gnu/bash/bash-5.1-patches/bash51-001 mirror://gnu/bash/bash-5.1-patches/bash51-002 mirror://gnu/bash/bash-5.1-patches/bash51-003 mirror://gnu/bash/bash-5.1-patches/bash51-004 mirror://gnu/bash/bash-5.1-patches/bash51-005 mirror://gnu/bash/bash-5.1-patches/bash51-006 mirror://gnu/bash/bash-5.1-patches/bash51-007 mirror://gnu/bash/bash-5.1-patches/bash51-008
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=35ea4bf94cc91b38d39a5b14ccb50bc0
+_md5_=594ef7bdf01177466d3c8e6cacdf7ed5
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.5 b/metadata/md5-cache/app-text/mandoc-1.14.5
index d55a14b7bbfa..8f14b64e14f7 100644
--- a/metadata/md5-cache/app-text/mandoc-1.14.5
+++ b/metadata/md5-cache/app-text/mandoc-1.14.5
@@ -3,11 +3,12 @@ DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] )
 DESCRIPTION=Suite of tools compiling mdoc and man
 EAPI=6
 HOMEPAGE=https://mdocml.bsd.lv/
+INHERIT=toolchain-funcs
 IUSE=static
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=ISC
 RDEPEND=!static? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://mdocml.bsd.lv/snapshots/mandoc-1.14.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fcc49b2faf3f435c82f97942bca73bfd
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=1d0630950c185ef4fecfaa011244082a
diff --git a/metadata/md5-cache/dev-lang/php-7.3.27 b/metadata/md5-cache/dev-lang/php-7.3.27
index e91185b606cd..be06bd8fc46e 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.27
+++ b/metadata/md5-cache/dev-lang/php-7.3.27
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
+INHERIT=flag-o-matic multilib systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=7.3
 SRC_URI=https://www.php.net/distributions/php-7.3.27.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=10dfd596942e5cfe0902e3e10988a8af
+_md5_=fbe6290a551a350e8e89884476294f73
diff --git a/metadata/md5-cache/dev-lang/php-7.3.27-r1 b/metadata/md5-cache/dev-lang/php-7.3.27-r1
index b9c6b06144e1..d938f9e372ec 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.27-r1
+++ b/metadata/md5-cache/dev-lang/php-7.3.27-r1
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
+INHERIT=flag-o-matic multilib systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=7.3
 SRC_URI=https://www.php.net/distributions/php-7.3.27.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=20b95b18bd489d1b3830168dc06a2352
+_md5_=a5b405c9f1d4fe264a191e88b0338465
diff --git a/metadata/md5-cache/dev-lang/php-7.4.15 b/metadata/md5-cache/dev-lang/php-7.4.15
index d5eef6e792e7..ec43cde2e2f5 100644
--- a/metadata/md5-cache/dev-lang/php-7.4.15
+++ b/metadata/md5-cache/dev-lang/php-7.4.15
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
+INHERIT=flag-o-matic multilib systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=7.4
 SRC_URI=https://www.php.net/distributions/php-7.4.15.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=bc2e0707043db408081f49b8b5cf3cea
+_md5_=1bcc3acc3a6a73aed75476d2cec152a4
diff --git a/metadata/md5-cache/dev-lang/php-7.4.16 b/metadata/md5-cache/dev-lang/php-7.4.16
index c715ebd63134..1eb9a272dd56 100644
--- a/metadata/md5-cache/dev-lang/php-7.4.16
+++ b/metadata/md5-cache/dev-lang/php-7.4.16
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
+INHERIT=flag-o-matic multilib systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=7.4
 SRC_URI=https://www.php.net/distributions/php-7.4.16.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=89d8c2d799ce46f5cfe7f6b4cbc818e2
+_md5_=65d20374977f954c1bfa3adc751752b6
diff --git a/metadata/md5-cache/dev-lang/php-8.0.3 b/metadata/md5-cache/dev-lang/php-8.0.3
index dc2ec4b80617..313d7b4ed940 100644
--- a/metadata/md5-cache/dev-lang/php-8.0.3
+++ b/metadata/md5-cache/dev-lang/php-8.0.3
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
+INHERIT=flag-o-matic multilib systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.php.net/distributions/php-8.0.3.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=306d09c39687e450bdb27c3b57b43c5c
+_md5_=6b23b9130b33a1549a7e6e8c80e15f6d
diff --git a/metadata/md5-cache/dev-util/cpuinfo-collection-20101114 b/metadata/md5-cache/dev-util/cpuinfo-collection-20101114
index 0b8add8cf8f5..011ce4db368d 100644
--- a/metadata/md5-cache/dev-util/cpuinfo-collection-20101114
+++ b/metadata/md5-cache/dev-util/cpuinfo-collection-20101114
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=huge collection of /proc/cpuinfo files
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/test_proc-14November2010.tar.gz
-_md5_=ba4a4637dbcd56501b4d6a6876022be4
+_md5_=58a7afb8f25929966c682ccb6d5f6054
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
index 9d38c24aaba1..fcd5467e49f9 100644
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
@@ -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 install prepare setup
-DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext || ( dev-util/byacc dev-util/yacc <sys-devel/bison-3.7 )
+DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( dev-util/byacc dev-util/yacc <sys-devel/bison-3.7 )
 DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
 EAPI=7
 HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
@@ -10,4 +10,4 @@ LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3407-src.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=adb51f9bf27d87bbf0c34e78bcbc32f3
+_md5_=a6a2a9ebccc2bedf4156f8be3db83ba4
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1 b/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
index 36322ea97f9a..b480d503d873 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
@@ -3,7 +3,7 @@ DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1 >
 DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
-INHERIT=autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
+INHERIT=autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool multilib perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
 IUSE=apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test apache2 elibc_FreeBSD java
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD MIT BSD-2 FSFAP unicode
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	db-use	063d3e7add942762a8203b52ec3066c2	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	dd06178c43afcd54225a7d0fca6342a8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ef8cf5ea2764cfff260cab44ead594c
+_md5_=725e787f4d4ae661444597e8dd168bdb
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.1 b/metadata/md5-cache/dev-vcs/subversion-1.14.1
index a0d8dab30c9e..579c13b97222 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.1
@@ -3,7 +3,7 @@ DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1 >
 DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
-INHERIT=autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
+INHERIT=autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool multilib perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
 IUSE=apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test apache2 elibc_FreeBSD java
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD MIT BSD-2 FSFAP unicode
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	db-use	063d3e7add942762a8203b52ec3066c2	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	dd06178c43afcd54225a7d0fca6342a8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ee0cbf59e33157c843a213c676cc5c8
+_md5_=a2a3dcdd799f3e83780c856b9bbb0385
diff --git a/metadata/md5-cache/media-libs/exiftool-12.08 b/metadata/md5-cache/media-libs/exiftool-12.08
deleted file mode 100644
index ab9b6aa82318..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-12.08
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=7
-HOMEPAGE=https://exiftool.org/
-INHERIT=perl-module
-IUSE=doc
-KEYWORDS=amd64 arm64 ppc ppc64 x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://exiftool.org/Image-ExifTool-12.08.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=82886fab7077a9ba1ab41f9bb25d1fcd
diff --git a/metadata/md5-cache/media-libs/exiftool-12.16 b/metadata/md5-cache/media-libs/exiftool-12.16
deleted file mode 100644
index df9bbfc62a97..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-12.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=7
-HOMEPAGE=https://exiftool.org/
-INHERIT=perl-module
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://exiftool.org/Image-ExifTool-12.16.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=b96fe5a5c1fed6a4c20e18de050bcc1c
diff --git a/metadata/md5-cache/media-libs/netpbm-10.70.00 b/metadata/md5-cache/media-libs/netpbm-10.70.00
index f4ac6f57f235..6e903689c6b3 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.70.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.70.00
@@ -4,6 +4,7 @@ DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs
 DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
 EAPI=7
 HOMEPAGE=http://netpbm.sourceforge.net/
+INHERIT=multilib toolchain-funcs
 IUSE=doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,4 +12,4 @@ RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-lib
 SLOT=0
 SRC_URI=mirror://gentoo/netpbm-10.70.00.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=07d21b1518e01c84a527bd8436fd34bf
+_md5_=1989778ddb535d76464d7dd49679a344
diff --git a/metadata/md5-cache/media-libs/netpbm-10.76.00 b/metadata/md5-cache/media-libs/netpbm-10.76.00
index a35a1c4a112b..23a692d9c8ec 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.76.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.76.00
@@ -4,12 +4,12 @@ DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs
 DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
 EAPI=7
 HOMEPAGE=http://netpbm.sourceforge.net/
-INHERIT=toolchain-funcs
+INHERIT=multilib toolchain-funcs
 IUSE=doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://gentoo/netpbm-10.76.00.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=6516f91df18320c550ddd5a3fc385a05
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=31efbe08087f80c4b1834904ec3fae31
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.8-r1 b/metadata/md5-cache/net-dialup/ppp-2.4.8-r1
index e27b46144c46..5c204a43b2c7 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.8-r1
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.8-r1
@@ -1,9 +1,10 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare setup
 DEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( sys-libs/pam ) gtk? ( x11-libs/gtk+:2 ) dev-libs/openssl:0=
 DESCRIPTION=Point-to-Point Protocol (PPP)
 EAPI=7
 HOMEPAGE=https://ppp.samba.org/
-INHERIT=linux-info multilib pam toolchain-funcs
+INHERIT=linux-info pam toolchain-funcs
 IUSE=activefilter atm dhcp eap-tls gtk ipv6 pam radius kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
@@ -12,4 +13,4 @@ RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? (
 SLOT=0/2.4.8
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.8.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.8-patches-02.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=0cfd1c74861c24e1c5c662ea7e728d44
+_md5_=1110b3c2097e7d75d5574de43f8bb0a6
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.9-r2 b/metadata/md5-cache/net-dialup/ppp-2.4.9-r2
index b11762473cda..95ad6137b996 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.9-r2
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.9-r2
@@ -1,9 +1,10 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare setup
 DEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( sys-libs/pam ) gtk? ( x11-libs/gtk+:2 ) dev-libs/openssl:0=
 DESCRIPTION=Point-to-Point Protocol (PPP)
 EAPI=7
 HOMEPAGE=https://ppp.samba.org/
-INHERIT=linux-info multilib pam toolchain-funcs
+INHERIT=linux-info pam toolchain-funcs
 IUSE=activefilter atm dhcp +eap-tls gtk ipv6 pam radius kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
@@ -12,4 +13,4 @@ RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? (
 SLOT=0/2.4.9
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.9-patches-02.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=fb1fd117b36b9efce2ba3abd57a1c915
+_md5_=66c2282794c56d57ce2d38e389c1f018
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r1 b/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r1
index b0e1df905e3e..04ec223b59ac 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r1
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r1
@@ -4,7 +4,7 @@ DEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbin
 DESCRIPTION=NFS client and server daemons
 EAPI=7
 HOMEPAGE=http://linux-nfs.org/
-INHERIT=autotools flag-o-matic linux-info multilib systemd
+INHERIT=autotools linux-info systemd
 IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=kerberos? ( nfsv4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.5.3.tar.bz2
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=dafd8b5ccda53302a4efaf38a4425735
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=02aacd6772270be47e2809ba86ce04fa
diff --git a/metadata/md5-cache/net-misc/kea-1.8.1-r1 b/metadata/md5-cache/net-misc/kea-1.8.1-r1
index 2536dc17ba7d..4f27a6b442e4 100644
--- a/metadata/md5-cache/net-misc/kea-1.8.1-r1
+++ b/metadata/md5-cache/net-misc/kea-1.8.1-r1
@@ -10,5 +10,4 @@ LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) acct-group/dhcp acct-user/dhcp
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.8.1.tar.gz ftp://ftp.isc.org/isc/kea/1.8.1/kea-1.8.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=901663e0e867297107bb3371afe881aa
+_md5_=22c6736b99027641b4a6b1423ff1fec3
diff --git a/metadata/md5-cache/net-misc/kea-1.8.2 b/metadata/md5-cache/net-misc/kea-1.8.2
index c67ad8eea04f..aa48bd6278fd 100644
--- a/metadata/md5-cache/net-misc/kea-1.8.2
+++ b/metadata/md5-cache/net-misc/kea-1.8.2
@@ -10,5 +10,4 @@ LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) acct-group/dhcp acct-user/dhcp
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.8.2.tar.gz ftp://ftp.isc.org/isc/kea/1.8.2/kea-1.8.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=901663e0e867297107bb3371afe881aa
+_md5_=22c6736b99027641b4a6b1423ff1fec3
diff --git a/metadata/md5-cache/net-misc/kea-1.9.4 b/metadata/md5-cache/net-misc/kea-1.9.4
index 89b0ba9f79a9..59b9253af7a4 100644
--- a/metadata/md5-cache/net-misc/kea-1.9.4
+++ b/metadata/md5-cache/net-misc/kea-1.9.4
@@ -10,5 +10,4 @@ LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) acct-group/dhcp acct-user/dhcp
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/kea/1.9.4/kea-1.9.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a24100e84e88c4385e66e8f983ee8aff
+_md5_=e8a4facd9f9eb71aa9bcf866cc70950f
diff --git a/metadata/md5-cache/net-misc/kea-9999 b/metadata/md5-cache/net-misc/kea-9999
index 5f6720316686..457fb320958f 100644
--- a/metadata/md5-cache/net-misc/kea-9999
+++ b/metadata/md5-cache/net-misc/kea-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-c
 DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
 EAPI=7
 HOMEPAGE=http://www.isc.org/kea/
-INHERIT=toolchain-funcs autotools git-r3
+INHERIT=autotools git-r3
 IUSE=mysql +openssl postgres samples
 LICENSE=ISC BSD SSLeay GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) acct-group/dhcp acct-user/dhcp
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=a24100e84e88c4385e66e8f983ee8aff
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=e8a4facd9f9eb71aa9bcf866cc70950f
diff --git a/metadata/md5-cache/net-misc/openssh-8.4_p1-r3 b/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
index cee9075649da..dd6abb602763 100644
--- a/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
@@ -4,7 +4,7 @@ DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ld
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.4p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.4p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-AES-CTR-14.22.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-PeakTput-14.22.diff ) X509? ( https://roumenpetrov.info/openssh/x509-12.6/openssh-8.4p1+x509-12.6.diff.gz )
 _eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=0ba920789b3e68bdcd6170ece93e49da
+_md5_=754cb399249e929af66c3c24f55ef861
diff --git a/metadata/md5-cache/net-misc/openssh-8.5_p1 b/metadata/md5-cache/net-misc/openssh-8.5_p1
index b03ae21b08d4..8f7856d48af2 100644
--- a/metadata/md5-cache/net-misc/openssh-8.5_p1
+++ b/metadata/md5-cache/net-misc/openssh-8.5_p1
@@ -4,7 +4,7 @@ DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ld
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.5p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.5p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-DynWinNoneSwitch-15.1.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-AES-CTR-15.1.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-PeakTput-15.1.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.0/openssh-8.5p1+x509-13.0.diff.gz )
 _eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=f9e3b5679a39fbd77c790d2b4d78e72d
+_md5_=291da67842639a5e7c48e89b47a80c3f
diff --git a/metadata/md5-cache/net-misc/openssh-8.5_p1-r1 b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
index 9d5a169a66e5..bc460b56829b 100644
--- a/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
@@ -4,7 +4,7 @@ DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ld
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.5p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.5p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.0.1/openssh-8.5p1+x509-13.0.1.diff.gz )
 _eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=4e429c5153a995e28a110b140e7ae37d
+_md5_=ccb6cd5f757e7664deb141cec88382f1
diff --git a/metadata/md5-cache/net-misc/openssh-8.6_p1-r1 b/metadata/md5-cache/net-misc/openssh-8.6_p1-r1
index 2109e28627a1..eb4c186c8296 100644
--- a/metadata/md5-cache/net-misc/openssh-8.6_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-8.6_p1-r1
@@ -4,7 +4,7 @@ DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ld
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.6p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.6p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.1/openssh-8.6p1+x509-13.1.diff.gz )
 _eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=240730d480d21e2a9a41cdfaab922e59
+_md5_=36ba590b2d6af46720c2809af8b0e730
diff --git a/metadata/md5-cache/sci-biology/samtools-0.1.20-r4 b/metadata/md5-cache/sci-biology/samtools-0.1.20-r4
index f1c2f9df0717..b4d2aa14c4f8 100644
--- a/metadata/md5-cache/sci-biology/samtools-0.1.20-r4
+++ b/metadata/md5-cache/sci-biology/samtools-0.1.20-r4
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0= dev-lang/perl
 DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
 EAPI=7
 HOMEPAGE=http://samtools.sourceforge.net/
+INHERIT=multilib toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0= dev-lang/perl
 SLOT=0.1-legacy
 SRC_URI=https://github.com/samtools/samtools/archive/0.1.20.tar.gz -> samtools-0.1.20.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6fc0899be7ff3370d9a4ac561b8f39a8
+_md5_=89941c8b8d527ccc386063a3f533ef77
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3-r2 b/metadata/md5-cache/sci-libs/superlu-4.3-r2
index 8357ae7e9e14..1a3feab65e5d 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3-r2
+++ b/metadata/md5-cache/sci-libs/superlu-4.3-r2
@@ -4,7 +4,7 @@ DEPEND=virtual/blas virtual/fortran
 DESCRIPTION=Sparse LU factorization library
 EAPI=7
 HOMEPAGE=https://crd-legacy.lbl.gov/~xiaoye/SuperLU/
-INHERIT=autotools fortran-2 toolchain-funcs
+INHERIT=autotools fortran-2 multilib toolchain-funcs
 IUSE=doc examples test
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	fortran-2	b4796813ccda91c9c0d3463fc90aa969
-_md5_=2bcb307df418eaae6c8bce2a3c06aafe
+_md5_=10b466aab236fad2107276eaf4595483
diff --git a/metadata/md5-cache/sci-libs/ufconfig-3.7.1 b/metadata/md5-cache/sci-libs/ufconfig-3.7.1
index 4a98cfbaaa2b..f2271c7d7489 100644
--- a/metadata/md5-cache/sci-libs/ufconfig-3.7.1
+++ b/metadata/md5-cache/sci-libs/ufconfig-3.7.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Common configuration scripts for the SuiteSparse libraries
 EAPI=7
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/UFconfig
+INHERIT=multilib toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-3.7.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e68d453c811e7866aab07c850018eaaf
+_md5_=0310815ba1ad71d1c856ccd442216d60
diff --git a/metadata/md5-cache/sys-apps/acl-2.2.53-r1 b/metadata/md5-cache/sys-apps/acl-2.2.53-r1
index ad64ad6c263e..7533abc26058 100644
--- a/metadata/md5-cache/sys-apps/acl-2.2.53-r1
+++ b/metadata/md5-cache/sys-apps/acl-2.2.53-r1
@@ -1,10 +1,10 @@
 BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=access control list utilities, libraries and headers
+DESCRIPTION=Access control list utilities, libraries, and headers
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/acl
-INHERIT=flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+INHERIT=flag-o-matic libtool multilib-minimal usr-ldscript
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://nongnu/acl/acl-2.2.53.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=ec0931880abfa107b0a6d4b879ac7195
+_md5_=07d695ff87675f01c9cb7ba063fbc786
diff --git a/metadata/md5-cache/sys-apps/acl-2.3.0 b/metadata/md5-cache/sys-apps/acl-2.3.0
index 0f7b11ed6d27..57107e553eef 100644
--- a/metadata/md5-cache/sys-apps/acl-2.3.0
+++ b/metadata/md5-cache/sys-apps/acl-2.3.0
@@ -1,10 +1,10 @@
 BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=access control list utilities, libraries and headers
+DESCRIPTION=Access control list utilities, libraries, and headers
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/acl
-INHERIT=flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+INHERIT=flag-o-matic libtool multilib-minimal usr-ldscript
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://nongnu/acl/acl-2.3.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=6719fb8dfb612f92ff03b24a1e8110b2
+_md5_=a660f1024e4f6973654b0a1eb5011bd1
diff --git a/metadata/md5-cache/sys-apps/acl-2.3.1 b/metadata/md5-cache/sys-apps/acl-2.3.1
index b245b19e790b..330bca297476 100644
--- a/metadata/md5-cache/sys-apps/acl-2.3.1
+++ b/metadata/md5-cache/sys-apps/acl-2.3.1
@@ -1,10 +1,10 @@
 BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=access control list utilities, libraries and headers
+DESCRIPTION=Access control list utilities, libraries, and headers
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/acl
-INHERIT=flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+INHERIT=flag-o-matic libtool multilib-minimal usr-ldscript
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://nongnu/acl/acl-2.3.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=6719fb8dfb612f92ff03b24a1e8110b2
+_md5_=a660f1024e4f6973654b0a1eb5011bd1
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.31-r1 b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
index 416a4952cfcb..7a4fecf5802c 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.31-r1
+++ b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
@@ -3,7 +3,7 @@ DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-lib
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/coreutils/
-INHERIT=eutils flag-o-matic python-any-r1 toolchain-funcs
+INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=GPL-3
@@ -11,5 +11,5 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.31.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=ef455739306669e52d3d0afe8d6a7f28
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=7390274f5faf8aff9fcc6e089b43e853
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.32-r1 b/metadata/md5-cache/sys-apps/coreutils-8.32-r1
index 38abee22497e..07d50cd820df 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.32-r1
+++ b/metadata/md5-cache/sys-apps/coreutils-8.32-r1
@@ -4,7 +4,7 @@ DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-lib
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/coreutils/
-INHERIT=eutils flag-o-matic python-any-r1 toolchain-funcs
+INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=GPL-3
@@ -12,5 +12,5 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.32.tar.xz !vanilla? ( mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=6f0be89c821b5b6bc4f5e2f9a4793518
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=41662d295687ea3411a2f80fd7d47ad2
diff --git a/metadata/md5-cache/sys-apps/cracklib-words-2.9.6 b/metadata/md5-cache/sys-apps/cracklib-words-2.9.6
index fda9630d50a2..f1132c2f0c3e 100644
--- a/metadata/md5-cache/sys-apps/cracklib-words-2.9.6
+++ b/metadata/md5-cache/sys-apps/cracklib-words-2.9.6
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst
-DESCRIPTION=large set of crack/cracklib dictionaries
-EAPI=5
+DESCRIPTION=Large set of crack/cracklib dictionaries
+EAPI=7
 HOMEPAGE=https://github.com/cracklib/cracklib/
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-words-2.9.6.gz
-_md5_=d1159ba0e10ff0bbda4ac70d40d02afd
+_md5_=0da6ba3b270625877c6de0072a9dcf7e
diff --git a/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1 b/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
index ae4a4e5787b2..9881fdff2c6e 100644
--- a/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
+++ b/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
@@ -3,7 +3,7 @@ DEPEND=sys-fs/xfsprogs
 DESCRIPTION=XFS data management API library
 EAPI=5
 HOMEPAGE=https://xfs.wiki.kernel.org/
-INHERIT=epatch toolchain-funcs ltprune multilib multilib-minimal usr-ldscript
+INHERIT=epatch ltprune multilib multilib-minimal usr-ldscript
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=sys-fs/xfsprogs
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/dmapi-2.2.12.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/dmapi-2.2.12.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=0e4f9aef1568373ff03a8cb0d3368270
+_md5_=38b20ab421d1fa8798f80140eeaf0c47
diff --git a/metadata/md5-cache/sys-apps/dmidecode-3.3 b/metadata/md5-cache/sys-apps/dmidecode-3.3
index 56cd25ef6c93..a659a3371558 100644
--- a/metadata/md5-cache/sys-apps/dmidecode-3.3
+++ b/metadata/md5-cache/sys-apps/dmidecode-3.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile postinst prepare
 DESCRIPTION=DMI (Desktop Management Interface) table related utilities
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/dmidecode/
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=selinux
 KEYWORDS=-* ~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 x86 ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-dmidecode )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/dmidecode/dmidecode-3.3.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=02e13404c559f8c1d24467a2287230e8
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=80626051ee56b26244d73d31c5cf4827
diff --git a/metadata/md5-cache/sys-apps/duc-1.4.1-r1 b/metadata/md5-cache/sys-apps/duc-1.4.1-r1
deleted file mode 100644
index e345c9defe83..000000000000
--- a/metadata/md5-cache/sys-apps/duc-1.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet ) 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=A library and suite of tools for inspecting disk usage
-EAPI=5
-HOMEPAGE=https://github.com/zevv/duc
-INHERIT=autotools
-IUSE=cairo gui -leveldb ncurses -sqlite +tokyocabinet X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gui? ( X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/pango[X] ) !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite:3 ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=^^ ( tokyocabinet leveldb sqlite ) X? ( cairo gui )
-SLOT=0
-SRC_URI=https://github.com/zevv/duc/releases/download/1.4.1/duc-1.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=a69beff1edf8e7ce3f138b4c900eb4f6
diff --git a/metadata/md5-cache/sys-apps/findutils-4.8.0 b/metadata/md5-cache/sys-apps/findutils-4.8.0
index a6f69bf24f3e..e88fa9ecfbaf 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.8.0
+++ b/metadata/md5-cache/sys-apps/findutils-4.8.0
@@ -4,7 +4,7 @@ DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) test? ( || ( de
 DESCRIPTION=GNU utilities for finding files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/findutils/
-INHERIT=flag-o-matic toolchain-funcs python-any-r1
+INHERIT=flag-o-matic python-any-r1
 IUSE=nls selinux static test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.8.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=26693b86cb34f96b60d887a617e7e2b4
+_md5_=7385114ecc85c20311293334ff46f3a3
diff --git a/metadata/md5-cache/sys-apps/gawk-4.2.1-r1 b/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
index 4f9c6b991e7d..8f67d3598e41 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
+++ b/metadata/md5-cache/sys-apps/gawk-4.2.1-r1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:
 DESCRIPTION=GNU awk pattern-matching language
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
-INHERIT=toolchain-funcs multilib
+INHERIT=toolchain-funcs
 IUSE=mpfr nls readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.2.1.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=4b897b1a385864476e14a6ce0b22dfba
+_md5_=874118cd4b71abf04b1d605e70f7aebd
diff --git a/metadata/md5-cache/sys-apps/gawk-5.0.1 b/metadata/md5-cache/sys-apps/gawk-5.0.1
index da80a1125ba8..2ead74551808 100644
--- a/metadata/md5-cache/sys-apps/gawk-5.0.1
+++ b/metadata/md5-cache/sys-apps/gawk-5.0.1
@@ -4,7 +4,7 @@ DEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:
 DESCRIPTION=GNU awk pattern-matching language
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
-INHERIT=toolchain-funcs multilib
+INHERIT=toolchain-funcs
 IUSE=mpfr nls readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-5.0.1.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=ca7164b4932db98cd998cf0f76808cbf
+_md5_=803cddcbb07ded1ef544ee8e71559f65
diff --git a/metadata/md5-cache/sys-apps/gawk-5.1.0 b/metadata/md5-cache/sys-apps/gawk-5.1.0
index 87e0ae6bdb3a..fcb4c1c6b116 100644
--- a/metadata/md5-cache/sys-apps/gawk-5.1.0
+++ b/metadata/md5-cache/sys-apps/gawk-5.1.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:
 DESCRIPTION=GNU awk pattern-matching language
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
-INHERIT=toolchain-funcs multilib
+INHERIT=toolchain-funcs
 IUSE=mpfr nls readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-5.1.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=74245dfc8e65454198ca9bfb3fcc4985
+_md5_=731ff2ff829184b2b04c69c353107789
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.6.1 b/metadata/md5-cache/sys-apps/keyutils-1.6.1
index b3c571e75909..0200da52aa79 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.6.1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.6.1
@@ -3,12 +3,12 @@ DEPEND=!prefix? ( >=sys-kernel/linux-headers-2.6.11 )
 DESCRIPTION=Linux Key Management Utilities
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git
-INHERIT=multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
+INHERIT=toolchain-funcs linux-info multilib-minimal usr-ldscript
 IUSE=static static-libs test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/1.9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=2926a88ba90926b666259aed7d585582
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=1c23239984417af5839e60f59a5a171a
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.6.3 b/metadata/md5-cache/sys-apps/keyutils-1.6.3
index 1c2d813f0af1..7b841bb1e0de 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.6.3
+++ b/metadata/md5-cache/sys-apps/keyutils-1.6.3
@@ -3,12 +3,12 @@ DEPEND=!prefix? ( >=sys-kernel/linux-headers-2.6.11 )
 DESCRIPTION=Linux Key Management Utilities
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git
-INHERIT=multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
+INHERIT=toolchain-funcs linux-info multilib-minimal usr-ldscript
 IUSE=static static-libs test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/1.9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=deee14579e574af5e0683ecb11bb891e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=a92756789828f3f6d04c82ea1920d8a7
diff --git a/metadata/md5-cache/sys-apps/lnxhc-1.2-r1 b/metadata/md5-cache/sys-apps/lnxhc-1.2-r1
index b99495b8335f..f08889f539b2 100644
--- a/metadata/md5-cache/sys-apps/lnxhc-1.2-r1
+++ b/metadata/md5-cache/sys-apps/lnxhc-1.2-r1
@@ -1,13 +1,11 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=-
 DEPEND=>=dev-lang/perl-5.8
 DESCRIPTION=Linux Health Checker
-EAPI=5
+EAPI=7
 HOMEPAGE=http://lnxhc.sourceforge.net
-INHERIT=epatch
 KEYWORDS=amd64 x86
 LICENSE=EPL-1.0
 RDEPEND=>=dev-lang/perl-5.8
 SLOT=0
 SRC_URI=mirror://sourceforge/lnxhc/lnxhc-1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=f3c831f65e007f6ffb130cf22c071696
+_md5_=50ad0fbc0c19ec44d2f3c58c4bd61274
diff --git a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3 b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
index 17f60f436460..8eb6184ad5e3 100644
--- a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
+++ b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
@@ -1,12 +1,12 @@
+BDEPEND=dev-lang/perl
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl
 DESCRIPTION=LSB version query program
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/lsb/
-INHERIT=epatch prefix
+INHERIT=prefix
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lsb/lsb-release-1.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=d7395a72fdca81c46f2488240ef62634
+_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=f8df6b9355039bba4848aef2bea65e72
diff --git a/metadata/md5-cache/sys-apps/man-pages-posix-2013a b/metadata/md5-cache/sys-apps/man-pages-posix-2013a
deleted file mode 100644
index 5959be516dd2..000000000000
--- a/metadata/md5-cache/sys-apps/man-pages-posix-2013a
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=POSIX man-pages (0p, 1p, 3p)
-EAPI=5
-HOMEPAGE=https://www.kernel.org/doc/man-pages/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=man-pages-posix-2013
-RDEPEND=virtual/man !<sys-apps/man-pages-3
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2013-a.tar.xz
-_md5_=3e4a60b451b326a0bc4b2dd239b6b073
diff --git a/metadata/md5-cache/sys-apps/man2html-1.6g b/metadata/md5-cache/sys-apps/man2html-1.6g
index f54a2e010a6c..54f1f5e2cc9f 100644
--- a/metadata/md5-cache/sys-apps/man2html-1.6g
+++ b/metadata/md5-cache/sys-apps/man2html-1.6g
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install
 DESCRIPTION=Standard commands to read man pages
-EAPI=5
+EAPI=7
 HOMEPAGE=http://primates.ximian.com/~flucifredi/man/
-INHERIT=epatch toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/man
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=71aa07f03df8bebd4dc64c52b44f4338
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=bb162e576a5c4312ac2950b72a4fd78c
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3 b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
deleted file mode 100644
index 9eb9013a8cbe..000000000000
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=powerful replacement for inetd
-EAPI=5
-HOMEPAGE=http://www.xinetd.org/ https://github.com/xinetd-org/xinetd
-INHERIT=epatch flag-o-matic systemd toolchain-funcs
-IUSE=perl rpc tcpd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=b1bb56410d0a0681021fa2cab4befa85
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1 b/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
index 234623083d6b..3a1dc615ed32 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.0-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
+BDEPEND=virtual/pkgconfig manpages? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 ) 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=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) test? ( dev-libs/check ) manpages? ( >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.4 )
+DEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) test? ( dev-libs/check )
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
 EAPI=7
 HOMEPAGE=https://pagure.io/SSSD/sssd
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.0.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=0db89cc75264ac43e22d8f5547e1cb23
+_md5_=67e1fef4aba09487dd1ad551d12fed45
diff --git a/metadata/md5-cache/sys-auth/sssd-2.3.1-r2 b/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
index 713d7b1761d0..12fee355f099 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
+++ b/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-fs/samba ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) >=sys-devel/autoconf-2.69-r5 doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) ) 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=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) ) 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=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-fs/samba ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= )
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SSSD/sssd/releases/download/sssd-2_3_1/sssd-2.3.1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=d851b21422ba9114482585a2be2b6d9b
+_md5_=01939c373a4a8568f3a27e130381a48c
diff --git a/metadata/md5-cache/sys-auth/sssd-2.4.2 b/metadata/md5-cache/sys-auth/sssd-2.4.2
index 70ab6f7a0604..72162fe26e15 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.4.2
+++ b/metadata/md5-cache/sys-auth/sssd-2.4.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-fs/samba ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= ) >=sys-devel/autoconf-2.69-r5 doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) ) 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=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper valgrind? ( dev-util/valgrind ) ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) ) 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=>=app-crypt/mit-krb5-1.10.3 app-crypt/p11-kit >=dev-libs/ding-libs-0.2 dev-libs/glib:2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=dev-libs/libpcre-8.30:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:0= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.7.4 >=net-nds/openldap-2.4.30[sasl] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) pac? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-fs/samba ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) systemd? ( dev-libs/jansson:0= net-libs/http-parser:0= net-misc/curl:0= )
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SSSD/sssd/releases/download/2.4.2/sssd-2.4.2.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=d8be37057b5f97af8069f0cc1bc8b1fa
+_md5_=bbe334f847221c962c2af292a53ad7a8
diff --git a/metadata/md5-cache/sys-block/smp_utils-0.99 b/metadata/md5-cache/sys-block/smp_utils-0.99
index bb83311c793d..8b5787d10dd0 100644
--- a/metadata/md5-cache/sys-block/smp_utils-0.99
+++ b/metadata/md5-cache/sys-block/smp_utils-0.99
@@ -1,13 +1,10 @@
-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
 DESCRIPTION=Utilities for SAS management protocol (SMP)
 EAPI=7
 HOMEPAGE=http://sg.danny.cz/sg/smp_utils.html
-INHERIT=autotools
 IUSE=static-libs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/smp_utils-0.99.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=83c4d9f12ba96e7e6209ae10b095d290
+_md5_=53f72a69125465b11f704713bb5696f5
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-16 b/metadata/md5-cache/sys-boot/efibootmgr-16
index f7b5c23c8817..e8347d123994 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-16
+++ b/metadata/md5-cache/sys-boot/efibootmgr-16
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
+DEPEND=sys-apps/pciutils >=sys-libs/efivar-25:= virtual/pkgconfig
 DESCRIPTION=User-space application to modify the EFI boot manager
 EAPI=6
 HOMEPAGE=https://github.com/rhinstaller/efibootmgr
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm arm64 ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/efibootmgr/releases/download/16/efibootmgr-16.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7c35c0ba12eddff7d199f2a510ab1a45
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=c975ce1b1876a9067cddf5d88b562cf4
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-17 b/metadata/md5-cache/sys-boot/efibootmgr-17
index d99604e07e48..c9247def7db6 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-17
+++ b/metadata/md5-cache/sys-boot/efibootmgr-17
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure prepare
 DEPEND=sys-apps/pciutils >=sys-libs/efivar-37:=
 DESCRIPTION=User-space application to modify the EFI boot manager
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/efibootmgr
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils >=sys-libs/efivar-37:=
 SLOT=0
 SRC_URI=https://github.com/rhboot/efibootmgr/archive/17.tar.gz -> efibootmgr-17.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e1e12e44050176f965ae7ede56ad0758
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=635cc77c0442213704d26be50b70679f
diff --git a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1 b/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1
index 020169e8cfb3..961aac99e79a 100644
--- a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1
+++ b/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=An MBR that can handle BIOS-based boot on GPT
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20080704173538/http://aybabtu.com/mbr-gpt/
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/mbr-gpt_0.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=978ab18cc6eb94020830759bb25d32e5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=ef5613808b92fc5213dd8df6858a8b1d
diff --git a/metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1 b/metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1
index 9f5011698a6a..8756bf8cb01e 100644
--- a/metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1
+++ b/metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1
@@ -2,9 +2,7 @@ DEFINED_PHASES=install
 DESCRIPTION=wrapper for autoconf to manage multiple autoconf versions
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1f16f06ddeac0c3fff5ae7f91b98f39e
+_md5_=bd31cd75a9854d071b7d2e055d1c3b14
diff --git a/metadata/md5-cache/sys-devel/autoconf-wrapper-15 b/metadata/md5-cache/sys-devel/autoconf-wrapper-15
index f2a7e7152154..a5d7a5a3547a 100644
--- a/metadata/md5-cache/sys-devel/autoconf-wrapper-15
+++ b/metadata/md5-cache/sys-devel/autoconf-wrapper-15
@@ -5,5 +5,4 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=69c5fcb9b1fa7bab23ce8e89651d7c44
+_md5_=75d88728ad2d91c114c6618b1d349ce1
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r2 b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
deleted file mode 100644
index 6bcaa2537929..000000000000
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-devel/flex virtual/yacc
-DESCRIPTION=Handy console-based calculator utility
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/bc/bc.html
-INHERIT=epatch flag-o-matic toolchain-funcs
-IUSE=libedit readline static
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
-SLOT=0
-SRC_URI=https://alpha.gnu.org/gnu/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=21e995ce89007499ca0879cd3dbd7f62
diff --git a/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4 b/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
index e0fa42426a1e..b3cffab06e63 100644
--- a/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
+++ b/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=create and edit the partition table of a disk partitioned in Atari format
-EAPI=5
+DEFINED_PHASES=compile install
+DESCRIPTION=Create and edit the partition table of a disk partitioned in Atari format
+EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/a/atari-fdisk.html
-INHERIT=versionator toolchain-funcs epatch
+INHERIT=toolchain-funcs
 KEYWORDS=-* ~m68k x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/atari-fdisk/atari-fdisk_0.7.1-5.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	epatch	9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=d0f7103177ad024063892d20eba9a19f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=82722d5cb0ccdd3ce8b3c70b73bdf760
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r1
index abdb406ab193..c9f8fa974e4d 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r1
@@ -4,7 +4,7 @@ DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[st
 DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-INHERIT=autotools linux-info libtool
+INHERIT=autotools linux-info
 IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.4.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=620131383f43f316b12f1dfb99d5f059
+_md5_=0e9f59f73fa40fcbb21f9534026b60e1
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.5-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.5-r1
index be55de737f49..fc5b136bf698 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.5-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.5-r1
@@ -4,7 +4,7 @@ DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[st
 DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-INHERIT=autotools linux-info libtool
+INHERIT=autotools linux-info
 IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.5.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=3ebd54af2e5fa7dbac9ca98de56b0354
+_md5_=ec81ff686ac9e02f3400b62e75d35cd1
diff --git a/metadata/md5-cache/sys-fs/dmg2img-1.6.7 b/metadata/md5-cache/sys-fs/dmg2img-1.6.7
deleted file mode 100644
index 2ae630e0c639..000000000000
--- a/metadata/md5-cache/sys-fs/dmg2img-1.6.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl:0= app-arch/bzip2 sys-libs/zlib sys-apps/sed
-DESCRIPTION=Converts Apple DMG files to standard HFS+ images
-EAPI=5
-HOMEPAGE=http://vu1tur.eu.org/tools
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= app-arch/bzip2 sys-libs/zlib
-SLOT=0
-SRC_URI=http://vu1tur.eu.org/tools/dmg2img-1.6.7.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d73153b8e8cc20d9d812363770196f55
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.1 b/metadata/md5-cache/sys-fs/dosfstools-4.1
deleted file mode 100644
index e4628fd4b9d1..000000000000
--- a/metadata/md5-cache/sys-fs/dosfstools-4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=udev? ( virtual/libudev ) test? ( app-editors/vim-core ) udev? ( virtual/pkgconfig )
-DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
-EAPI=5
-HOMEPAGE=https://github.com/dosfstools/dosfstools
-INHERIT=toolchain-funcs flag-o-matic
-IUSE=compat test +udev
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=udev? ( virtual/libudev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v4.1/dosfstools-4.1.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=f9519a830fa2dca992980efcb38772a3
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.2 b/metadata/md5-cache/sys-fs/dosfstools-4.2
index cc396adfe1f9..2f19aef65764 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-4.2
+++ b/metadata/md5-cache/sys-fs/dosfstools-4.2
@@ -1,14 +1,12 @@
-BDEPEND=test? ( app-editors/vim-core ) iconv? ( virtual/libiconv )
+BDEPEND=iconv? ( virtual/libiconv ) test? ( app-editors/vim-core )
 DEFINED_PHASES=configure install
 DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
 EAPI=7
 HOMEPAGE=https://github.com/dosfstools/dosfstools
-INHERIT=toolchain-funcs flag-o-matic
 IUSE=compat +iconv test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=e0c5200bc40d760e7fa6d9038f74ae81
+_md5_=2a3feb6b9c460e7f1c078b57daa65b8f
diff --git a/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620 b/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
deleted file mode 100644
index 93b31efbb914..000000000000
--- a/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip dev-db/go-etcd:= dev-libs/go-fuse:= >=dev-lang/go-1.10
-DESCRIPTION=Use etcd as a FUSE filesystem
-EAPI=5
-HOMEPAGE=https://github.com/xetorthio/etcd-fs
-INHERIT=golang-base
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/xetorthio/etcd-fs/archive/395eacbaebccccc5f03ed11dc887ea2f1af300a0.zip -> etcd-fs-0_p20140620.zip
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d
-_md5_=7896484e2b2e53b6a8cd1a4f307e4cec
diff --git a/metadata/md5-cache/sys-fs/growpart-0.0.1 b/metadata/md5-cache/sys-fs/growpart-0.0.1
deleted file mode 100644
index 8634ddae5f09..000000000000
--- a/metadata/md5-cache/sys-fs/growpart-0.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A script that can grow your rootfs on first boot
-EAPI=5
-HOMEPAGE=http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=sys-apps/gptfdisk
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/growpart/growpart-0.0.1.gz
-_md5_=a19d1d09ba8b8e028010d64db22a9a0d
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6 b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
deleted file mode 100644
index 3ecb5ab7a901..000000000000
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux sys-kernel/linux-headers
-DESCRIPTION=A New Implementation of a Log-structured File System for Linux
-EAPI=5
-HOMEPAGE=http://nilfs.sourceforge.net/
-INHERIT=multilib linux-info
-IUSE=static-libs kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=sys-libs/e2fsprogs-libs sys-apps/util-linux
-SLOT=0
-SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.1.6.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=1d10f89ad7aa7c698cf39fe52fbd49ac
diff --git a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8 b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
index ad8eb8a7334c..7d53324d56e8 100644
--- a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
+++ b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
@@ -1,13 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-apps/util-linux nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEPEND=sys-apps/util-linux nls? ( sys-devel/gettext virtual/libintl )
 DESCRIPTION=Library for accessing and manipulating reiserfs partitions
-EAPI=5
+EAPI=7
 HOMEPAGE=http://reiserfs.linux.kiev.ua/
-INHERIT=epatch flag-o-matic libtool ltprune
+INHERIT=flag-o-matic libtool
 IUSE=debug examples nls static-libs
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://reiserfs.linux.kiev.ua/snapshots/progsreiserfs-0.3.1-rc8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	libtool	f143db5a74ccd9ca28c1234deffede96
-_md5_=57e0c9a712a4ad67e47d10c0436de4f2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	libtool	f143db5a74ccd9ca28c1234deffede96
+_md5_=2305f5361350c7e7bef8c246ef1b55a6
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
deleted file mode 100644
index ca289dd92a3d..000000000000
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-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
-DESCRIPTION=Reiserfs Utilities
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiserfs/
-INHERIT=autotools flag-o-matic usr-ldscript
-IUSE=static-libs split-usr
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-3.6.27.tar.xz https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.27/reiserfsprogs-3.6.27.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=771c94f5223497b75ba0940078a809af
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1
new file mode 100644
index 000000000000..4bb305c0ffe1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1
@@ -0,0 +1,15 @@
+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-apps/util-linux
+DESCRIPTION=Reiserfs Utilities
+EAPI=7
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiserfs/
+INHERIT=autotools flag-o-matic usr-ldscript
+IUSE=static-libs split-usr
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-linux
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-3.6.27.tar.xz https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.27/reiserfsprogs-3.6.27.tar.xz
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=a4a9eb0c96ec7d3c012884cb5dd14875
diff --git a/metadata/md5-cache/sys-fs/static-dev-0.1 b/metadata/md5-cache/sys-fs/static-dev-0.1-r1
index 9f555e41a6c6..0f9b5931e4ae 100644
--- a/metadata/md5-cache/sys-fs/static-dev-0.1
+++ b/metadata/md5-cache/sys-fs/static-dev-0.1-r1
@@ -1,10 +1,9 @@
 DEFINED_PHASES=postinst pretend
-DEPEND=sys-apps/makedev
 DESCRIPTION=A skeleton, statically managed /dev
-EAPI=5
+EAPI=7
 HOMEPAGE=https://bugs.gentoo.org/107875
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/makedev
 SLOT=0
-_md5_=cfb2b10fcc2e8685d33fba64044e6292
+_md5_=7f2c80a6ca415553a6b0cabbbb8b55aa
diff --git a/metadata/md5-cache/sys-fs/sysfsutils-2.1.0 b/metadata/md5-cache/sys-fs/sysfsutils-2.1.0
index 37354d021385..92e4fdb62df0 100644
--- a/metadata/md5-cache/sys-fs/sysfsutils-2.1.0
+++ b/metadata/md5-cache/sys-fs/sysfsutils-2.1.0
@@ -3,11 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=System Utilities Based on Sysfs
 EAPI=5
 HOMEPAGE=http://linux-diag.sourceforge.net/Sysfsutils.html
-INHERIT=autotools toolchain-funcs usr-ldscript
+INHERIT=autotools usr-ldscript
 IUSE=static-libs split-usr
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-diag/sysfsutils-2.1.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=23db28bd49d98328c5c4de0cf09c1510
+_md5_=efcabb5739241506bffa8db656ce4ec7
diff --git a/metadata/md5-cache/sys-fs/sysfsutils-2.1.1 b/metadata/md5-cache/sys-fs/sysfsutils-2.1.1
index 754d253a5363..f6dad6282812 100644
--- a/metadata/md5-cache/sys-fs/sysfsutils-2.1.1
+++ b/metadata/md5-cache/sys-fs/sysfsutils-2.1.1
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=System Utilities Based on Sysfs
 EAPI=7
 HOMEPAGE=http://linux-diag.sourceforge.net/Sysfsutils.html https://github.com/linux-ras/sysfsutils
-INHERIT=autotools toolchain-funcs usr-ldscript
+INHERIT=autotools usr-ldscript
 IUSE=static-libs split-usr
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/linux-ras/sysfsutils/archive/v2.1.1.tar.gz -> sysfsutils-2.1.1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=e31f910d0dfc2ef4d1fa70805c536819
+_md5_=fc217c0c6b9dac58de0908e514ff4ebf
diff --git a/metadata/md5-cache/sys-fs/udftools-2.1 b/metadata/md5-cache/sys-fs/udftools-2.1
index f6048e92f480..a35b9e160ef2 100644
--- a/metadata/md5-cache/sys-fs/udftools-2.1
+++ b/metadata/md5-cache/sys-fs/udftools-2.1
@@ -3,11 +3,9 @@ DEPEND=sys-libs/readline:0= virtual/pkgconfig
 DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
 EAPI=6
 HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-INHERIT=flag-o-matic
 KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/2.1/udftools-2.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=3bcca7b02c9424dc46e35bc29cce6da0
+_md5_=6d6e1924725d814aae6e813c543270c4
diff --git a/metadata/md5-cache/sys-fs/udftools-2.2 b/metadata/md5-cache/sys-fs/udftools-2.2
index 1e76200ff985..a49fb3584ada 100644
--- a/metadata/md5-cache/sys-fs/udftools-2.2
+++ b/metadata/md5-cache/sys-fs/udftools-2.2
@@ -4,11 +4,9 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
 EAPI=7
 HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-INHERIT=flag-o-matic
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/2.2/udftools-2.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=73e86837d959b598e3bda33c392feec1
+_md5_=935705cf47f46cf59131fff2ec46c7d0
diff --git a/metadata/md5-cache/sys-fs/udftools-2.3 b/metadata/md5-cache/sys-fs/udftools-2.3
index f0b985e595a0..a8c26ad66c04 100644
--- a/metadata/md5-cache/sys-fs/udftools-2.3
+++ b/metadata/md5-cache/sys-fs/udftools-2.3
@@ -4,11 +4,9 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
 EAPI=7
 HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-INHERIT=flag-o-matic
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/2.3/udftools-2.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=96cd705901426768aa3e22384321d085
+_md5_=c433cecd9f82cf9e108de6911a4ebf42
diff --git a/metadata/md5-cache/sys-fs/vzquota-3.1 b/metadata/md5-cache/sys-fs/vzquota-3.1
index 3c3468bfd5d5..dbf283233f96 100644
--- a/metadata/md5-cache/sys-fs/vzquota-3.1
+++ b/metadata/md5-cache/sys-fs/vzquota-3.1
@@ -1,10 +1,11 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=OpenVZ VPS disk quota utility
-EAPI=5
+EAPI=7
 HOMEPAGE=http://openvz.org/download/utils/vzquota/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ia64 ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzquota/3.1/src/vzquota-3.1.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1b41f97ea3f146aa46bc14843f8f319c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=5c352c1fa3ad49c842be160e98101ae5
diff --git a/metadata/md5-cache/sys-fs/xfsdump-3.1.9 b/metadata/md5-cache/sys-fs/xfsdump-3.1.9
index a4c829002fa6..917ab2b25b51 100644
--- a/metadata/md5-cache/sys-fs/xfsdump-3.1.9
+++ b/metadata/md5-cache/sys-fs/xfsdump-3.1.9
@@ -1,14 +1,15 @@
+BDEPEND=ncurses? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure prepare
 DEPEND=>=sys-apps/attr-2.4.19 sys-apps/dmapi sys-apps/util-linux sys-fs/e2fsprogs >=sys-fs/xfsprogs-3.2.0 ncurses? ( sys-libs/ncurses:0= ) nls? ( sys-devel/gettext elibc_uclibc? ( dev-libs/libintl ) )
 DESCRIPTION=xfs dump/restore utilities
 EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
-INHERIT=multilib flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=ncurses nls
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/attr-2.4.19 sys-apps/dmapi sys-apps/util-linux sys-fs/e2fsprogs >=sys-fs/xfsprogs-3.2.0 ncurses? ( sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/xfsdump-3.1.9.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=782ef0f9e2f101889f161b4464ee2375
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=080f850511cdb5a3bb71f05917dacab1
diff --git a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4 b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
index 8695ba2884ed..83097e0d9fa9 100644
--- a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
+++ b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Compatibility package for old termcap-based programs
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/terminfo/
-INHERIT=epatch multilib toolchain-funcs multilib-minimal
+INHERIT=toolchain-funcs multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc sparc x86
 LICENSE=GPL-2 LGPL-2 BSD
 SLOT=0
-SRC_URI=http://www.catb.org/~esr/terminfo/termtypes.tc.gz mirror://gentoo/termcap-2.0.8.tar.bz2 mirror://gentoo/termcap-2.0.8-patches-2.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=32c334e23f14483f3ede3078de3d022e
+SRC_URI=http://www.catb.org/~esr/terminfo/termtypes.tc.gz mirror://gentoo/termcap-2.0.8.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-libs/libtermcap-compat/termcap-2.0.8-patches-2.tar.xz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=ab00c06abac1a814d160d9db13715b6d
diff --git a/metadata/md5-cache/sys-libs/pwdb-0.62-r1 b/metadata/md5-cache/sys-libs/pwdb-0.62-r1
index 9ed2ffb7a24d..566e4f0b5475 100644
--- a/metadata/md5-cache/sys-libs/pwdb-0.62-r1
+++ b/metadata/md5-cache/sys-libs/pwdb-0.62-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=selinux? ( sys-libs/libselinux ) net-libs/libnsl:0= net-libs/libtirpc
+DEPEND=selinux? ( sys-libs/libselinux ) net-libs/libnsl:0= net-libs/libtirpc virtual/pkgconfig
 DESCRIPTION=Password database
 EAPI=5
 HOMEPAGE=https://packages.gentoo.org/package/sys-libs/pwdb
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/pwdb-0.62.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=ce456341ecd4ac56ed73ac96f5a51fed
+_md5_=6bb63b779e495e010ef08a83586b2a06
diff --git a/metadata/md5-cache/sys-libs/readline-8.0_p4 b/metadata/md5-cache/sys-libs/readline-8.0_p4
index f74e23dd0366..ca1b56ac8996 100644
--- a/metadata/md5-cache/sys-libs/readline-8.0_p4
+++ b/metadata/md5-cache/sys-libs/readline-8.0_p4
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x86
 DESCRIPTION=Another cute console display library
 EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-INHERIT=flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
 IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x8
 SLOT=0/8
 SRC_URI=mirror://gnu/readline/readline-8.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-001 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-002 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-003 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-004 mirror://gnu/readline/readline-8.0-patches/readline80-001 mirror://gnu/readline/readline-8.0-patches/readline80-002 mirror://gnu/readline/readline-8.0-patches/readline80-003 mirror://gnu/readline/readline-8.0-patches/readline80-004
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=249513cbfa36a9df4d1d8a40fed1c629
+_md5_=cd0b331e96c58540dd0dd8dfd1f76a4a
diff --git a/metadata/md5-cache/sys-libs/readline-8.1 b/metadata/md5-cache/sys-libs/readline-8.1
index 7935d4e28d3d..a3235ba5bfda 100644
--- a/metadata/md5-cache/sys-libs/readline-8.1
+++ b/metadata/md5-cache/sys-libs/readline-8.1
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x86
 DESCRIPTION=Another cute console display library
 EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-INHERIT=flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
 IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x8
 SLOT=0/8
 SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=d64dffbf5359088c4faec832dfa338c6
+_md5_=2c4ac29359fe4733adcdeb36f10b3ae2
diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r8 b/metadata/md5-cache/sys-process/daemontools-0.76-r8
index 1ac2b2bc834d..07e7346c7d21 100644
--- a/metadata/md5-cache/sys-process/daemontools-0.76-r8
+++ b/metadata/md5-cache/sys-process/daemontools-0.76-r8
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Collection of tools for managing UNIX services
 EAPI=7
 HOMEPAGE=http://cr.yp.to/daemontools.html
-INHERIT=flag-o-matic qmail
+INHERIT=fixheadtails flag-o-matic qmail
 IUSE=selinux static
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !app-doc/daemontools-man
 SLOT=0
 SRC_URI=http://cr.yp.to/daemontools/daemontools-0.76.tar.gz http://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fixheadtails	1721997ed44d035654efe12da50797ef	qmail	b35b6b912311fb36e8fff96eaeb6bcf7
-_md5_=25e024a7febb992ff66df697bd99ff5a
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	qmail	b35b6b912311fb36e8fff96eaeb6bcf7
+_md5_=3406d2b256954fdc105bdcb5801c3f3b
diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.10 b/metadata/md5-cache/sys-process/daemontools-encore-1.10
deleted file mode 100644
index 01617c8f6aaa..000000000000
--- a/metadata/md5-cache/sys-process/daemontools-encore-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Collection of tools for managing UNIX services
-EAPI=5
-HOMEPAGE=http://untroubled.org/daemontools-encore/
-INHERIT=flag-o-matic qmail
-IUSE=selinux static
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man
-SLOT=0
-SRC_URI=http://untroubled.org/daemontools-encore/daemontools-encore-1.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fixheadtails	1721997ed44d035654efe12da50797ef	qmail	b35b6b912311fb36e8fff96eaeb6bcf7
-_md5_=5b363e8e7d6c03c5ab94bbbeb91e5e74
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.12 b/metadata/md5-cache/sys-process/numactl-2.0.12
index b8aace166d0a..e4e3226b39d4 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.12
+++ b/metadata/md5-cache/sys-process/numactl-2.0.12
@@ -3,11 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Utilities and libraries for NUMA systems
 EAPI=6
 HOMEPAGE=https://github.com/numactl/numactl
-INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
+INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 -arm arm64 ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.12/numactl-2.0.12.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=4d3f2aa3dc3864815e9eb712479990af
+_md5_=3c83d5c5c8e6d0267114e43a421e381a
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.13 b/metadata/md5-cache/sys-process/numactl-2.0.13
index 0f815a6fefaa..695b90c505f0 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.13
+++ b/metadata/md5-cache/sys-process/numactl-2.0.13
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utilities and libraries for NUMA systems
 EAPI=7
 HOMEPAGE=https://github.com/numactl/numactl
-INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
+INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.13/numactl-2.0.13.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=dde9e4c1b477a528870ab00edf19905b
+_md5_=63239d80d122c7b8614fec3ff887f4e5
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.14 b/metadata/md5-cache/sys-process/numactl-2.0.14
index d02e65205dab..cc359eb8148c 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.14
+++ b/metadata/md5-cache/sys-process/numactl-2.0.14
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utilities and libraries for NUMA systems
 EAPI=7
 HOMEPAGE=https://github.com/numactl/numactl
-INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
+INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 -arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.14/numactl-2.0.14.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=5ceb43034461f3ab703a4d4734db87b8
+_md5_=f284271bfc6f9681ef9121726e2be12f
diff --git a/metadata/md5-cache/sys-process/numactl-9999 b/metadata/md5-cache/sys-process/numactl-9999
index f8e87a6f9d65..11f4b3664c8e 100644
--- a/metadata/md5-cache/sys-process/numactl-9999
+++ b/metadata/md5-cache/sys-process/numactl-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Utilities and libraries for NUMA systems
 EAPI=7
 HOMEPAGE=https://github.com/numactl/numactl
-INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal git-r3
+INHERIT=autotools flag-o-matic multilib-minimal git-r3
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=a66f16abce3658891971052d489d3c1b
+_md5_=57e0b1544e02bb395db2199e4f6404ef
diff --git a/metadata/md5-cache/sys-process/procps-3.3.16-r2 b/metadata/md5-cache/sys-process/procps-3.3.16-r2
index 3e420ea5829e..cb4b9853ef49 100644
--- a/metadata/md5-cache/sys-process/procps-3.3.16-r2
+++ b/metadata/md5-cache/sys-process/procps-3.3.16-r2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install test
 DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( virtual/pkgconfig ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DESCRIPTION=standard informational utilities and process-handling tools
+DESCRIPTION=Standard informational utilities and process-handling tools
 EAPI=7
 HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
-INHERIT=toolchain-funcs flag-o-matic multilib-minimal usr-ldscript
+INHERIT=flag-o-matic multilib-minimal usr-ldscript
 IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.16.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=78e2f25ac4900bbc7b8ee87295080400
+_md5_=e8a4f2bc321ef17d65c6225991a0d081
diff --git a/metadata/md5-cache/sys-process/procps-3.3.16-r3 b/metadata/md5-cache/sys-process/procps-3.3.16-r3
index f6a492773aa2..884fccb9268c 100644
--- a/metadata/md5-cache/sys-process/procps-3.3.16-r3
+++ b/metadata/md5-cache/sys-process/procps-3.3.16-r3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install test
 DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( virtual/pkgconfig ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DESCRIPTION=standard informational utilities and process-handling tools
+DESCRIPTION=Standard informational utilities and process-handling tools
 EAPI=7
 HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
-INHERIT=toolchain-funcs flag-o-matic multilib-minimal usr-ldscript
+INHERIT=flag-o-matic multilib-minimal usr-ldscript
 IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.16.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=eecc539d2abfdfdb0ec91fd6be183dd4
+_md5_=0d10ac4a87305e7b7f5db38d720c4322
diff --git a/metadata/md5-cache/sys-process/procps-3.3.17 b/metadata/md5-cache/sys-process/procps-3.3.17
index b4680562c66b..314f02e96230 100644
--- a/metadata/md5-cache/sys-process/procps-3.3.17
+++ b/metadata/md5-cache/sys-process/procps-3.3.17
@@ -1,10 +1,10 @@
 BDEPEND=elogind? ( virtual/pkgconfig ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
 DEFINED_PHASES=compile configure install test
 DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd[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=standard informational utilities and process-handling tools
+DESCRIPTION=Standard informational utilities and process-handling tools
 EAPI=7
 HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
-INHERIT=flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
+INHERIT=flag-o-matic multilib-minimal usr-ldscript
 IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.17.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=3dc37416f4dfbdc5ee80c41deee745d1
+_md5_=27cfb8c6e49cd553ce8bb2327813ce47
diff --git a/metadata/md5-cache/sys-process/runit-2.1.2 b/metadata/md5-cache/sys-process/runit-2.1.2
deleted file mode 100644
index 95e6e71c80c2..000000000000
--- a/metadata/md5-cache/sys-process/runit-2.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DESCRIPTION=A UNIX init scheme with service supervision
-EAPI=5
-HOMEPAGE=http://smarden.org/runit/
-INHERIT=toolchain-funcs flag-o-matic versionator
-IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://smarden.org/runit/runit-2.1.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=1dd4933b47911f14a667d096ecf1200b
diff --git a/metadata/md5-cache/virtual/acl-0 b/metadata/md5-cache/virtual/acl-0
deleted file mode 100644
index 840bee66dcdc..000000000000
--- a/metadata/md5-cache/virtual/acl-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for acl support (sys/acl.h)
-EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-RDEPEND=kernel_linux? ( sys-apps/acl )
-SLOT=0
-_md5_=c7a038ab9139e745a9779afcc51669ca
diff --git a/metadata/md5-cache/virtual/acl-0-r1 b/metadata/md5-cache/virtual/acl-0-r1
deleted file mode 100644
index 9e01d1876034..000000000000
--- a/metadata/md5-cache/virtual/acl-0-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for acl support (sys/acl.h)
-EAPI=5
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-RDEPEND=kernel_linux? ( sys-apps/acl[static-libs?] )
-SLOT=0
-_md5_=bb1b4ed82312875a40018cd1413f2551
diff --git a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2 b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
index 7d9329e3c5c0..df17fe358143 100644
--- a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
+++ b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+
-EAPI=5
+EAPI=7
 KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( =dev-libs/leveldb-1.20 =dev-libs/leveldb-1.18-r2 =dev-libs/leveldb-1.18 =dev-libs/leveldb-1.17 =dev-libs/leveldb-1.15.0-r1 )
 SLOT=0
-_md5_=8e12c2826a8ba19f4f71a4722cd88fbc
+_md5_=8fa9b0cc88d50d9580dc1fa9c06523df
diff --git a/metadata/md5-cache/virtual/checkpassword-0 b/metadata/md5-cache/virtual/checkpassword-0
index 5f7e103a2fa1..0630f6882793 100644
--- a/metadata/md5-cache/virtual/checkpassword-0
+++ b/metadata/md5-cache/virtual/checkpassword-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for checkpassword compatible applications
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 RDEPEND=|| ( net-mail/checkpassword net-mail/checkpassword-pam net-mail/cmd5checkpw net-mail/vpopmail mail-mta/qmail-ldap )
 SLOT=0
-_md5_=c347318aea94e4c6ca12eb82eeafabf9
+_md5_=58aa64435fc226f9245f9b29bd0d2bb0
diff --git a/metadata/md5-cache/virtual/daemontools-0 b/metadata/md5-cache/virtual/daemontools-0
index d97d1910d9cb..c4799cf89236 100644
--- a/metadata/md5-cache/virtual/daemontools-0
+++ b/metadata/md5-cache/virtual/daemontools-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for daemontools
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 RDEPEND=|| ( sys-process/daemontools sys-process/daemontools-encore )
 SLOT=0
-_md5_=f9ab7d679e84415d61f780ec7c2ffab6
+_md5_=5d3727378e1888225f2f175b94da8fd3
diff --git a/metadata/md5-cache/virtual/dev-manager-0-r2 b/metadata/md5-cache/virtual/dev-manager-0-r2
index 20181f72f7e6..3fe1c25d7599 100644
--- a/metadata/md5-cache/virtual/dev-manager-0-r2
+++ b/metadata/md5-cache/virtual/dev-manager-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the device filesystem manager
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 RDEPEND=|| ( virtual/udev sys-apps/busybox[mdev] sys-fs/static-dev )
 SLOT=0
-_md5_=d1a827668115675c9bba557a5c7e8789
+_md5_=35b2e29192fc86278840265335a0fd73
diff --git a/metadata/md5-cache/virtual/fam-0-r1 b/metadata/md5-cache/virtual/fam-0-r1
index 917239dca861..6fb20411c29d 100644
--- a/metadata/md5-cache/virtual/fam-0-r1
+++ b/metadata/md5-cache/virtual/fam-0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=A virtual package to choose between gamin and fam
-EAPI=5
+EAPI=7
 INHERIT=multilib-build
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=app-admin/gamin-0.1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-admin/fam-2.7.0-r6[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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=e2de061d0e279696d2ce98e687632256
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
+_md5_=aacb2e41db6365c1622fc04110b622c4
diff --git a/metadata/md5-cache/virtual/gsasl-2 b/metadata/md5-cache/virtual/gsasl-2
index 41fb33233adc..c890743764ff 100644
--- a/metadata/md5-cache/virtual/gsasl-2
+++ b/metadata/md5-cache/virtual/gsasl-2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU SASL library
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 SLOT=0
-_md5_=55448908873e6d2afddb345f31f54928
+_md5_=216aa61ac8f49669570c990e9d577ed6
diff --git a/metadata/md5-cache/virtual/httpd-basic-0-r2 b/metadata/md5-cache/virtual/httpd-basic-0-r2
index 71b37e328026..d095e809cdd0 100644
--- a/metadata/md5-cache/virtual/httpd-basic-0-r2
+++ b/metadata/md5-cache/virtual/httpd-basic-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for static HTML-enabled webservers
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=bf44d307d0513ca0a1b7c4b96d40a071
+_md5_=28949a0e8b4a9f5909ebc6bf4c6214d9
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r1 b/metadata/md5-cache/virtual/httpd-cgi-0-r1
deleted file mode 100644
index 2210cfaf5f58..000000000000
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CGI-enabled webservers
-EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
-SLOT=0
-_md5_=ae705fc8af56fd50be83d183b6b497f1
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r2 b/metadata/md5-cache/virtual/httpd-cgi-0-r2
index 8c20c0a8f3c3..dabfed048e76 100644
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r2
+++ b/metadata/md5-cache/virtual/httpd-cgi-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CGI-enabled webservers
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=1bc460780bd9736e1f950af1bd82ce3c
+_md5_=f8a24e8752b60019d74d43ae74b75e2c
diff --git a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1 b/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
index 8b47cdc35883..ddc28300fb65 100644
--- a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
+++ b/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for FastCGI-enabled webservers
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( www-apache/mod_fcgid www-servers/lighttpd www-servers/bozohttpd www-servers/nginx www-servers/resin www-servers/cherokee )
 SLOT=0
-_md5_=7e743b77237b8659310fead68c42a3bc
+_md5_=84efea829289a8cf6c7b38132a36b1b0
diff --git a/metadata/md5-cache/virtual/inetd-0 b/metadata/md5-cache/virtual/inetd-0
index 84c5b02588f1..0977333ffeb1 100644
--- a/metadata/md5-cache/virtual/inetd-0
+++ b/metadata/md5-cache/virtual/inetd-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the internet super-server daemon
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 RDEPEND=|| ( sys-apps/xinetd sys-apps/netkit-base sys-apps/ucspi-tcp net-misc/ipsvd )
 SLOT=0
-_md5_=2343cba72d1cd21593c5744781440236
+_md5_=b7fd8c58e756a5ab8a7882020bbd772a
diff --git a/metadata/md5-cache/virtual/krb5-0-r1 b/metadata/md5-cache/virtual/krb5-0-r1
index 7f0fbb9c83de..0d527038f439 100644
--- a/metadata/md5-cache/virtual/krb5-0-r1
+++ b/metadata/md5-cache/virtual/krb5-0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Kerberos V implementation
-EAPI=5
+EAPI=7
 INHERIT=multilib-build
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 RDEPEND=|| ( >=app-crypt/mit-krb5-1.12.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-crypt/heimdal-1.5.3-r2[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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=4716924fa4b1a3952d30c3c7479c1e84
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
+_md5_=efc9b54ccf8f750da8dc6c900e2a677b
diff --git a/metadata/md5-cache/virtual/libiconv-0 b/metadata/md5-cache/virtual/libiconv-0
index 00c48b5e2428..920b50eb11ec 100644
--- a/metadata/md5-cache/virtual/libiconv-0
+++ b/metadata/md5-cache/virtual/libiconv-0
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU conversion library
-EAPI=5
+EAPI=7
 IUSE=elibc_glibc elibc_uclibc elibc_musl
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libiconv ) ) )
 SLOT=0
-_md5_=eed0c2232780131dbf305af82d702161
+_md5_=4068a2b89508506e5397be594b8efa97
diff --git a/metadata/md5-cache/virtual/libiconv-0-r1 b/metadata/md5-cache/virtual/libiconv-0-r1
index 34dad355c312..64166941ecab 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r1
+++ b/metadata/md5-cache/virtual/libiconv-0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU conversion library
-EAPI=5
+EAPI=7
 INHERIT=multilib-build
 IUSE=elibc_glibc elibc_uclibc elibc_musl elibc_mintlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=b4746ea251eb8c84722c4971cb6c6811
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
+_md5_=042241162edcdc4226cd1ab57d8d9416
diff --git a/metadata/md5-cache/virtual/libintl-0 b/metadata/md5-cache/virtual/libintl-0
index b4168d7e673c..a6fe4054059d 100644
--- a/metadata/md5-cache/virtual/libintl-0
+++ b/metadata/md5-cache/virtual/libintl-0
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
-EAPI=5
+EAPI=7
 IUSE=elibc_glibc elibc_uclibc
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( sys-devel/gettext ) ) )
 SLOT=0
-_md5_=2bfeb6e2c5ed26c3dde8f12fbe6eabc7
+_md5_=0784045b9637db7a62c03f12645e9f71
diff --git a/metadata/md5-cache/virtual/libintl-0-r1 b/metadata/md5-cache/virtual/libintl-0-r1
index 4f108085d444..40498a9177c4 100644
--- a/metadata/md5-cache/virtual/libintl-0-r1
+++ b/metadata/md5-cache/virtual/libintl-0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
-EAPI=5
+EAPI=7
 INHERIT=multilib-build
 IUSE=elibc_glibc elibc_uclibc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[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_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=3dd136f0c549a25bdd8d8448975092e0
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
+_md5_=ac090a3a49aca1fa5292b84bd0fec7f3
diff --git a/metadata/md5-cache/virtual/libudev-215-r1 b/metadata/md5-cache/virtual/libudev-215-r1
index d83a250b94ad..251d52e27a13 100644
--- a/metadata/md5-cache/virtual/libudev-215-r1
+++ b/metadata/md5-cache/virtual/libudev-215-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libudev providers
-EAPI=5
+EAPI=7
 INHERIT=multilib-build
 IUSE=static-libs systemd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 RDEPEND=!systemd? ( || ( >=sys-fs/eudev-1.3:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] >=sys-fs/udev-208-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] ) ) systemd? ( >=sys-apps/systemd-212-r5:0/2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=systemd? ( !static-libs )
 SLOT=0/1
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=5983576b436c775b63eb041046aa1fa8
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
+_md5_=0d1aff56f89177a0a28c9ecfe463a562
diff --git a/metadata/md5-cache/virtual/libudev-232-r1 b/metadata/md5-cache/virtual/libudev-232-r1
index 8fcb0effeafe..7c7f7b3887fa 100644
--- a/metadata/md5-cache/virtual/libudev-232-r1
+++ b/metadata/md5-cache/virtual/libudev-232-r1
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 RDEPEND=!systemd? ( >=sys-fs/udev-232:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( >=sys-apps/systemd-232:0/2[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/1
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=5c16f6fbee7946dcd411074365108448
+_md5_=70e166d3b0750848f0d99d471febedd0
diff --git a/metadata/md5-cache/virtual/libudev-232-r2 b/metadata/md5-cache/virtual/libudev-232-r2
index 8f0dc76610e0..127f14ef2971 100644
--- a/metadata/md5-cache/virtual/libudev-232-r2
+++ b/metadata/md5-cache/virtual/libudev-232-r2
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 RDEPEND=!systemd? ( || ( >=sys-fs/eudev-3.2.9:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/udev-232:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( >=sys-apps/systemd-232:0/2[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/1
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=6355e2a6ee01534d73a8ec3cc66bae83
+_md5_=d5c6b2542951fc02a0dfe594ff981e5c
diff --git a/metadata/md5-cache/virtual/libudev-232-r3 b/metadata/md5-cache/virtual/libudev-232-r3
index a174d9394e81..82b2dc935706 100644
--- a/metadata/md5-cache/virtual/libudev-232-r3
+++ b/metadata/md5-cache/virtual/libudev-232-r3
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 RDEPEND=!systemd? ( || ( >=sys-fs/eudev-3.2.9:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] >=sys-fs/udev-232:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] ) ) systemd? ( >=sys-apps/systemd-232:0/2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
 SLOT=0/1
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=31d2aa1f114004304f812516292497d7
+_md5_=863dc0ddb7079efac13bed84a6ddae33
diff --git a/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8 b/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8
index ff9d53d5abaf..677d523521d8 100644
--- a/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8
+++ b/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual Package installing the Header files for DVB
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=>=sys-kernel/linux-headers-3.7
 SLOT=0
-_md5_=aee6bb926b24697090b7d58ce22451da
+_md5_=3ce041eecc8c3e67b93a34311b1099b5
diff --git a/metadata/md5-cache/virtual/mda-0 b/metadata/md5-cache/virtual/mda-0
index ca74fe17f617..bc81afe734c8 100644
--- a/metadata/md5-cache/virtual/mda-0
+++ b/metadata/md5-cache/virtual/mda-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Delivery Agents
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 RDEPEND=|| ( mail-filter/procmail mail-filter/maildrop mail-mta/postfix mail-mta/courier mail-mta/mini-qmail mail-mta/netqmail mail-mta/qmail-ldap mail-mta/citadel )
 SLOT=0
-_md5_=7449d66bd5a6bce87a02e555b48145d0
+_md5_=94caa171c13941ab6172ace255132ff1
diff --git a/metadata/md5-cache/virtual/mpi-2.0-r3 b/metadata/md5-cache/virtual/mpi-2.0-r3
index 119ba7d9fe4a..627649f8da6e 100644
--- a/metadata/md5-cache/virtual/mpi-2.0-r3
+++ b/metadata/md5-cache/virtual/mpi-2.0-r3
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Passing Interface (MPI) v2.0 implementation
-EAPI=5
+EAPI=7
 IUSE=cxx fortran romio threads
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( sys-cluster/openmpi[cxx?,fortran?,romio?,threads?] sys-cluster/mpich[cxx?,fortran?,romio?,threads?] sys-cluster/mpich2[cxx?,fortran?,romio?,threads?] sys-cluster/native-mpi )
 SLOT=0
-_md5_=dd636aa076974c290728d7c434ba0453
+_md5_=f02c4905920b53cacfaeac209f2184ca
diff --git a/metadata/md5-cache/virtual/mpi-2.0-r4 b/metadata/md5-cache/virtual/mpi-2.0-r4
index e7ba92166a1c..5a3b2085c2a1 100644
--- a/metadata/md5-cache/virtual/mpi-2.0-r4
+++ b/metadata/md5-cache/virtual/mpi-2.0-r4
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Passing Interface (MPI) v2.0 implementation
-EAPI=6
+EAPI=7
 INHERIT=multilib-build
 IUSE=cxx fortran romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-cluster/openmpi-1.10.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] >=sys-cluster/mpich-3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/mpich2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/nullmpi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx(-)?,fortran(-)?,romio(-)?,threads(-)?] sys-cluster/native-mpi )
 SLOT=0
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=86200432a67f8d83d56b4a28a0b73f03
+_md5_=4814e5e9c980ff703f5ccf46c5279eaa
diff --git a/metadata/md5-cache/virtual/mpi-2.0-r5 b/metadata/md5-cache/virtual/mpi-2.0-r5
index 6f6c4bba6c0e..6f2f600a69c6 100644
--- a/metadata/md5-cache/virtual/mpi-2.0-r5
+++ b/metadata/md5-cache/virtual/mpi-2.0-r5
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Passing Interface (MPI) v2.0 implementation
-EAPI=6
+EAPI=7
 INHERIT=multilib-build
 IUSE=cxx fortran romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-cluster/openmpi-1.10.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads(+)?] >=sys-cluster/mpich-3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/mpich2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/nullmpi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx(-)?,fortran(-)?,romio(-)?,threads(-)?] sys-cluster/native-mpi )
 SLOT=0
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5
-_md5_=02b38dce4feacf67fd6126e0b428f976
+_md5_=c1ecf3ad75e99d1ff44fd4db43bf05c1
diff --git a/metadata/md5-cache/virtual/perl6-0 b/metadata/md5-cache/virtual/perl6-0
index f229f91d7e1e..142441f58a40 100644
--- a/metadata/md5-cache/virtual/perl6-0
+++ b/metadata/md5-cache/virtual/perl6-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Convenience virtual for perl6
-EAPI=5
+EAPI=7
 KEYWORDS=~amd64 ~x86
 RDEPEND=dev-lang/rakudo
 SLOT=0
-_md5_=3d1ea416ba10ee921f88cbe1a8aa6d1d
+_md5_=40e30cbf32c06802f281896e513d1548
diff --git a/metadata/md5-cache/virtual/service-manager-0 b/metadata/md5-cache/virtual/service-manager-0
index f9919562b48d..bdd823dfb9cf 100644
--- a/metadata/md5-cache/virtual/service-manager-0
+++ b/metadata/md5-cache/virtual/service-manager-0
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for various service managers
-EAPI=5
+EAPI=7
 IUSE=kernel_linux prefix
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=prefix? ( >=sys-apps/baselayout-prefix-2.2 ) !prefix? ( || ( sys-apps/openrc kernel_linux? ( || ( sys-apps/systemd sys-process/runit virtual/daemontools ) ) ) )
 SLOT=0
-_md5_=ba4a9cdc7f001f4c7532016a0715d408
+_md5_=e1dafa6e16b6c446cec2fd8d3efd41d3
diff --git a/metadata/md5-cache/virtual/service-manager-1 b/metadata/md5-cache/virtual/service-manager-1
index dd2eab85a656..1690c9528bc6 100644
--- a/metadata/md5-cache/virtual/service-manager-1
+++ b/metadata/md5-cache/virtual/service-manager-1
@@ -5,4 +5,4 @@ IUSE=kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=prefix-guest? ( >=sys-apps/baselayout-prefix-2.2 ) !prefix-guest? ( || ( sys-apps/openrc kernel_linux? ( || ( sys-apps/systemd sys-process/runit virtual/daemontools ) ) ) )
 SLOT=0
-_md5_=d0132f78173e1040d796c51ce1667b35
+_md5_=bbe0dd604348ff077578e6f6c406680a
diff --git a/metadata/md5-cache/virtual/skkserv-0 b/metadata/md5-cache/virtual/skkserv-0
index 995bbf02dade..78d9da552f1c 100644
--- a/metadata/md5-cache/virtual/skkserv-0
+++ b/metadata/md5-cache/virtual/skkserv-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for SKK server
-EAPI=5
+EAPI=7
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 RDEPEND=|| ( app-i18n/skkserv app-i18n/dbskkd-cdb app-i18n/mecab-skkserv app-i18n/multiskkserv app-i18n/yaskkserv )
 SLOT=0
-_md5_=0cf759ea4e9e8fdb0880d349f7deefd2
+_md5_=89ac26eea413752b686f64ae3e8a4c54
diff --git a/metadata/md5-cache/virtual/tex-base-0 b/metadata/md5-cache/virtual/tex-base-0
index 3e2a15d46b05..00986f383427 100644
--- a/metadata/md5-cache/virtual/tex-base-0
+++ b/metadata/md5-cache/virtual/tex-base-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for basic TeX binaries (tex, kpathsea)
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=app-text/texlive-core
 SLOT=0
-_md5_=c2bb98efffd08a61be385e29e02e09bf
+_md5_=71271995892eb5764972f277c99b2484
diff --git a/metadata/md5-cache/virtual/texi2dvi-0-r2 b/metadata/md5-cache/virtual/texi2dvi-0-r2
index 10176c0f9abe..49424a38afc3 100644
--- a/metadata/md5-cache/virtual/texi2dvi-0-r2
+++ b/metadata/md5-cache/virtual/texi2dvi-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for texi2dvi (and texi2pdf)
-EAPI=5
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=sys-apps/texinfo virtual/latex-base dev-texlive/texlive-plaingeneric
+RDEPEND=dev-texlive/texlive-plaingeneric sys-apps/texinfo virtual/latex-base
 SLOT=0
-_md5_=d4b546275ac240d45f8657542545937f
+_md5_=de07a35b4bf623a8a0319d463c0217ae
diff --git a/metadata/md5-cache/virtual/yacc-0 b/metadata/md5-cache/virtual/yacc-0
index b89da1ea6dcb..a6207341e996 100644
--- a/metadata/md5-cache/virtual/yacc-0
+++ b/metadata/md5-cache/virtual/yacc-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
-DESCRIPTION=virtual for yacc (yet another compiler compiler)
-EAPI=5
+DESCRIPTION=Virtual for yacc (yet another compiler compiler)
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-devel/bison dev-util/byacc dev-util/yacc )
 SLOT=0
-_md5_=7a4e36f41b6a6b5de9b1b928ff10f1ab
+_md5_=f948d009b7f54205b36a1601786857d8
diff --git a/metadata/md5-cache/www-servers/nginx-1.18.0-r2 b/metadata/md5-cache/www-servers/nginx-1.18.0-r2
index b5833665878f..d9cf516571fd 100644
--- a/metadata/md5-cache/www-servers/nginx-1.18.0-r2
+++ b/metadata/md5-cache/www-servers/nginx-1.18.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_lua? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=6
 HOMEPAGE=https://nginx.org
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.18.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/25f86f0bac1101b6512135eac5f93c49c63609e3.tar.gz -> ngx_brotli-25f86f0bac1101b6512135eac5f93c49c63609e3.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.4.3.tar.gz -> njs-0.4.3.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.4.3.tar.gz -> njs-0.4.3.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=4eb978573e1aa173b890962d3052c533
+_md5_=1e5faf4c42303ccf868e248d564abc5b