2021-04-16 11:35:49 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-16 11:35:55 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-16 11:35:55 +0000
commit: ac892e0d09ee032a2534e3940980f94e7d7e1248 (patch)
tree: f02f2625a63008620e8522118d2e29da141d2ded /metadata/md5-cache
parent: Merge updates from master (diff)
download: gentoo-ac892e0d09ee032a2534e3940980f94e7d7e1248.tar.gz
gentoo-ac892e0d09ee032a2534e3940980f94e7d7e1248.tar.bz2
gentoo-ac892e0d09ee032a2534e3940980f94e7d7e1248.zip
791 files changed, 2054 insertions, 2096 deletions
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1 b/metadata/md5-cache/app-accessibility/brltty-6.1
index 9680f4bef237..069e168789ce 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1
@@ -4,7 +4,7 @@ DEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
 EAPI=7
 HOMEPAGE=https://brltty.app/
-INHERIT=findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript autotools udev systemd python-r1 tmpfiles
+INHERIT=findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript autotools udev systemd python-r1 tmpfiles
 IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X elibc_FreeBSD java split-usr python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
@@ -12,5 +12,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_7 python_targets_python3_8 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.1.tar.xz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=f2cf503cc9b001f88512016d1a5d0f09
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=cd497dc478befd59f2d81affb6b37c75
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1 b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
index 27c830dce2e6..d5c0e7e41b2a 100644
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
+++ b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
 EAPI=6
 HOMEPAGE=http://www.aerospike.com
-INHERIT=eutils user
+INHERIT=user
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://www.aerospike.com/download/amc/4.0.19/artifact/linux -> aerospike-amc-community-4.0.19.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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=cb6bd652f1e1064756f1a2d1fc1f8d5c
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=0616fe3fb57de41fbc6d49edfc496225
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.6 b/metadata/md5-cache/app-admin/ansible-2.10.6
index c0def58f0a69..b1de2fdcfbcd 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.6
+++ b/metadata/md5-cache/app-admin/ansible-2.10.6
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/packaging-16.6[python_targets_python3_7(-)?,python_targets_p
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.6.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=f06faddd5302826ee7d149036e342d26
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=cb09210fa13cca1decb942ed34ab96f4
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.7 b/metadata/md5-cache/app-admin/ansible-2.10.7
index 31a2023777cd..85669e44a5f7 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.7
+++ b/metadata/md5-cache/app-admin/ansible-2.10.7
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/packaging-16.6[python_targets_python3_7(-)?,python_targets_p
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.7.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=474a0a83914b6dc6991c92b7ac1f36a3
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=1261ebab08eddae717dd58aff4606125
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index b778a1a021a0..60babc15a2df 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -4,7 +4,7 @@ DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[python_targets_python
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-INHERIT=distutils-r1 eutils git-r3
+INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-3
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=c8a280cd37a7ca3510213d44cf48f1cb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=71cd6146fa56cc96ae70b42cc415eab8
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.4 b/metadata/md5-cache/app-admin/ansible-base-2.10.4
index a2f893d3ce3b..ecdde0de4d58 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.4
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.4
@@ -4,7 +4,7 @@ DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_7(-
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=7ff66b6627cf368fa1605071bdbd5836
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=0f976f4d2feba2d7625b36f74dbe5e1d
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.5 b/metadata/md5-cache/app-admin/ansible-base-2.10.5
index 609afbd13980..9df247d60ace 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.5
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.5
@@ -4,7 +4,7 @@ DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_7(-
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.5.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=57a5a2fcf28c94f8186062199a9ee3bd
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=605dd7c4e6b02071b5343afa9fbcb73b
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.7 b/metadata/md5-cache/app-admin/ansible-base-2.10.7
index ef3890087e55..07be0ed740a0 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.7
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.7
@@ -4,7 +4,7 @@ DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_7(-
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.7.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=57a5a2fcf28c94f8186062199a9ee3bd
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=605dd7c4e6b02071b5343afa9fbcb73b
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.8 b/metadata/md5-cache/app-admin/ansible-base-2.10.8
index 9aee7cedc13d..114a80dbda14 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.8
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.8
@@ -4,7 +4,7 @@ DEPEND=!<app-admin/ansible-2.10 dev-python/setuptools[python_targets_python3_7(-
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.8.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=57a5a2fcf28c94f8186062199a9ee3bd
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=605dd7c4e6b02071b5343afa9fbcb73b
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
index b02609f5f1f7..11304b1597ac 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
@@ -4,7 +4,7 @@ DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-wh
 DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
-INHERIT=eutils systemd unpacker tmpfiles
+INHERIT=systemd unpacker tmpfiles
 IUSE=puppetdb selinux
 KEYWORDS=amd64
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.19.1-1focal_amd64.deb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=6e734e0e52df996e2f97d11088569e98
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=144d0472e3fa069ba612f16421eb1385
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.4.0 b/metadata/md5-cache/app-admin/puppet-agent-7.4.0
index 73bec44d76be..61838a5e7690 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.4.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.4.0
@@ -4,7 +4,7 @@ DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-wha
 DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
-INHERIT=eutils systemd unpacker tmpfiles
+INHERIT=systemd unpacker tmpfiles
 IUSE=puppetdb selinux
 KEYWORDS=amd64
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-wh
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.4.0-1focal_amd64.deb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=c6c2f934d06cb5949142b568a74bb609
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=ad00f7abcecc3f9c9e9586c721778e29
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.5.0 b/metadata/md5-cache/app-admin/puppet-agent-7.5.0
index 5cde2d38c5ae..5656f6ae1650 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.5.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.5.0
@@ -4,7 +4,7 @@ DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-wha
 DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
-INHERIT=eutils systemd unpacker tmpfiles
+INHERIT=systemd unpacker tmpfiles
 IUSE=puppetdb selinux
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-wh
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.5.0-1focal_amd64.deb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=8056d8a0af1d6f43039bd33964d0fc4d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=e9a49b89c8da003acf2beab840a9053d
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.4.2 b/metadata/md5-cache/app-admin/puppet-lint-2.4.2
index b68eb52f7928..5b112efdbd38 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.4.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.4.2
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=A linter for puppet DSL
 EAPI=7
 HOMEPAGE=http://puppet-lint.com/
-INHERIT=eutils ruby-fakegem
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.4.2.gem
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=7d7b070fb0ab82e55476e966a0edd13b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=6ad076030990dfbd9925c1c1433a6df8
diff --git a/metadata/md5-cache/app-backup/backup-manager-0.7.14 b/metadata/md5-cache/app-backup/backup-manager-0.7.14
index 01fa18bab7de..5402f255b9cf 100644
--- a/metadata/md5-cache/app-backup/backup-manager-0.7.14
+++ b/metadata/md5-cache/app-backup/backup-manager-0.7.14
@@ -3,12 +3,10 @@ DEPEND=dev-lang/perl:= sys-devel/gettext
 DESCRIPTION=Backup Manager is a command line backup tool for GNU/Linux
 EAPI=6
 HOMEPAGE=https://github.com/sukria/Backup-Manager
-INHERIT=eutils
 IUSE=s3
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:= sys-devel/gettext s3? ( dev-perl/Net-Amazon-S3 dev-perl/File-Slurp )
 SLOT=0
 SRC_URI=https://github.com/sukria/Backup-Manager/archive/0.7.14.tar.gz -> backup-manager-0.7.14.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
-_md5_=38bfb5c9597534cd1bc958142f30abb8
+_md5_=23e7a6028f0d5d2532bbaea5d0e976d8
diff --git a/metadata/md5-cache/app-backup/backup-manager-0.7.14-r1 b/metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
index 2090afc286f1..caec1032cbda 100644
--- a/metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
+++ b/metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
@@ -9,5 +9,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:= sys-devel/gettext s3? ( dev-perl/Net-Amazon-S3 dev-perl/File-Slurp )
 SLOT=0
 SRC_URI=https://github.com/sukria/Backup-Manager/archive/0.7.14.tar.gz -> backup-manager-0.7.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba443c1bdf69e626ba18edb09a5abd83
+_md5_=0533c3aa8ff2eb54767da5866a1032c9
diff --git a/metadata/md5-cache/app-backup/rdup-1.1.15 b/metadata/md5-cache/app-backup/rdup-1.1.15
index dfec33c6c929..1f4be913c613 100644
--- a/metadata/md5-cache/app-backup/rdup-1.1.15
+++ b/metadata/md5-cache/app-backup/rdup-1.1.15
@@ -3,7 +3,7 @@ DEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libpcre dev-libs/nettle test
 DESCRIPTION=Generate a file list suitable for full or incremental backups
 EAPI=6
 HOMEPAGE=https://github.com/miekg/rdup/releases
-INHERIT=eutils autotools
+INHERIT=autotools
 IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miekg/rdup/archive/1.1.15.tar.gz -> rdup-1.1.15.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_=1d4efc32d12e59580a453c67587383d8
+_md5_=4f785d5720c78c7af334a7e65b9c87c1
diff --git a/metadata/md5-cache/app-benchmarks/ioping-0.9 b/metadata/md5-cache/app-benchmarks/ioping-0.9
index 43831bc51f3a..b81f84682708 100644
--- a/metadata/md5-cache/app-benchmarks/ioping-0.9
+++ b/metadata/md5-cache/app-benchmarks/ioping-0.9
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Simple disk I/0 latency measuring tool
 EAPI=6
 HOMEPAGE=https://github.com/koct9i/ioping
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/koct9i/ioping/releases/download/v0.9/ioping-0.9.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
-_md5_=0c081aa425f885d7b3b5375786b50200
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=12403fca0654b14568e77800b7356cbc
diff --git a/metadata/md5-cache/app-benchmarks/ioping-1.0 b/metadata/md5-cache/app-benchmarks/ioping-1.0
index 48c339c2558f..48442945003b 100644
--- a/metadata/md5-cache/app-benchmarks/ioping-1.0
+++ b/metadata/md5-cache/app-benchmarks/ioping-1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Simple disk I/0 latency measuring tool
 EAPI=6
 HOMEPAGE=https://github.com/koct9i/ioping
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/koct9i/ioping/archive/v1.0.tar.gz -> ioping-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
-_md5_=a69d5bc9ade922d5cc43b01facd55db8
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=b20ec4bb5b3a00fad6ab32b10991d1bb
diff --git a/metadata/md5-cache/app-cdr/extract-xiso-2.7.1 b/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
index 4718a739021d..6c6c17871a20 100644
--- a/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
+++ b/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Tool for extracting and creating optimised Xbox ISO images
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/extract-xiso
-INHERIT=toolchain-funcs eutils
+INHERIT=epatch toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD-4
 SLOT=0
 SRC_URI=mirror://sourceforge/extract-xiso/extract-xiso-2.7.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
-_md5_=eb91a03c7161e1353733336c2b95a7d9
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=43c5dbab4daabbfcd7fcf1c8e076c2cd
diff --git a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2 b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
index bb616782acd9..508195fb78af 100644
--- a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
+++ b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
@@ -3,7 +3,7 @@ DEPEND=app-cdr/cdrdao app-cdr/cdrtools >=dev-libs/glib-2.4:2 >=gnome-base/libgla
 DESCRIPTION=Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2
 EAPI=6
 HOMEPAGE=http://graveman.tuxfamily.org/
-INHERIT=autotools eutils gnome2
+INHERIT=autotools gnome2
 IUSE=debug dvdr flac mp3 nls vorbis
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=app-cdr/cdrdao app-cdr/cdrtools >=dev-libs/glib-2.4:2 >=gnome-base/libgl
 SLOT=0
 SRC_URI=http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=1b314d8a5b2766a1fe93902e99771b66
+_md5_=4e9d9f5beea7dd79a8830e69e4d99618
diff --git a/metadata/md5-cache/app-crypt/hashcat-6.1.1 b/metadata/md5-cache/app-crypt/hashcat-6.1.1
index e22d816fad05..17e1689a2e39 100644
--- a/metadata/md5-cache/app-crypt/hashcat-6.1.1
+++ b/metadata/md5-cache/app-crypt/hashcat-6.1.1
@@ -3,12 +3,12 @@ DEPEND=app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drive
 DESCRIPTION=World's fastest and most advanced password recovery utility
 EAPI=7
 HOMEPAGE=https://github.com/hashcat/hashcat
-INHERIT=eutils pax-utils multilib
+INHERIT=pax-utils multilib
 IUSE=brain video_cards_nvidia
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 || ( dev-util/nvidia-cuda-toolkit virtual/opencl ) ) !video_cards_nvidia? ( virtual/opencl )
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v6.1.1.tar.gz -> hashcat-6.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dee11df394996c96dae683b146111ce9
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5df3d5574345e6221d890345ab802de5
diff --git a/metadata/md5-cache/app-crypt/hashcat-9999 b/metadata/md5-cache/app-crypt/hashcat-9999
index 2643db9a4de3..887c629068b6 100644
--- a/metadata/md5-cache/app-crypt/hashcat-9999
+++ b/metadata/md5-cache/app-crypt/hashcat-9999
@@ -4,11 +4,11 @@ DEPEND=app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drive
 DESCRIPTION=World's fastest and most advanced password recovery utility
 EAPI=7
 HOMEPAGE=https://github.com/hashcat/hashcat
-INHERIT=eutils pax-utils multilib git-r3
+INHERIT=pax-utils multilib git-r3
 IUSE=brain video_cards_nvidia
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64 || ( dev-util/nvidia-cuda-toolkit virtual/opencl ) ) !video_cards_nvidia? ( virtual/opencl )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=7bf70f832f9a6543f0023ceb1c29cb82
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=5df3d5574345e6221d890345ab802de5
diff --git a/metadata/md5-cache/app-crypt/sbsigntools-0.9.1-r1 b/metadata/md5-cache/app-crypt/sbsigntools-0.9.1-r1
index 7a7812acffb6..e5e7948cb999 100644
--- a/metadata/md5-cache/app-crypt/sbsigntools-0.9.1-r1
+++ b/metadata/md5-cache/app-crypt/sbsigntools-0.9.1-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/openssl:0= sys-apps/util-linux sys-apps/help2man sys-boot/gnu-ef
 DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=autotools toolchain-funcs
 KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-3 LGPL-3 LGPL-2.1 CC0-1.0
 RDEPEND=dev-libs/openssl:0= sys-apps/util-linux
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/snapshot/sbsigntools-0.9.1.tar.gz https://dev.gentoo.org/~tamiko/distfiles/sbsigntool-0.8-ccan.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_=e95deade7e5e0b826296833a8ac98e10
+_md5_=0f53996742ee2532034cd2ac3722efdb
diff --git a/metadata/md5-cache/app-crypt/sbsigntools-0.9.2 b/metadata/md5-cache/app-crypt/sbsigntools-0.9.2
index 4afda8204198..6251204904ee 100644
--- a/metadata/md5-cache/app-crypt/sbsigntools-0.9.2
+++ b/metadata/md5-cache/app-crypt/sbsigntools-0.9.2
@@ -4,11 +4,11 @@ DEPEND=dev-libs/openssl:0= sys-apps/util-linux sys-apps/help2man sys-boot/gnu-ef
 DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
 EAPI=7
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=autotools toolchain-funcs
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3 LGPL-3 LGPL-2.1 CC0-1.0
 RDEPEND=dev-libs/openssl:0= sys-apps/util-linux
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/snapshot/sbsigntools-0.9.2.tar.gz https://dev.gentoo.org/~tamiko/distfiles/sbsigntool-0.8-ccan.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f4ae52e8627302871021122c5a9e20ee
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=86c1b9187de7a4ddecfcef1b362c8ac4
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.1 b/metadata/md5-cache/app-dicts/wordnet-3.1
index fc5b276c473f..7b8ebcd8163b 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.1
+++ b/metadata/md5-cache/app-dicts/wordnet-3.1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0= dev-lang/tk:0= sys-devel/gnuconfig >=app-portage/elt-patc
 DESCRIPTION=A lexical database for the English language
 EAPI=6
 HOMEPAGE=https://wordnet.princeton.edu/
-INHERIT=autotools eutils flag-o-matic
+INHERIT=autotools flag-o-matic
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Princeton
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
 SLOT=0
 SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2 http://wordnetcode.princeton.edu/wn3.1.dict.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=d23d191e8e0391805bf84798bc2697d5
+_md5_=b62fd047d333cbe32d7a61ddbd48884e
diff --git a/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1 b/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
index 7ecc8cf2b705..68612d70b0fd 100644
--- a/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
+++ b/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
@@ -2,10 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Linux Kernel in a Nutshell: A Desktop Quick Reference
 EAPI=6
 HOMEPAGE=http://www.kroah.com/lkn/
-INHERIT=eutils
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=CC-BY-SA-2.5
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/gregkh/lkn/lkn_xml.tar.bz2
-_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
-_md5_=e7b00fdba1df9817086d1091c56cb5e9
+_md5_=ca2a639d49dffc1861f1883580cde3c4
diff --git a/metadata/md5-cache/app-editors/fte-20110708-r1 b/metadata/md5-cache/app-editors/fte-20110708-r1
index 8c727f6b6f95..5b479c86781d 100644
--- a/metadata/md5-cache/app-editors/fte-20110708-r1
+++ b/metadata/md5-cache/app-editors/fte-20110708-r1
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX1
 DESCRIPTION=Lightweight text-mode editor
 EAPI=6
 HOMEPAGE=http://fte.sourceforge.net
-INHERIT=eutils toolchain-funcs vcs-clean
+INHERIT=toolchain-funcs vcs-clean
 IUSE=gpm slang X
 KEYWORDS=~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fte/fte-20110708-src.zip mirror://sourceforge/fte/fte-20110708-common.zip
-_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
-_md5_=693991fcf774712b86ba04a2bbc3139f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5b1d4e89813ffeb4af1d695d2c545ccb
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
index 2184c6494a1e..6da94f4f7ded 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
@@ -3,12 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for Twitter
 EAPI=6
 HOMEPAGE=http://twmode.sourceforge.net/
-INHERIT=elisp eutils
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-2.0.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	023dd24ad9e6d5e62907e7007f548ca3	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
-_md5_=caad5da65bcfc2da3d7b061fa0abeb9f
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	023dd24ad9e6d5e62907e7007f548ca3
+_md5_=5f701a9ba03861a0616d8e480b2646c8
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
index 7e0e64401a04..9d9240b72079 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
@@ -3,12 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for Twitter
 EAPI=6
 HOMEPAGE=http://twmode.sourceforge.net/
-INHERIT=elisp eutils
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	023dd24ad9e6d5e62907e7007f548ca3	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
-_md5_=caad5da65bcfc2da3d7b061fa0abeb9f
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	023dd24ad9e6d5e62907e7007f548ca3
+_md5_=5f701a9ba03861a0616d8e480b2646c8
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index 2a4fc16a2c2f..17b9f62507b0 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-9999
+++ b/metadata/md5-cache/app-emacs/twittering-mode-9999
@@ -3,11 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:* >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Emacs major mode for Twitter
 EAPI=6
 HOMEPAGE=http://twmode.sourceforge.net/
-INHERIT=elisp eutils git-r3
+INHERIT=elisp git-r3
 IUSE=doc
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	023dd24ad9e6d5e62907e7007f548ca3	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	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=caad5da65bcfc2da3d7b061fa0abeb9f
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	023dd24ad9e6d5e62907e7007f548ca3	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=5f701a9ba03861a0616d8e480b2646c8
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index a651af064834..c63c92876385 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -4,7 +4,7 @@ DEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/libX
 DESCRIPTION=DOS Emulator
 EAPI=7
 HOMEPAGE=http://www.dosemu.org/
-INHERIT=autotools eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=autotools flag-o-matic pax-utils toolchain-funcs
 IUSE=X alsa debug fluidsynth gpm svga
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/lib
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://dev.gentoo.org/~slyfox/distfiles/dosemu-1.4.1_pre20130107.zip
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=c5fafa1dd08d139da47059c1b89321ce
+_md5_=6b1fff0a13c7a74af747c1630f4c4c0a
diff --git a/metadata/md5-cache/app-emulation/libvirt-snmp-0.0.4 b/metadata/md5-cache/app-emulation/libvirt-snmp-0.0.4
index 1fbf615451a5..f15eca300785 100644
--- a/metadata/md5-cache/app-emulation/libvirt-snmp-0.0.4
+++ b/metadata/md5-cache/app-emulation/libvirt-snmp-0.0.4
@@ -8,5 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-emulation/libvirt net-analyzer/net-snmp
 SLOT=0
 SRC_URI=http://www.libvirt.org/sources/snmp/libvirt-snmp-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7694f0ff9e56b40f86e601ca5a7b72a8
+_md5_=1afcfc3da8e4905f8a9b176e551909be
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-4.2.0-r1 b/metadata/md5-cache/app-emulation/qemu-guest-agent-4.2.0-r1
index 007380d4c3d1..c6741a1fe83f 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-4.2.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-4.2.0-r1
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib || ( dev-lang/python:3.8 dev-lang/python:3.7 )
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
 EAPI=7
 HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-INHERIT=eutils systemd toolchain-funcs udev python-any-r1
+INHERIT=systemd toolchain-funcs udev python-any-r1
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-4.2.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=c3e17b7a177e7483d5cbd634309349be
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=25e1d2e036464f447acd3462175e49e0
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0
index 941dd9398211..d1c2113d5795 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib || ( dev-lang/python:3.8 dev-lang/python:3.7 )
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
 EAPI=7
 HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-INHERIT=eutils systemd toolchain-funcs udev python-any-r1
+INHERIT=systemd toolchain-funcs udev python-any-r1
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-5.0.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=6c3507b77e4fe6e0421ad5ac23e43f19
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=2379f4f55efa239af6ad40d236821d0e
diff --git a/metadata/md5-cache/app-forensics/lynis-3.0.3 b/metadata/md5-cache/app-forensics/lynis-3.0.3
index 7022f1509af1..eae341524a6a 100644
--- a/metadata/md5-cache/app-forensics/lynis-3.0.3
+++ b/metadata/md5-cache/app-forensics/lynis-3.0.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Security and system auditing tool
 EAPI=7
 HOMEPAGE=https://cisofy.com/lynis/
-INHERIT=eutils bash-completion-r1
+INHERIT=bash-completion-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=https://cisofy.com/files/lynis-3.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
-_md5_=e9a82ccbd9fa3ebb4d26dac24f04b8ed
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
+_md5_=7806980fa968b1fa854a84e08eebf03a
diff --git a/metadata/md5-cache/app-forensics/lynis-3.0.3-r2 b/metadata/md5-cache/app-forensics/lynis-3.0.3-r2
index 296aa0feea11..05fbd3c46d8d 100644
--- a/metadata/md5-cache/app-forensics/lynis-3.0.3-r2
+++ b/metadata/md5-cache/app-forensics/lynis-3.0.3-r2
@@ -3,11 +3,11 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Security and system auditing tool
 EAPI=7
 HOMEPAGE=https://cisofy.com/lynis/
-INHERIT=eutils bash-completion-r1 systemd
+INHERIT=bash-completion-r1 systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=https://cisofy.com/files/lynis-3.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=87e0057eee888bbf1da4102a40683a3a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=2b1bb46006b3817751f27cd986582bda
diff --git a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3 b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
index 87885c071d68..7a4618e33af0 100644
--- a/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
+++ b/metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
@@ -3,7 +3,7 @@ DEPEND=>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 )
 DESCRIPTION=Yet another IM-client of SCIM
 EAPI=6
 HOMEPAGE=http://www.scim-im.org/projects/scim_bridge
-INHERIT=autotools eutils gnome2-utils ltprune multilib readme.gentoo-r1
+INHERIT=autotools gnome2-utils ltprune multilib readme.gentoo-r1
 IUSE=doc gtk
 KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-bridge-0.4.16.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=c52dad7c7b49d18e67821c133df89546
+_md5_=74f097014d232f504b8c17cfa26cd174
diff --git a/metadata/md5-cache/app-i18n/scim-tomoe-0.6.0-r3 b/metadata/md5-cache/app-i18n/scim-tomoe-0.6.0-r3
index 310e19c0718b..5c4cc0aee754 100644
--- a/metadata/md5-cache/app-i18n/scim-tomoe-0.6.0-r3
+++ b/metadata/md5-cache/app-i18n/scim-tomoe-0.6.0-r3
@@ -3,11 +3,11 @@ DEPEND=>=app-i18n/scim-1.2.0 >=app-i18n/tomoe-gtk-0.6.0 >=x11-libs/gtk+-2.4:2 vi
 DESCRIPTION=Japanese input method Tomoe IMEngine for SCIM
 EAPI=6
 HOMEPAGE=http://tomoe.sourceforge.net/
-INHERIT=eutils ltprune
+INHERIT=ltprune
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-i18n/scim-1.2.0 >=app-i18n/tomoe-gtk-0.6.0 >=x11-libs/gtk+-2.4:2
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/scim-tomoe-0.6.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
-_md5_=27f92668ae18ff8d6f6389a639f5c5de
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=d8b18782d6da880d8b01324a1e216f4c
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701 b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701
index 4f55b2a96b1f..ffa61b07b05a 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701
+++ b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprint
 SLOT=0
 SRC_URI=https://github.com/Gnurou/tagainijisho/archive/2d2a3182a70a22bf27b0be42a3e896283513761e.tar.gz -> tagainijisho-1.2.0_pre20200118132551.tar.gz https://home.apache.org/~arfrever/distfiles/JMdict-2020-07-01.gz https://home.apache.org/~arfrever/distfiles/kanjidic2-2020-07-01.xml.gz https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=3485f3efe1edfe59ccc5cf5a869bb167
+_md5_=e30012d5d749a0832192222e0247f07d
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001 b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001
index 54b6d9221e68..eb159508bab7 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001
+++ b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprint
 SLOT=0
 SRC_URI=https://github.com/Gnurou/tagainijisho/archive/2d2a3182a70a22bf27b0be42a3e896283513761e.tar.gz -> tagainijisho-1.2.0_pre20200118132551.tar.gz https://home.apache.org/~arfrever/distfiles/JMdict-2020-10-01.gz https://home.apache.org/~arfrever/distfiles/kanjidic2-2020-10-01.xml.gz https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=3485f3efe1edfe59ccc5cf5a869bb167
+_md5_=e30012d5d749a0832192222e0247f07d
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401 b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401
index 55e46d396029..4a93e51a0331 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401
+++ b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprint
 SLOT=0
 SRC_URI=https://github.com/Gnurou/tagainijisho/archive/54a7145903cadb0ebfa58c543553dc0931a36066.tar.gz -> tagainijisho-1.2.0_pre20210313131524.tar.gz https://home.apache.org/~arfrever/distfiles/JMdict-2021-04-01.gz https://home.apache.org/~arfrever/distfiles/kanjidic2-2021-04-01.xml.gz https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7f61e9e97c2895badc8f85be3d94fd92
+_md5_=41782ddaa745a6f8ad13c14aa67d22d9
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-9999 b/metadata/md5-cache/app-i18n/tagainijisho-9999
index 4725f8c68607..985fa0a92415 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-9999
+++ b/metadata/md5-cache/app-i18n/tagainijisho-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprint
 SLOT=0
 SRC_URI=https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=1fd6707269afab8f979cfa8e69f97119
+_md5_=75988475a9c6d4488552092564f4225e
diff --git a/metadata/md5-cache/app-misc/bfr-1.6-r3 b/metadata/md5-cache/app-misc/bfr-1.6-r3
index 15f02c5645eb..1c69715a515b 100644
--- a/metadata/md5-cache/app-misc/bfr-1.6-r3
+++ b/metadata/md5-cache/app-misc/bfr-1.6-r3
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=General-purpose command-line pipe buffer
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.glines.org/bin/pk/bfr-1.6.tar.bz2
-_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
-_md5_=01bfe1eb20964077bb50a8fd279e1ceb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=acacd30700a2eb99b1298e6c0d2b0c32
diff --git a/metadata/md5-cache/app-misc/ddccontrol-db-20190826_p20200613 b/metadata/md5-cache/app-misc/ddccontrol-db-20190826_p20200613
index 7926f320d7be..fee3290a29ca 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-db-20190826_p20200613
+++ b/metadata/md5-cache/app-misc/ddccontrol-db-20190826_p20200613
@@ -4,12 +4,12 @@ DEPEND=nls? ( sys-devel/gettext ) dev-util/intltool dev-perl/XML-Parser
 DESCRIPTION=DDCControl monitor database
 EAPI=7
 HOMEPAGE=http://ddccontrol.sourceforge.net/
-INHERIT=eutils autotools
+INHERIT=autotools
 IUSE=nls
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=https://github.com/ddccontrol/ddccontrol-db/archive/e75714979448b2f513d5ce65929899fa32a59044.tar.gz -> ddccontrol-db-20190826_p20200613.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=560adc20ad49b1660c8fa4ae22dda65b
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=7f41b7116f79d8970769ed45490cab85
diff --git a/metadata/md5-cache/app-misc/empty-0.6.20b b/metadata/md5-cache/app-misc/empty-0.6.20b
index 09a58954fea0..5ad6e88f3b19 100644
--- a/metadata/md5-cache/app-misc/empty-0.6.20b
+++ b/metadata/md5-cache/app-misc/empty-0.6.20b
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Small shell utility, similar to expect(1)
 EAPI=6
 HOMEPAGE=http://empty.sourceforge.net
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/empty/empty-0.6.20b.tgz
-_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
-_md5_=51a8b2c968587e1d548fc307e6cf345b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=2779186b40908ab36119ba7e594b4bb8
diff --git a/metadata/md5-cache/app-misc/g810-led-0.3.6 b/metadata/md5-cache/app-misc/g810-led-0.3.6
index 6cd2af846932..e54c5b526b7b 100644
--- a/metadata/md5-cache/app-misc/g810-led-0.3.6
+++ b/metadata/md5-cache/app-misc/g810-led-0.3.6
@@ -4,12 +4,12 @@ DEPEND=hidapi? ( dev-libs/hidapi:= ) !hidapi? ( virtual/libusb:= )
 DESCRIPTION=Led controller for Logitech G- Keyboards
 EAPI=7
 HOMEPAGE=https://github.com/MatMoul/g810-led
-INHERIT=systemd udev eutils
+INHERIT=systemd udev
 IUSE=+hidapi
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=hidapi? ( dev-libs/hidapi:= ) !hidapi? ( virtual/libusb:= )
 SLOT=0
 SRC_URI=https://github.com/MatMoul/g810-led/archive/v0.3.6.tar.gz -> g810-led-0.3.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=caf7824f10571b8c0a2c8222e8df5686
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=243e44b4dc0f7ede5f59253bdcd2344f
diff --git a/metadata/md5-cache/app-misc/g810-led-0.4.2 b/metadata/md5-cache/app-misc/g810-led-0.4.2
index 41a24092c108..f99510579fd7 100644
--- a/metadata/md5-cache/app-misc/g810-led-0.4.2
+++ b/metadata/md5-cache/app-misc/g810-led-0.4.2
@@ -4,12 +4,12 @@ DEPEND=hidapi? ( dev-libs/hidapi:= ) !hidapi? ( virtual/libusb:= )
 DESCRIPTION=Led controller for Logitech G- Keyboards
 EAPI=7
 HOMEPAGE=https://github.com/MatMoul/g810-led
-INHERIT=eutils systemd toolchain-funcs udev
+INHERIT=systemd toolchain-funcs udev
 IUSE=+hidapi
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=hidapi? ( dev-libs/hidapi:= ) !hidapi? ( virtual/libusb:= )
 SLOT=0
 SRC_URI=https://github.com/MatMoul/g810-led/archive/v0.4.2.tar.gz -> g810-led-0.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=419bb591a511eba15fbce091eb073725
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=579682fa8c9209dbad5e39bc70a74333
diff --git a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2 b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
index b2dea2977da3..f349c52bb740 100644
--- a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
+++ b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
@@ -10,5 +10,4 @@ RDEPEND=dev-lang/ocaml[ocamlopt?] <dev-ml/camlp5-8:=[ocamlopt?] acct-user/genewe
 RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/geneweb/geneweb/archive/v7.0.0.tar.gz -> geneweb-7.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbc248c457b288c788cf6b2540670fa9
+_md5_=4b4b44516d3a37726ab9c26289f436ce
diff --git a/metadata/md5-cache/app-misc/grc-1.11.3 b/metadata/md5-cache/app-misc/grc-1.11.3
index e42390a0d7ce..ba039d010e40 100644
--- a/metadata/md5-cache/app-misc/grc-1.11.3
+++ b/metadata/md5-cache/app-misc/grc-1.11.3
@@ -3,7 +3,7 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_
 DESCRIPTION=Generic Colouriser beautifies your logfiles or output of commands
 EAPI=7
 HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
-INHERIT=eutils python-r1
+INHERIT=python-r1
 IUSE=python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/garabik/grc/archive/v1.11.3.tar.gz -> grc-1.11.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
-_md5_=90b3209eefc8406a7682a70ba66bacbf
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
+_md5_=4d71fb6fe0f31442f4d67b283935ea86
diff --git a/metadata/md5-cache/app-misc/leave-20100918-r1 b/metadata/md5-cache/app-misc/leave-20100918-r1
index 257c53a62426..14d47dec1592 100644
--- a/metadata/md5-cache/app-misc/leave-20100918-r1
+++ b/metadata/md5-cache/app-misc/leave-20100918-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=FreeBSD command-line tool that reminds you when its time to leave
 EAPI=6
 HOMEPAGE=http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/leave/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/leave-20100918.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
-_md5_=cf14d8db8d94ce774995b0658e3f99e9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=597418f6c034d6f16e805f5af28903fa
diff --git a/metadata/md5-cache/app-misc/linuxspa-0.7.1-r2 b/metadata/md5-cache/app-misc/linuxspa-0.7.1-r2
index a7b3fc027460..66001b134c3c 100644
--- a/metadata/md5-cache/app-misc/linuxspa-0.7.1-r2
+++ b/metadata/md5-cache/app-misc/linuxspa-0.7.1-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Linux Serial Protocol Analyser
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/serialsniffer/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/serialsniffer/LinuxSPA-0.7.1.tgz
-_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
-_md5_=7f8aa5521508fa36f9b6f3357fe9fcab
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=2f2f817013e81dd35fbed3be41b76e36
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r3 b/metadata/md5-cache/app-misc/lirc-0.10.1-r3
index a2dafbe62d9d..c2dc6a6f71b9 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r3
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r3
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=7
 HOMEPAGE=https://www.lirc.org/
-INHERIT=eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+INHERIT=flag-o-matic linux-info python-single-r1 systemd xdg-utils
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux +python_single_target_python3_7
 KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc2696bb446715616a0e819ab99c6a91
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2a1c1305bf52eb75923ac11478d5c10
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r4 b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
index 448428e5de47..6b048901d387 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r4
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=7
 HOMEPAGE=https://www.lirc.org/
-INHERIT=eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+INHERIT=flag-o-matic linux-info python-single-r1 systemd xdg-utils
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8f12d6222aa2929c23aa98bbcf9fd89
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=abcde6f4a521dfb9b58145b94fa73bb6
diff --git a/metadata/md5-cache/app-misc/mvcase-0.1-r2 b/metadata/md5-cache/app-misc/mvcase-0.1-r2
index 45e9850673c1..704af7976496 100644
--- a/metadata/md5-cache/app-misc/mvcase-0.1-r2
+++ b/metadata/md5-cache/app-misc/mvcase-0.1-r2
@@ -3,11 +3,11 @@ DEPEND=dev-libs/shhopt
 DESCRIPTION=A modified version of mv, used to convert filenames to lower/upper case
 EAPI=6
 HOMEPAGE=https://www.ibiblio.org/pub/Linux/utils/file
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/shhopt
 SLOT=0
 SRC_URI=https://www.ibiblio.org/pub/Linux/utils/file/mvcase-0.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
-_md5_=fa9dd89aeb5fa6c42310b04b6e713187
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a09c17d720147df50a582781d4ba4b0b
diff --git a/metadata/md5-cache/app-misc/splitvt-1.6.6-r3 b/metadata/md5-cache/app-misc/splitvt-1.6.6-r3
index 54a3e79c34c9..774d26f6b0e6 100644
--- a/metadata/md5-cache/app-misc/splitvt-1.6.6-r3
+++ b/metadata/md5-cache/app-misc/splitvt-1.6.6-r3
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Splitting terminals into two shells
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://slouken.libsdl.org/projects/splitvt/splitvt-1.6.6.tar.gz mirror://debian/pool/main/s/splitvt/splitvt_1.6.6-7.diff.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
-_md5_=69963f003b4aac11fcb5806f9591ce7b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=86935893925d5f0112600318d004c2ef
diff --git a/metadata/md5-cache/app-misc/symlinks-1.4-r3 b/metadata/md5-cache/app-misc/symlinks-1.4-r3
index 2e425a1f0b84..29a5d4165418 100644
--- a/metadata/md5-cache/app-misc/symlinks-1.4-r3
+++ b/metadata/md5-cache/app-misc/symlinks-1.4-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Scans for and fixes broken or messy symlinks
 EAPI=6
 HOMEPAGE=http://www.ibiblio.org/pub/linux/utils/file/
-INHERIT=flag-o-matic eutils toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=symlinks
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/linux/utils/file/symlinks-1.4.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=c64bbc6280ebd02d9eb4363a4ff7f61a
+_md5_=9b032088e2ca32dd06e8a8359a97d7ef
diff --git a/metadata/md5-cache/app-misc/tdl-1.5.2-r3 b/metadata/md5-cache/app-misc/tdl-1.5.2-r3
index e36f996cd233..7e554fb064e0 100644
--- a/metadata/md5-cache/app-misc/tdl-1.5.2-r3
+++ b/metadata/md5-cache/app-misc/tdl-1.5.2-r3
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-apps/sed sys-apps/texinfo do
 DESCRIPTION=Command line To Do List manager
 EAPI=6
 HOMEPAGE=http://www.rc0.org.uk/tdl/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc readline
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz https://dev.gentoo.org/~jlec/distfiles/tdl-screenshot.png.tar
-_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	c0964e43ba712cb933da5f65b958fa88
-_md5_=62395268c4226494179ae71b2465141f
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=414829c9e83849ee46b28e0c9f893728
diff --git a/metadata/md5-cache/app-misc/vlock-2.2.3-r1 b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
index 0bdc70bffb89..28e566b0f4d8 100644
--- a/metadata/md5-cache/app-misc/vlock-2.2.3-r1
+++ b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
@@ -3,7 +3,7 @@ DEPEND=!>=sys-apps/kbd-2.0.4-r1[pam] pam? ( sys-libs/pam ) test? ( dev-util/cuni
 DESCRIPTION=A console screen locker
 EAPI=6
 HOMEPAGE=https://github.com/WorMzy/vlock
-INHERIT=pam toolchain-funcs user
+INHERIT=epatch pam toolchain-funcs user
 IUSE=pam test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=!>=sys-apps/kbd-2.0.4-r1[pam] pam? ( sys-libs/pam )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WorMzy/vlock/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vlock-2.2.3.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	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=65e6b90670d85a3f85c4bfb938dbd70c
+_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	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=42d1862a6b7bb5748bac1c68c7e7b7c9
diff --git a/metadata/md5-cache/app-misc/wcd-5.3.4 b/metadata/md5-cache/app-misc/wcd-5.3.4
index 8fb59d7b8f92..d2801191a10c 100644
--- a/metadata/md5-cache/app-misc/wcd-5.3.4
+++ b/metadata/md5-cache/app-misc/wcd-5.3.4
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text
 DESCRIPTION=Wherever Change Directory
 EAPI=6
 HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=nls unicode
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
 SLOT=0
 SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.3.4.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
-_md5_=51ceaca6b413c2028ce225b21d50b7d9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=bd63af7b63a7037cc66af779ad21a3e7
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.1 b/metadata/md5-cache/app-misc/wcd-6.0.1
index 329d614a93fb..78d84a5d6263 100644
--- a/metadata/md5-cache/app-misc/wcd-6.0.1
+++ b/metadata/md5-cache/app-misc/wcd-6.0.1
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text
 DESCRIPTION=Wherever Change Directory
 EAPI=6
 HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=nls unicode
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
 SLOT=0
 SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.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
-_md5_=5f59840e7418ddbdbe6de4c3b1064d38
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e2b32a245628bb8254443e761a3b4925
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.2 b/metadata/md5-cache/app-misc/wcd-6.0.2
index 22927d0668ed..b934a45e48f6 100644
--- a/metadata/md5-cache/app-misc/wcd-6.0.2
+++ b/metadata/md5-cache/app-misc/wcd-6.0.2
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text
 DESCRIPTION=Wherever Change Directory
 EAPI=6
 HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=nls unicode
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
 SLOT=0
 SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.2.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
-_md5_=f2d82b8e957dd9ecfb16f68affae149e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=95b62d0660a618424619d62b3088a6b3
diff --git a/metadata/md5-cache/app-office/glabels-3.4.1 b/metadata/md5-cache/app-office/glabels-3.4.1
index 32c8eba2d69c..359e1b78d12b 100644
--- a/metadata/md5-cache/app-office/glabels-3.4.1
+++ b/metadata/md5-cache/app-office/glabels-3.4.1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gtk+-3.14.0:3 >=dev-libs/libxml2-2.9.
 DESCRIPTION=Program for creating labels and business cards
 EAPI=6
 HOMEPAGE=https://glabels.org/
-INHERIT=eutils gnome2
+INHERIT=gnome2
 IUSE=barcode eds
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-3+ LGPL-3+ CC-BY-SA-3.0 MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gtk+-3.14.0:3 >=dev-libs/libxml2-2.9
 SLOT=0
 SRC_URI=mirror://gnome/sources/glabels/3.4/glabels-3.4.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	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=e213517d8d3e055fe4b0236ee2fb8b57
+_md5_=0428a0707897c9cb67327e938eac295b
diff --git a/metadata/md5-cache/app-portage/deltup-0.4.6-r1 b/metadata/md5-cache/app-portage/deltup-0.4.6-r1
index 32e624fd28d8..d6ac66e68b03 100644
--- a/metadata/md5-cache/app-portage/deltup-0.4.6-r1
+++ b/metadata/md5-cache/app-portage/deltup-0.4.6-r1
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib app-arch/bzip2 !libressl? ( dev-libs/openssl:0= ) libressl?
 DESCRIPTION=Delta-Update - patch system for updating source-archives.
 EAPI=6
 HOMEPAGE=http://deltup.sourceforge.net
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=libressl
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib app-arch/bzip2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) || ( dev-util/bdelta =dev-util/xdelta-1* )
 SLOT=0
 SRC_URI=https://github.com/jjwhitney/Deltup/archive/v0.4.6.tar.gz -> deltup-0.4.6.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
-_md5_=d9649b9b276928a05e59ca3289f82827
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=45ae4d0de2ff19509fa462d9f1ffabd1
diff --git a/metadata/md5-cache/app-portage/layman-2.4.3 b/metadata/md5-cache/app-portage/layman-2.4.3
index d8d7fac4228b..480940ac7f52 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.3
+++ b/metadata/md5-cache/app-portage/layman-2.4.3
@@ -4,7 +4,7 @@ DEPEND=test? ( dev-vcs/subversion )
 DESCRIPTION=Tool to manage Gentoo overlays
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Layman
-INHERIT=eutils distutils-r1 linux-info prefix
+INHERIT=distutils-r1 linux-info prefix
 IUSE=cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=a9b318e21231768a25230fedbbd33087
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=a722b48e0d3a2a27778e6d726ef9e217
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 10aa3152ce4f..8a423207d9df 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -4,7 +4,7 @@ DEPEND=test? ( dev-vcs/subversion )
 DESCRIPTION=Tool to manage Gentoo overlays
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Layman
-INHERIT=eutils distutils-r1 linux-info prefix git-r3
+INHERIT=distutils-r1 linux-info prefix git-r3
 IUSE=cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercu
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=b551a4c2931685b609d840aa4c336141
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=67290aa77d5dcf965585b64c63e85770
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
index b57fc05faca8..9e3eb1a63bc9 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-INHERIT=eutils distutils-r1 prefix
+INHERIT=distutils-r1 prefix
 IUSE=ipv6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.6.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=f241aafd8b1dd4d2ca6071efa17d808a
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=757ba749c1ea5e32ac3f95e3803df343
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 5ce058fe2573..ef37fffa963d 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-INHERIT=eutils distutils-r1 git-r3 prefix
+INHERIT=distutils-r1 git-r3 prefix
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] ~dev-python/ssl-fetch-9999[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=e9c61b9714bc7d19cab31a24919ee54d
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=a9eafe0b5eab2fcb9039aa28800aa4da
diff --git a/metadata/md5-cache/app-portage/porticron-0.7.1 b/metadata/md5-cache/app-portage/porticron-0.7.1
index a4cf90ba4869..c945d16a4924 100644
--- a/metadata/md5-cache/app-portage/porticron-0.7.1
+++ b/metadata/md5-cache/app-portage/porticron-0.7.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=cron script to sync portage and send update mails to root
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/porticron
-INHERIT=eutils vcs-snapshot
+INHERIT=vcs-snapshot
 KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=app-portage/gentoolkit net-dns/bind-tools
 SLOT=0
 SRC_URI=https://github.com/gentoo/porticron/archive/v0.7.1.tar.gz -> porticron-0.7.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	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=59e5dd1e1c71b26560525a6ced595763
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=42d2219c61365ec1b4220102a6d6be4a
diff --git a/metadata/md5-cache/app-text/groonga-6.1.2 b/metadata/md5-cache/app-text/groonga-6.1.2
index 2cb2376ee063..30a36f350dab 100644
--- a/metadata/md5-cache/app-text/groonga-6.1.2
+++ b/metadata/md5-cache/app-text/groonga-6.1.2
@@ -3,7 +3,7 @@ DEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libe
 DESCRIPTION=An Embeddable Fulltext Search Engine
 EAPI=6
 HOMEPAGE=https://groonga.org/
-INHERIT=eutils libtool ltprune user
+INHERIT=libtool ltprune user
 IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) lib
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=https://packages.groonga.org/source/groonga/groonga-6.1.2.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	libtool	f143db5a74ccd9ca28c1234deffede96	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=da56741b8dca45ce7deee61947891eeb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=8b4e7501fdc18bd79f5ab69eb3a27809
diff --git a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1 b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
index db01e39b56fe..599a0c6a795f 100644
--- a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
+++ b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
@@ -3,11 +3,11 @@ DEPEND=app-text/groonga virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-
 DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
 EAPI=6
 HOMEPAGE=https://groonga.org/
-INHERIT=eutils autotools ltprune
+INHERIT=autotools ltprune
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/groonga
 SLOT=0
 SRC_URI=https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.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_=8823d663d5a7a574a8b64704913b9be3
+_md5_=e1c521bf3b6da3578b17077c54a2157d
diff --git a/metadata/md5-cache/app-text/gtkspell-2.0.16-r1 b/metadata/md5-cache/app-text/gtkspell-2.0.16-r1
index e02847914a55..0ff3745a3652 100644
--- a/metadata/md5-cache/app-text/gtkspell-2.0.16-r1
+++ b/metadata/md5-cache/app-text/gtkspell-2.0.16-r1
@@ -8,5 +8,4 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0
 SLOT=2
 SRC_URI=http://gtkspell.sourceforge.net/download/gtkspell-2.0.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b30ae7ff9e7efe4239e99460c5e0935d
+_md5_=00a8ef64317a6716c1e725bad2844abf
diff --git a/metadata/md5-cache/app-text/htp-1.19 b/metadata/md5-cache/app-text/htp-1.19
index 7319314fb7cf..8573b80fe810 100644
--- a/metadata/md5-cache/app-text/htp-1.19
+++ b/metadata/md5-cache/app-text/htp-1.19
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DESCRIPTION=An HTML preprocessor
 EAPI=6
 HOMEPAGE=http://htp.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=Clarified-Artistic
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/htp/htp-1.19.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
-_md5_=df582a96b4237d4908b12d2f3157316e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=f0d3778581b40aaa1f2f4016e18a0809
diff --git a/metadata/md5-cache/app-text/mecab-0.996-r1 b/metadata/md5-cache/app-text/mecab-0.996-r1
index 6b0475f90da0..8675e68b9ea6 100644
--- a/metadata/md5-cache/app-text/mecab-0.996-r1
+++ b/metadata/md5-cache/app-text/mecab-0.996-r1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/perl virtual/libiconv sys-devel/gnuconfig >=app-portage/elt-patc
 DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=6
 HOMEPAGE=https://taku910.github.io/mecab/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=static-libs unicode
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
@@ -11,4 +11,4 @@ PDEPEND=|| ( app-dicts/mecab-ipadic[unicode=] app-dicts/mecab-naist-jdic[unicode
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-0.996.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_=44cddebea72a77ed25170057818ff213
+_md5_=c32e93bd6c12fdbfc1ff74beff9e4e97
diff --git a/metadata/md5-cache/app-text/pstotext-1.9-r4 b/metadata/md5-cache/app-text/pstotext-1.9-r4
index 700e152d28e3..9c0400d6b846 100644
--- a/metadata/md5-cache/app-text/pstotext-1.9-r4
+++ b/metadata/md5-cache/app-text/pstotext-1.9-r4
@@ -3,11 +3,11 @@ DEPEND=app-arch/ncompress
 DESCRIPTION=Extract ASCII text from a PostScript or PDF file
 EAPI=6
 HOMEPAGE=http://www.cs.wisc.edu/~ghost/doc/pstotext.htm
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=PSTT
 RDEPEND=app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/pstotext-1.9.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
-_md5_=590f755fca5f8e8730a4ce76c53a448d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d0c094cc22e000383c3c143180bbef68
diff --git a/metadata/md5-cache/app-text/wv-1.2.9-r2 b/metadata/md5-cache/app-text/wv-1.2.9-r2
index f67eb4f2d145..375a65d4b01e 100644
--- a/metadata/md5-cache/app-text/wv-1.2.9-r2
+++ b/metadata/md5-cache/app-text/wv-1.2.9-r2
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/
 DESCRIPTION=Tool for conversion of MSWord doc and rtf files to something readable
 EAPI=6
 HOMEPAGE=http://wvware.sourceforge.net/
-INHERIT=eutils autotools ltprune
+INHERIT=autotools ltprune
 IUSE=tools wmf
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs
 SLOT=0
 SRC_URI=http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.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_=9b453e0fbaf3f3ddde05692c74b9b577
+_md5_=5d1ead6415bd297b19656d08299bd0cc
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r1 b/metadata/md5-cache/app-vim/alternate-2.18-r1
index e733cc1a56c1..c59eacaf70c4 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r1
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r1
@@ -3,11 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: quickly switch between .c and .h files
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
-INHERIT=vim-plugin eutils
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/alternate-2.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/alternate-2.18.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=116c8de8bfeac69023ca947ad0ed1266
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=a6f43c1c7d459e6375677b977e513c52
diff --git a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1 b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
index 711f3bf11822..3465ee8936db 100644
--- a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
+++ b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
@@ -3,11 +3,11 @@ DEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors
 DESCRIPTION=vim plugin: eselect syntax highlighting, filetype and indent settings
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=eutils vim-plugin
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=vim
 RDEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2
-_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	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=397a87f2ee714e1f851cedd126f6e5c5
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=b26691217651f4d26bc238e80c320db6
diff --git a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1 b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
index 4696e6f11eed..dd203492a63a 100644
--- a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
+++ b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
@@ -3,11 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: vimbuddy for the status line
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/vimbuddy.vim
-INHERIT=vim-plugin eutils
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/vimbuddy.vim/archive/0.9.2.tar.gz -> vimbuddy-0.9.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=f8dd8234f38a1f072558e058ebe06057
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=d850451b30d5a4038caca10fa6319e68
diff --git a/metadata/md5-cache/dev-cpp/tbb-2019.8 b/metadata/md5-cache/dev-cpp/tbb-2019.8
index 58dcb39acc80..77e119d8797e 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2019.8
+++ b/metadata/md5-cache/dev-cpp/tbb-2019.8
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High level abstract threading library
 EAPI=7
 HOMEPAGE=https://www.threadingbuildingblocks.org
-INHERIT=eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+INHERIT=flag-o-matic multilib-minimal multilib toolchain-funcs
 IUSE=debug examples 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
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/intel/tbb/archive/2019_U8.tar.gz -> tbb-2019.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=1f4be02349989680b5408d8ca697be74
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=457b7166157175eb6e8b5dc89a6dca5c
diff --git a/metadata/md5-cache/dev-cpp/tbb-2020.2 b/metadata/md5-cache/dev-cpp/tbb-2020.2
index 26d233d371d2..bfc14b89df2d 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2020.2
+++ b/metadata/md5-cache/dev-cpp/tbb-2020.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High level abstract threading library
 EAPI=7
 HOMEPAGE=https://www.threadingbuildingblocks.org
-INHERIT=eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+INHERIT=flag-o-matic multilib-minimal multilib toolchain-funcs
 IUSE=debug examples 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
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/intel/tbb/archive/2020_U2.tar.gz -> tbb-2020.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=6adabc0640677e5c61c77829aa5cdab6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=f281fb10da725a1b0a244d0e6b6c0c8f
diff --git a/metadata/md5-cache/dev-cpp/tbb-2020.3 b/metadata/md5-cache/dev-cpp/tbb-2020.3
index d173a87a4dce..90f994ac8518 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2020.3
+++ b/metadata/md5-cache/dev-cpp/tbb-2020.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High level abstract threading library
 EAPI=7
 HOMEPAGE=https://www.threadingbuildingblocks.org
-INHERIT=eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+INHERIT=flag-o-matic multilib-minimal multilib toolchain-funcs
 IUSE=debug examples 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
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/intel/tbb/archive/2020_U3.tar.gz -> tbb-2020.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=f6317c5b8b4a0e005e955942a826e707
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=6928e787aa23128af29b345b275d7b77
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2 b/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2
index 039a60b0d42c..a877cca82b7e 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-18.3.0.0-r2
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Oracle 18c Instant Client with SDK
 EAPI=7
 HOMEPAGE=https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html
-INHERIT=eutils pax-utils multilib-minimal
+INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools 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 ~x86
 LICENSE=OTN
@@ -12,5 +12,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/18.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-18.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-18.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-18.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-18.3.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-18.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-18.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-18.3.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-18.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-18.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-18.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-18.3.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-18.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-18.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-18.3.0.0.0dbru.zip ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=c74029bb3bd0d3bb4e777c32bdb41ab5
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=0e63478c9ab9d9e1f73f5bc6bc60fde6
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0
index bc5324cca079..9d36f82e8bd8 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-18.5.0.0
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Oracle 18c Instant Client with SDK
 EAPI=7
 HOMEPAGE=https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html
-INHERIT=eutils pax-utils multilib-minimal
+INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools 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
 LICENSE=OTN
@@ -12,5 +12,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/18.1
 SRC_URI=abi_x86_64? ( instantclient-basic-linux.x64-18.5.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-18.5.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-18.5.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-18.5.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-18.5.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-18.5.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-18.5.0.0.0dbru.zip ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=28edb06a19f28f6fad6201e44fb8f610
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=fcefedfd7740d690829ff4cf85fc40a5
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
index 6a90ce4d153f..d02a044b4450 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Oracle 18c Instant Client with SDK
 EAPI=7
 HOMEPAGE=https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html
-INHERIT=eutils pax-utils multilib-minimal
+INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools 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 ~x86
 LICENSE=OTN
@@ -12,5 +12,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/18.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-19.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-19.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-19.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-19.3.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-19.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-19.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-19.3.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-19.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-19.3.0.0.0dbru.zip ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=2aa59491298e0ab0d6ad4b9cf66af60b
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=8f07a85d45a6b295824131ef6f611f16
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0
index c809dc2e39ab..4fb93d4b001e 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Oracle 18c Instant Client with SDK
 EAPI=7
 HOMEPAGE=https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html
-INHERIT=eutils pax-utils multilib-minimal
+INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools 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 ~x86
 LICENSE=OTN
@@ -12,5 +12,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/19.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-19.5.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-19.5.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-19.5.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-19.5.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-19.5.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-19.5.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-19.5.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-19.5.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-19.5.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-19.5.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-19.5.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-19.5.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-19.5.0.0.0dbru.zip ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=5a62527ed6aa71ed184b50e09e12d3f1
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=8627238dc8a794f069231b3900f13aa8
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0 b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
index 909b6564c0ef..2ddda39d7271 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Oracle 18c Instant Client with SDK
 EAPI=7
 HOMEPAGE=https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html
-INHERIT=eutils pax-utils multilib-minimal
+INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools 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 ~x86
 LICENSE=OTN
@@ -12,5 +12,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=fetch splitdebug
 SLOT=0/19.1
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-19.6.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-19.6.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-19.6.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-19.6.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-19.6.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-19.6.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-19.6.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-19.6.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-19.6.0.0.0dbru.zip ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=5a62527ed6aa71ed184b50e09e12d3f1
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=8627238dc8a794f069231b3900f13aa8
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
index 9f543e3a4eee..337eb32653be 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Oracle 18c Instant Client with SDK
 EAPI=7
 HOMEPAGE=https://www.oracle.com/database/technologies/instant-client.html
-INHERIT=eutils pax-utils multilib-minimal
+INHERIT=pax-utils multilib-minimal
 IUSE=jdbc odbc precomp +sdk +sqlplus tools 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 x86
 LICENSE=OTN
@@ -12,5 +12,5 @@ REQUIRED_USE=precomp? ( sdk )
 RESTRICT=mirror splitdebug test
 SLOT=0/19.1
 SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux-19.6.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux-19.6.0.0.0dbru.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux.x64-19.6.0.0.0dbru.zip ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=462ef4880991be892c464ada1d1211f5
+_eclasses_=pax-utils	d3fc79d3d50544347e324864f95206e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=0e187712cfe671f2efa140f811630da7
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.9.6 b/metadata/md5-cache/dev-db/phpmyadmin-4.9.6
index ec1faeced1d2..f99082a1e53f 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.9.6
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.9.6
@@ -3,12 +3,12 @@ DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-
 DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=7
 HOMEPAGE=https://www.phpmyadmin.net/
-INHERIT=eutils webapp
+INHERIT=webapp
 IUSE=setup vhosts
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=4.9.6
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.9.6/phpMyAdmin-4.9.6-all-languages.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	webapp	990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=7587a42306ff777b9a5530e25ab9b15f
+_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_md5_=3798a4f48b60210781e87817b3b74fcd
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-5.0.3 b/metadata/md5-cache/dev-db/phpmyadmin-5.0.3
index 06006e23d64b..396262545c8b 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-5.0.3
+++ b/metadata/md5-cache/dev-db/phpmyadmin-5.0.3
@@ -3,12 +3,12 @@ DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-
 DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=7
 HOMEPAGE=https://www.phpmyadmin.net/
-INHERIT=eutils webapp
+INHERIT=webapp
 IUSE=setup vhosts
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-7.1[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=5.0.3
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/5.0.3/phpMyAdmin-5.0.3-all-languages.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	webapp	990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=042610932f7c14dbcd17af4550eaf9be
+_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_md5_=61bc01d4d9b7bf66e9904a0e667b1d30
diff --git a/metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2 b/metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2
index 4453b3ed3fe7..6c75533573ca 100644
--- a/metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2
+++ b/metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2
@@ -3,7 +3,7 @@ DEPEND=dev-libs/glib media-libs/freetype media-libs/fontconfig >=media-libs/gifl
 DESCRIPTION=Library for using System.Drawing with Mono
 EAPI=6
 HOMEPAGE=https://www.mono-project.com
-INHERIT=eutils dotnet ltprune
+INHERIT=dotnet ltprune
 IUSE=cairo
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib media-libs/freetype media-libs/fontconfig >=media-libs/gif
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/libgdiplus/libgdiplus-6.0.2.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	mono-env	1f24c032c78290b0d9a07d5b343051a7	dotnet	5a25cd2b8e4e32fd100ba24093c46174
-_md5_=ce88f7504a2806fc3ca11f438aa7f94a
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	mono-env	1f24c032c78290b0d9a07d5b343051a7	dotnet	5a25cd2b8e4e32fd100ba24093c46174	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=47ea3853fb48fa449bd3bb4bd408f91a
diff --git a/metadata/md5-cache/dev-embedded/gpsim-0.29.0 b/metadata/md5-cache/dev-embedded/gpsim-0.29.0
index d05020b57e85..5c21e841b5e7 100644
--- a/metadata/md5-cache/dev-embedded/gpsim-0.29.0
+++ b/metadata/md5-cache/dev-embedded/gpsim-0.29.0
@@ -3,12 +3,12 @@ DEPEND=>=dev-embedded/gputils-0.12 !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-l
 DESCRIPTION=A simulator for the Microchip PIC microcontrollers
 EAPI=6
 HOMEPAGE=http://gpsim.sourceforge.net
-INHERIT=eutils ltprune
+INHERIT=ltprune
 IUSE=doc gtk static-libs
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-embedded/gputils-0.12 !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-libs/popt sys-libs/readline:0= gtk? ( >=x11-libs/gtk+extra-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gpsim/gpsim-0.29.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
-_md5_=be419ccfa32184cf2c98cad8fc584520
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=45311e346f78495f134825aa78c5deb3
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.1.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
index ec4662e75eb2..b99315ab703a 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
@@ -3,7 +3,7 @@ DEPEND=virtual/libusb:1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 |
 DESCRIPTION=Library to access J-Link devices
 EAPI=6
 HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
-INHERIT=autotools eutils ltprune
+INHERIT=autotools ltprune
 IUSE=static-libs
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.1.0/libjaylink-0.1.0.tar.bz2
 _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_=d5a29c66473833f7eb69d83c70245bbe
+_md5_=da124b25ddf54f89c87c07392a809451
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.64 b/metadata/md5-cache/dev-embedded/srecord-1.64
index 60c66c36eebc..7c2d8d9ae96c 100644
--- a/metadata/md5-cache/dev-embedded/srecord-1.64
+++ b/metadata/md5-cache/dev-embedded/srecord-1.64
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libgcrypt:0 dev-libs/boost sys-apps/groff test? ( app-arch/sharu
 DESCRIPTION=A collection of powerful tools for manipulating EPROM load files
 EAPI=6
 HOMEPAGE=http://srecord.sourceforge.net/
-INHERIT=eutils autotools ltprune
+INHERIT=autotools ltprune
 IUSE=static-libs test
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/srecord/srecord-1.64.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_=3584b7f43174de3ea9764cdbe54dba42
+_md5_=1988968049d44b143f2fb9dc26428cbb
diff --git a/metadata/md5-cache/dev-embedded/sunxi-tools-1.3 b/metadata/md5-cache/dev-embedded/sunxi-tools-1.3
index 43d7e93a2e45..35c0cd9bbef7 100644
--- a/metadata/md5-cache/dev-embedded/sunxi-tools-1.3
+++ b/metadata/md5-cache/dev-embedded/sunxi-tools-1.3
@@ -3,10 +3,10 @@ DEPEND=virtual/libusb
 DESCRIPTION=Tools for Allwinner A10 devices.
 EAPI=6
 HOMEPAGE=http://linux-sunxi.org/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/linux-sunxi/sunxi-tools/archive/v1.3.tar.gz -> sunxi-tools-1.3.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
-_md5_=9496e90c1f834d55d2e0efb2fecdf6fa
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=c2a219b2fa8b57c8c8073fc651fb9333
diff --git a/metadata/md5-cache/dev-go/gogo-protobuf-1.3.1 b/metadata/md5-cache/dev-go/gogo-protobuf-1.3.1
index b974b9a8fc44..344bc3eb1976 100644
--- a/metadata/md5-cache/dev-go/gogo-protobuf-1.3.1
+++ b/metadata/md5-cache/dev-go/gogo-protobuf-1.3.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Protocol Buffers for Go with Gadgets
 EAPI=7
 HOMEPAGE=https://github.com/gogo/protobuf
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=BSD
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/gogo/protobuf/archive/v1.3.1.tar.gz -> gogo-protobuf-1.3.1.tar.gz mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=d4f6bb0bb75e222b86ebaced3c3b2131
+_md5_=3193bddbeb2a13498571f1a56110f5da
diff --git a/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1 b/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
index 40ae91076181..8349c78e0b35 100644
--- a/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
@@ -4,7 +4,7 @@ DEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit >=dev-haskell/cabal-1.2 hscolour
 DESCRIPTION=Bindings to the editline library (libedit)
 EAPI=7
 HOMEPAGE=http://code.haskell.org/editline
-INHERIT=autotools eutils haskell-cabal
+INHERIT=autotools haskell-cabal
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -12,4 +12,4 @@ RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit
 SLOT=0/0.2.1.1
 SRC_URI=https://hackage.haskell.org/package/editline-0.2.1.1/editline-0.2.1.1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b
-_md5_=11fdf8e13c212fd243d615bc01277393
+_md5_=10d5bbcbc642b6b79045dfbfbd44bd00
diff --git a/metadata/md5-cache/dev-haskell/top-1.7 b/metadata/md5-cache/dev-haskell/top-1.7
index 627e1b5d7a91..ad18e7fcd8aa 100644
--- a/metadata/md5-cache/dev-haskell/top-1.7
+++ b/metadata/md5-cache/dev-haskell/top-1.7
@@ -3,7 +3,7 @@ DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc
 DESCRIPTION=Constraint solving framework employed by the Helium Compiler
 EAPI=7
 HOMEPAGE=http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome
-INHERIT=eutils haskell-cabal
+INHERIT=haskell-cabal
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/gh
 SLOT=0/1.7
 SRC_URI=https://hackage.haskell.org/package/Top-1.7/Top-1.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	2f31876646b777a7851b22816735765c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	haskell-cabal	781f607e5fa6b3d28f694be10c79646b
-_md5_=00e067f6b3486f519da6ead7e5196098
+_md5_=98806eb64e10ed2491d0c79072ff9e5b
diff --git a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1 b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
index 310182c5b7eb..54d9a0d94b44 100644
--- a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
+++ b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/ghc-7.8.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hs
 DESCRIPTION=Splittable Unique Identifier Supply
 EAPI=7
 HOMEPAGE=https://github.com/sebfisch/uniqueid/wikis
-INHERIT=eutils haskell-cabal
+INHERIT=haskell-cabal
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ghc-7.8.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/uniqueid-0.1.1/uniqueid-0.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	2f31876646b777a7851b22816735765c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	haskell-cabal	781f607e5fa6b3d28f694be10c79646b
-_md5_=aa27504837595ee8b444ab4383f70dcc
+_md5_=b76019a5fd7bca88ea736ae2bd3ccef9
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9 b/metadata/md5-cache/dev-java/ant-core-1.10.9
index 3cdebe2ee084..cf76bf275a2e 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.9
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration files
 EAPI=7
 HOMEPAGE=https://ant.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=fddae53264dd3fca5861a307f14a2321
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=6a912ac9a4d3c3b5ef08a568cb9bc8b9
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r3 b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r3
index aea902b9bf39..659fbae53862 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r3
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r3
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) dev-java/jsch:0 dev-ja
 DESCRIPTION=Ivy is a free java based dependency manager
 EAPI=7
 HOMEPAGE=https://ant.apache.org/ivy/
-INHERIT=java-pkg-2 java-ant-2 eutils
+INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
-_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=ebca6278a48a239b4a0d275013662ae2
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=c02cadf4b35d8c7d4121f3330bd6443e
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2-r1 b/metadata/md5-cache/dev-java/antlr-3.5.2-r1
index 85183083153e..3b3f2e73a08b 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.2-r1
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2-r1
@@ -3,7 +3,7 @@ DEPEND=dev-java/stringtemplate:4 >=virtual/jdk-1.8 test? ( dev-java/junit:4 ) >=
 DESCRIPTION=A parser generator for many languages
 EAPI=7
 HOMEPAGE=https://www.antlr3.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=dev-java/stringtemplate:4 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=3.5
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz https://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=88a8cf78e54eb71949a13e2b147fbc53
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=358303c2eaef500c4608b300ae54503e
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
index a708c2db30d6..83ad4a1669aa 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 DESCRIPTION=OO database written in Java
 EAPI=6
 HOMEPAGE=http://www.cdegroot.com/software/db/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=03c3ca44829823043a59540691fd7e2b
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=3753eaa1cfbc636eb50e8d6922ae9fa8
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1-r1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1-r1
index da943566b382..71da5078bae4 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1-r1
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 DESCRIPTION=GNU implementation of the JavaBeans Activation Framework
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/classpathx/jaf/jaf.html
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=2d1a7d5aed8f0696b326af41ff681aa3
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=b313b62695649781839eb60d1d44d4c4
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r3 b/metadata/md5-cache/dev-java/jdbm-0.12-r3
index 1e139ed0539f..cab21146e4c2 100644
--- a/metadata/md5-cache/dev-java/jdbm-0.12-r3
+++ b/metadata/md5-cache/dev-java/jdbm-0.12-r3
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3 source?
 DESCRIPTION=Jdbm aims to be for Java what GDBM is for Perl, Python, C, ...
 EAPI=6
 HOMEPAGE=http://jdbm.sourceforge.net/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/jdbm/jdbm-0.12-src.zip
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=bc32d515f6bc8404cf01dd7f1c94c36e
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=b8a3aa02f8d09596c43e6117b1ccb8ac
diff --git a/metadata/md5-cache/dev-java/jna-4.2.2-r1 b/metadata/md5-cache/dev-java/jna-4.2.2-r1
index ab83c4f7bb8f..3adf52711ab6 100644
--- a/metadata/md5-cache/dev-java/jna-4.2.2-r1
+++ b/metadata/md5-cache/dev-java/jna-4.2.2-r1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libffi >=virtual/jdk-1.7 x11-libs/libXt virtual/pkgconfig test?
 DESCRIPTION=Java Native Access (JNA)
 EAPI=6
 HOMEPAGE=https://github.com/twall/jna
-INHERIT=eutils java-pkg-2 java-ant-2 toolchain-funcs
+INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
 IUSE=+awt +nio-buffers test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( awt nio-buffers )
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/twall/jna/archive/4.2.2.tar.gz -> jna-4.2.2.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=414805607f4512db355a32f6b1d48b33
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=d3839d04a70cf67d472e5801ca21f807
diff --git a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r2 b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r2
index c09cc6e62fcc..4a05aaa4a5d1 100644
--- a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r2
+++ b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r2
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 DESCRIPTION=A selection of libraries for Java
 EAPI=6
 HOMEPAGE=http://www.matthew.ath.cx/projects/java/
-INHERIT=eutils java-pkg-2 flag-o-matic toolchain-funcs
+INHERIT=java-pkg-2 flag-o-matic toolchain-funcs
 IUSE=elibc_FreeBSD doc source
 KEYWORDS=amd64 ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/libmatthew-java-0.7.2.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=2133293aed05a7bf4a5e23dfda0ce144
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=b93d7d4185a4cfc5db275a31670ffbca
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r2 b/metadata/md5-cache/dev-java/qdox-1.12.1-r2
index 4abd90e585d4..26e27752f642 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r2
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r2
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.8 app-arch/unzip:0 dev-java/byaccj:0 >=dev-java/jflex-1.6
 DESCRIPTION=Parser for extracting class/interface/method definitions
 EAPI=7
 HOMEPAGE=https://github.com/codehaus/qdox
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=d75b24a44bf754f987b4e11701a8a03d
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=365726bc2a7a7e577a8405cef263d5b2
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.13 b/metadata/md5-cache/dev-java/sbt-0.13.13
index f0940e986320..9bde2a16caeb 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.13
+++ b/metadata/md5-cache/dev-java/sbt-0.13.13
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.8 dev-lang/scala >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=sbt is a build tool for Scala and Java projects that aims to do the basics well
 EAPI=6
 HOMEPAGE=https://www.scala-sbt.org/
-INHERIT=eutils java-pkg-2
+INHERIT=java-pkg-2
 IUSE=binary elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 dev-lang/scala >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-src.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.13/sbt-launch.jar -> sbt-launch-0.13.13.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.13-gentoo-binary.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
-_md5_=005b3a9254084564f3b89bbca748bcee
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
+_md5_=4f028ee99085e12312946b85e649cd8f
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.18 b/metadata/md5-cache/dev-java/sbt-0.13.18
index 63f1b332681b..6ee3e8021804 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.18
+++ b/metadata/md5-cache/dev-java/sbt-0.13.18
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=sbt is a build tool for Scala and Java projects that aims to do the basics well
 EAPI=7
 HOMEPAGE=https://www.scala-sbt.org/
-INHERIT=eutils java-pkg-2
+INHERIT=java-pkg-2
 IUSE=binary elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://github.com/sbt/sbt/archive/v0.13.18.tar.gz -> sbt-0.13.18.tar.gz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.18/sbt-launch.jar -> sbt-launch-0.13.18.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.18-gentoo-binary.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
-_md5_=e52210c06189a66de556f0507b08cfb4
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
+_md5_=c01631ce67fc9fb64753e552c1520790
diff --git a/metadata/md5-cache/dev-java/swt-4.10 b/metadata/md5-cache/dev-java/swt-4.10
index a387ef7b4245..415ae895f1ff 100644
--- a/metadata/md5-cache/dev-java/swt-4.10
+++ b/metadata/md5-cache/dev-java/swt-4.10
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-li
 DESCRIPTION=GTK based SWT Library
 EAPI=6
 HOMEPAGE=http://www.eclipse.org/
-INHERIT=eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+INHERIT=flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 IUSE=cairo opengl webkit elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=4.10
 SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_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	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-osgi	303099c377fa3ce30c97f39ebecb351f
-_md5_=dd8d8f34dc213de4f9514e2ae4fa1b0a
+_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	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-osgi	303099c377fa3ce30c97f39ebecb351f
+_md5_=d6aec3a190b9a91fc40c430087340e60
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.4 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.4
index 86760553d8a3..418a49f8c785 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.4
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.4
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.4/src/apache-tomcat-10.0.4-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=6905972ddfe06acef21ec40225ba2052
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=06ff0b94e9c5ead5e373055e33dc44d0
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.5
index 0696c5439efc..841ea4aabaf8 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.5
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.5
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.5/src/apache-tomcat-10.0.5-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=c11eb473bf529ef62c23c50551ffa974
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=7d7455ac4a17690a8eba944f0809f4d5
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
index 271ee832cb49..9a77dc5e4f4b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r
 DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 java-osgi
+INHERIT=java-pkg-2 java-ant-2 java-osgi
 IUSE=doc source elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-osgi	303099c377fa3ce30c97f39ebecb351f
-_md5_=f8c65c245b750f0fcc92383bc395f4e3
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-osgi	303099c377fa3ce30c97f39ebecb351f
+_md5_=4b8bf16242f0063a44eae9a9e39956fc
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
index 5ebfc488c214..a09a9cbe52f6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-6/v6.0.53/src/apache-tomcat-6.0.53-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=dd995cc17756b64f06dd54aa7d301ec9
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=7feb501f26908fad76ac7ee5a6e17972
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
index c1e08a9f3a9c..7a93d52a8a32 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.108/src/apache-tomcat-7.0.108-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=84ca087d9e44f8ecfa756a807a396339
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=762814fb31c81990673f362c86590a58
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.64 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.64
index 00dec7f2c69c..53261217c82b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.64
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.64
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.64/src/apache-tomcat-8.5.64-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=24681239837549a0a0d8dc8d812a89b1
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=058f031a1fa50c11c0747ad72f5f4ba1
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65
index 705ca2ad3ffa..9446bcf76ea1 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.65/src/apache-tomcat-8.5.65-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=041a2bc5c1231962ec4cfaf942924a30
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=6bfb744c21b3aef71221b585819bbcf5
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.44 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.44
index 0fa1e2c52a82..98baf1c40a88 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.44
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.44
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.44/src/apache-tomcat-9.0.44-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=11a9ce21cf6ab890baac29191d441599
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=9f2084a5772ab3aed22eeadd03b30783
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45
index 06eff09e6399..ebf83ac2b499 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
 IUSE=elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.45/src/apache-tomcat-9.0.45-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=c3069b971d949c8f5e15335c5f092adc
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=c59d1e92e3aa4d312e664abc9fb6a785
diff --git a/metadata/md5-cache/dev-lang/R-3.4.1 b/metadata/md5-cache/dev-lang/R-3.4.1
index 7c2a9e2fd649..3ccfb34f2c88 100644
--- a/metadata/md5-cache/dev-lang/R-3.4.1
+++ b/metadata/md5-cache/dev-lang/R-3.4.1
@@ -3,7 +3,7 @@ DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-lib
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=6
 HOMEPAGE=http://www.r-project.org/
-INHERIT=bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
+INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 multilib versionator toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
 KEYWORDS=amd64 arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
@@ -13,4 +13,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.4.1.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=dba02ed16b1750a997aa8de85f3fc112
+_md5_=4ad2374af6b29457953b37d9a5defaee
diff --git a/metadata/md5-cache/dev-lang/R-3.6.3-r1 b/metadata/md5-cache/dev-lang/R-3.6.3-r1
index a23bf9762435..cbeb9ebe9bbf 100644
--- a/metadata/md5-cache/dev-lang/R-3.6.3-r1
+++ b/metadata/md5-cache/dev-lang/R-3.6.3-r1
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=7
 HOMEPAGE=http://www.r-project.org/
-INHERIT=bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib toolchain-funcs
+INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 multilib toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X
 KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
@@ -14,4 +14,4 @@ RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.6.3.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969
-_md5_=a1a6c22efc6505eae63b641d716a56d2
+_md5_=d7b5d64cd97b56eda93ffc1f4e23eb63
diff --git a/metadata/md5-cache/dev-lang/R-4.0.2 b/metadata/md5-cache/dev-lang/R-4.0.2
index 473ebde16f92..a2f12fdac624 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.2
+++ b/metadata/md5-cache/dev-lang/R-4.0.2
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=7
 HOMEPAGE=http://www.r-project.org/
-INHERIT=bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib toolchain-funcs
+INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 multilib toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X
 KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
@@ -14,4 +14,4 @@ RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.0.2.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969
-_md5_=4140287bbfebd91258f0b6c1f8c1d885
+_md5_=f0f556c67f3ee00a2f589ca9a301a0cb
diff --git a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1 b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
index 8ef479b7648a..dc4458484735 100644
--- a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
+++ b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
@@ -4,12 +4,12 @@ DEPEND=>=virtual/jdk-1.6:= dev-java/ant-core >=dev-java/java-config-2.2.0-r3 >=d
 DESCRIPTION=GNU Prolog for Java is an implementation of ISO Prolog as a Java library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gnuprologjava
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=doc elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=>=virtual/jdk-1.6:= >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gnu/gnuprologjava/gnuprologjava-0.2.6-src.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=e35d18589bd5143a3c085289946dec2d
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=216e2b7ed3db677fd52569da40cd38ca
diff --git a/metadata/md5-cache/dev-lang/hy-0.17.0 b/metadata/md5-cache/dev-lang/hy-0.17.0
index 29e5571e9048..819e9cacdda2 100644
--- a/metadata/md5-cache/dev-lang/hy-0.17.0
+++ b/metadata/md5-cache/dev-lang/hy-0.17.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/astor-0.7.1[python_targets_python3_7(-)?,-python_single_targ
 DESCRIPTION=A LISP dialect running in python
 EAPI=7
 HOMEPAGE=http://hylang.org/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.17.0.tar.gz -> hy-0.17.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=4a0b803a1dede500b376132a03f5fd8b
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=9a1184688eabced7ad9dda18b92260ec
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.78-r2 b/metadata/md5-cache/dev-lang/jimtcl-0.78-r2
index 3db091f25294..20d41425fc9f 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-0.78-r2
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.78-r2
@@ -8,5 +8,4 @@ KEYWORDS=amd64 arm ~arm64 ~m68k ~mips ~s390 x86
 LICENSE=LGPL-2
 SLOT=0/78
 SRC_URI=https://github.com/msteveb/jimtcl/archive/0.78.tar.gz -> jimtcl-0.78.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e65599591acd70bb5e2f2a8bff232b31
+_md5_=e5385601d0e81a10cc782d6b72686fd1
diff --git a/metadata/md5-cache/dev-lang/mercury-20.06 b/metadata/md5-cache/dev-lang/mercury-20.06
index 79e425575fdf..fe63c0004eec 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.06
+++ b/metadata/md5-cache/dev-lang/mercury-20.06
@@ -4,7 +4,7 @@ DEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/e
 DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language
 EAPI=7
 HOMEPAGE=https://www.mercurylang.org/index.html
-INHERIT=autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+INHERIT=autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 IUSE=debug doc emacs erlang examples java mono profile readline threads trail elibc_FreeBSD java
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
@@ -12,4 +12,4 @@ RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release-20.06/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.06-gentoo-patchset-1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92546f607ad12c5df3471b602381460e
+_md5_=95c9a35a382b92aea4010d3207792908
diff --git a/metadata/md5-cache/dev-lang/mercury-extras-20.06 b/metadata/md5-cache/dev-lang/mercury-extras-20.06
index 99b68914fe7b..6b43a0d8eed0 100644
--- a/metadata/md5-cache/dev-lang/mercury-extras-20.06
+++ b/metadata/md5-cache/dev-lang/mercury-extras-20.06
@@ -3,7 +3,7 @@ DEPEND=~dev-lang/mercury-20.06 cairo? ( >=x11-libs/cairo-1.10.0 ) gmp? ( dev-lib
 DESCRIPTION=Additional libraries and tools that are not part of the Mercury standard library
 EAPI=7
 HOMEPAGE=https://www.mercurylang.org/index.html
-INHERIT=eutils multilib toolchain-funcs vcs-clean
+INHERIT=multilib toolchain-funcs vcs-clean
 IUSE=cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
@@ -11,5 +11,5 @@ RDEPEND=~dev-lang/mercury-20.06 cairo? ( >=x11-libs/cairo-1.10.0 ) gmp? ( dev-li
 REQUIRED_USE=?? ( odbc iodbc )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury-extras/mercury-extras-20.06-gentoo-patchset-0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73f33e44fad93b6fac2c762858dc82b2
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9a9858393b57d1da00f7089dc096ee46
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0-r2 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
index 8c0a2477b1c3..ca533e5704ab 100644
--- a/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
+++ b/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
@@ -4,6 +4,7 @@ DEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-l
 DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
 EAPI=7
 HOMEPAGE=http://www.parrot.org/
+INHERIT=multilib
 IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=Artistic-2
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-
 RESTRICT=test
 SLOT=0/8.1.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=697de77db6e05329133e57e748570760
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9b8f3484cb4741f5202bc62db0bb380a
diff --git a/metadata/md5-cache/dev-lang/qu-prolog-10.6 b/metadata/md5-cache/dev-lang/qu-prolog-10.6
index ad58c7ab112a..97fc61a8fede 100644
--- a/metadata/md5-cache/dev-lang/qu-prolog-10.6
+++ b/metadata/md5-cache/dev-lang/qu-prolog-10.6
@@ -4,12 +4,12 @@ DEPEND=!dev-util/mpatch !dev-util/rej qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 )
 DESCRIPTION=Extended Prolog supporting quantifiers, object-variables and substitutions
 EAPI=7
 HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html
-INHERIT=autotools eutils multilib qmake-utils
+INHERIT=autotools multilib qmake-utils
 IUSE=debug doc examples pedro qt5 readline threads
 KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0 GPL-2+
 RDEPEND=!dev-util/mpatch !dev-util/rej qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
 SLOT=0
 SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp10.6.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
-_md5_=346dbaf8f424000bf9388dde28b76769
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
+_md5_=75b79ff88beab78a95d6cd0f0e579b87
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.10 b/metadata/md5-cache/dev-lang/scala-2.12.10
index 4a46a78cddc1..6acb0deb21c1 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.10
+++ b/metadata/md5-cache/dev-lang/scala-2.12.10
@@ -3,7 +3,7 @@ DEPEND=dev-java/ant-core:0 dev-java/jline:2 !binary? ( >=virtual/jdk-1.8:* >=dev
 DESCRIPTION=The Scala Programming Language
 EAPI=7
 HOMEPAGE=https://www.scala-lang.org/
-INHERIT=eutils check-reqs java-pkg-2
+INHERIT=check-reqs java-pkg-2
 IUSE=binary emacs elibc_FreeBSD doc source
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,5 +11,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/jline:2 >=virtual/jre-1.8:* app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.10
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.10.tar.gz -> scala-2.12.10.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.10-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.10-sbt-deps.tar.xz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.12.10-gentoo-binary.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	check-reqs	97b90bd8fb799993925e6b3a683184e5	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
-_md5_=cb52340e405eb4da2ac923b0138b0c49
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
+_md5_=2b772209e62a80e67c79d349df29cdce
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.4 b/metadata/md5-cache/dev-lang/scala-2.12.4
index 3d72fb4a3ada..ab6a4d40c620 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.4
+++ b/metadata/md5-cache/dev-lang/scala-2.12.4
@@ -3,7 +3,7 @@ DEPEND=dev-java/ant-core:0 dev-java/jline:2 !binary? ( =virtual/jdk-1.8* >=dev-j
 DESCRIPTION=The Scala Programming Language
 EAPI=6
 HOMEPAGE=https://www.scala-lang.org/
-INHERIT=eutils check-reqs java-pkg-2 versionator
+INHERIT=check-reqs java-pkg-2 versionator
 IUSE=binary emacs elibc_FreeBSD doc source
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,5 +11,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/jline:2 >=virtual/jre-1.8 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.4.tar.gz -> scala-2.12.4.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.12.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.12.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.12.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.12.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.12.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.12.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.12.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.12.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.12.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.12.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.12.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.12.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.12.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.12.4-instrumented.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.12.4-gentoo-binary.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	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
-_md5_=241a454b6e7bd4edab791011bd8c8577
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
+_md5_=012fc42ee9c48aea31dc3c8f2b4cf7e6
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.2.2 b/metadata/md5-cache/dev-lang/swi-prolog-8.2.2
index d22f358dbbd0..c4af8283478f 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.2.2
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.2.2
@@ -4,7 +4,7 @@ DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb?
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
 HOMEPAGE=https://www.swi-prolog.org/
-INHERIT=cmake-utils eutils flag-o-matic multilib
+INHERIT=cmake-utils flag-o-matic multilib
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.2.2.tar.gz https://dev.gentoo.org/~keri/distfiles/swi-prolog/swi-prolog-8.2.2-gentoo-patchset-0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=5d29a0385a25c0436c58559d97265777
+_md5_=70524f6fa9bcfde1829db9062329f09c
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.2.3 b/metadata/md5-cache/dev-lang/swi-prolog-8.2.3
index f36ad6625dbb..36cb50f9faac 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.2.3
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.2.3
@@ -4,7 +4,7 @@ DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb?
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
 HOMEPAGE=https://www.swi-prolog.org/
-INHERIT=cmake-utils eutils flag-o-matic multilib
+INHERIT=cmake-utils flag-o-matic multilib
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.2.3.tar.gz https://dev.gentoo.org/~keri/distfiles/swi-prolog/swi-prolog-8.2.3-gentoo-patchset-0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=1f54cb56a6d55cea835bfe8b935da4f6
+_md5_=1f1d1bb189b3ab4125144ff71598332a
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.18 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.18
index 95273e35779c..d336cb593a86 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.18
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.18
@@ -4,7 +4,7 @@ DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb?
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
 HOMEPAGE=http://www.swi-prolog.org/
-INHERIT=cmake-utils eutils flag-o-matic multilib
+INHERIT=cmake-utils flag-o-matic multilib
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.3.18.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=0e354f9b4d4ede86db68c9ae165c060d
+_md5_=b16f25081bcbb894355fbd228689ee23
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.19 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.19
index ecfc63b728af..0d86c2bc4a55 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.19
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.19
@@ -4,7 +4,7 @@ DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb?
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
 HOMEPAGE=http://www.swi-prolog.org/
-INHERIT=cmake-utils eutils flag-o-matic multilib
+INHERIT=cmake-utils flag-o-matic multilib
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.3.19.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=0e354f9b4d4ede86db68c9ae165c060d
+_md5_=b16f25081bcbb894355fbd228689ee23
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.20 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.20
index 925f26a1421f..edc339ec69c3 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.20
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.20
@@ -4,7 +4,7 @@ DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb?
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
 HOMEPAGE=http://www.swi-prolog.org/
-INHERIT=cmake-utils eutils flag-o-matic multilib
+INHERIT=cmake-utils flag-o-matic multilib
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.3.20.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=0e354f9b4d4ede86db68c9ae165c060d
+_md5_=b16f25081bcbb894355fbd228689ee23
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.21 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.21
index c67f43560431..22b1d76e43b6 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.3.21
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.21
@@ -4,7 +4,7 @@ DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb?
 DESCRIPTION=versatile implementation of the Prolog programming language
 EAPI=7
 HOMEPAGE=http://www.swi-prolog.org/
-INHERIT=cmake-utils eutils flag-o-matic multilib
+INHERIT=cmake-utils flag-o-matic multilib
 IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.3.21.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=0e354f9b4d4ede86db68c9ae165c060d
+_md5_=b16f25081bcbb894355fbd228689ee23
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.8 b/metadata/md5-cache/dev-lang/tcl-8.6.8
index 2437beff36fb..c6a71ce9a936 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.8
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.8
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
-INHERIT=autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+INHERIT=autotools flag-o-matic multilib multilib-minimal toolchain-funcs versionator
 IUSE=debug +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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=tcltk
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.8-src.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	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=b26fc064ba4636539b5912f6735400f6
+_md5_=989af732ea39b4f7292333e51a2280e5
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.8 b/metadata/md5-cache/dev-lang/tk-8.6.8
index ae310df92441..6a2afbb44168 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.8
+++ b/metadata/md5-cache/dev-lang/tk-8.6.8
@@ -3,7 +3,7 @@ DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,ab
 DESCRIPTION=Tk Widget Set
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
-INHERIT=autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
+INHERIT=autotools multilib multilib-minimal prefix toolchain-funcs versionator virtualx
 IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=tcltk
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.8-src.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=fd3dc5573cc9ca1a833e8f893a744ac0
+_md5_=80df4b693d2faaed547b67e8547896ff
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.1.0-r1 b/metadata/md5-cache/dev-lang/tuprolog-3.1.0-r1
index 05ffafdac5bd..51d0cd75c32a 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.1.0-r1
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.1.0-r1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 dev-ja
 DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
 EAPI=7
 HOMEPAGE=http://tuprolog.unibo.it/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3 BSD
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~keri/distfiles/tuprolog/tuprolog-3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=57125da5d63d00643a65327b89402ac3
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=3ea68bcf8f11e191c870e22991499f71
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.2.0 b/metadata/md5-cache/dev-lang/tuprolog-3.2.0
index 6223ba5d8e30..2be691c7dee3 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.2.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.2.0
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 dev-ja
 DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
 EAPI=7
 HOMEPAGE=http://tuprolog.unibo.it/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3 BSD
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 dev-j
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~keri/distfiles/tuprolog/tuprolog-3.2.0.tar.gz https://dev.gentoo.org/~keri/distfiles/tuprolog/tuprolog-3.2.0-gentoo-patchset-0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=f6b30226d658522d704d0cf56fa8d50e
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=170317e3c6b1a573bad6490df5d5cff2
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.4 b/metadata/md5-cache/dev-lang/yap-6.3.4
index b2493f8caf4d..7fe84edc1022 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.4
+++ b/metadata/md5-cache/dev-lang/yap-6.3.4
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libutf8proc sys-libs/zlib gmp? ( dev-libs/gmp:0 ) java? ( >=virt
 DESCRIPTION=YAP is a high-performance Prolog compiler
 EAPI=7
 HOMEPAGE=http://www.dcc.fc.up.pt/~vsc/Yap/
-INHERIT=cmake-utils eutils flag-o-matic multilib python-r1
+INHERIT=cmake-utils flag-o-matic multilib python-r1
 IUSE=R debug doc examples gmp java mpi mysql odbc postgres python raptor readline sqlite ssl static threads xml python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=Artistic LGPL-2
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/vscosta/yap-6.3/archive/YAP-6.3.4.tar.gz https://dev.gentoo.org/~keri/distfiles/yap/yap-6.3.4-gentoo-patchset-0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
-_md5_=b5c364077f1c39de77e8d49f48f9a69f
+_md5_=22183b81c17e6d32ea3c93c3930550e0
diff --git a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912 b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912
index e60e7f3b3bb2..6aab9231483f 100644
--- a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912
+++ b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912
@@ -2,11 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Fork of zlib-like interface to fast block compression (LZ4 or FastLZ) libraries
 EAPI=5
 HOMEPAGE=https://github.com/bareos/fastlzlib
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-1 BSD-2
 RDEPEND=!app-arch/lz4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/bareos-fastlzlib-0_pre20140912.zip
-_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
-_md5_=ab5801198fe880d4f8ad7e51fd25ba67
+_md5_=aa978dcecd30280b53db70947ee65291
diff --git a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524 b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
index 49560fb6afdb..cab1e8438160 100644
--- a/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
+++ b/metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20150524
@@ -2,11 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Fork of zlib-like interface to fast block compression (LZ4 or FastLZ) libraries
 EAPI=5
 HOMEPAGE=https://github.com/bareos/fastlzlib
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-1 BSD-2
 RDEPEND=!app-arch/lz4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/bareos-fastlzlib-0_pre20150524.zip
-_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
-_md5_=d6f68fa26f3ec1f194815f6c9cd847ec
+_md5_=1a077cafd7e7ef4dc8f474f698c6e502
diff --git a/metadata/md5-cache/dev-libs/cl-1.2.3 b/metadata/md5-cache/dev-libs/cl-1.2.3
index 715f06166863..b5f268435ee6 100644
--- a/metadata/md5-cache/dev-libs/cl-1.2.3
+++ b/metadata/md5-cache/dev-libs/cl-1.2.3
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 DESCRIPTION=OpenCL bindings for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/tonyrog/cl
-INHERIT=eutils multilib
+INHERIT=multilib
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 SLOT=0
 SRC_URI=https://github.com/tonyrog/cl/archive/cl-1.2.3.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
-_md5_=1c6c1eab3722e264ea44274e4e81c23b
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=521f019df741d4a792b80471e23b134f
diff --git a/metadata/md5-cache/dev-libs/cl-1.2.4 b/metadata/md5-cache/dev-libs/cl-1.2.4
index 2da89575460b..c7a9a2140a5a 100644
--- a/metadata/md5-cache/dev-libs/cl-1.2.4
+++ b/metadata/md5-cache/dev-libs/cl-1.2.4
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 DESCRIPTION=OpenCL bindings for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/tonyrog/cl
-INHERIT=eutils multilib
+INHERIT=multilib
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 SLOT=0
 SRC_URI=https://github.com/tonyrog/cl/archive/cl-1.2.4.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
-_md5_=a584a53f294a3942a6eaa77b569acda7
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=ce029572606cbd17900b0e96ab1dbb65
diff --git a/metadata/md5-cache/dev-libs/cl-9999 b/metadata/md5-cache/dev-libs/cl-9999
index eca6a252c4c3..a090c814f481 100644
--- a/metadata/md5-cache/dev-libs/cl-9999
+++ b/metadata/md5-cache/dev-libs/cl-9999
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar >=dev-vcs/git-1.8.2.1[
 DESCRIPTION=OpenCL bindings for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/tonyrog/cl
-INHERIT=eutils git-r3 multilib
+INHERIT=git-r3 multilib
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
 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	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=6baa4870bd6b5243086d79707a1a2910
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8ebe4266df1d7980a0c8a1f436c14439
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
index 05b2aa89df55..f56b859e5828 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
@@ -4,12 +4,12 @@ DEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml?
 DESCRIPTION=REINER SCT cyberJack USB chipcard reader user space driver
 EAPI=7
 HOMEPAGE=https://www.reiner-sct.de/
-INHERIT=autotools flag-o-matic toolchain-funcs udev
+INHERIT=autotools toolchain-funcs udev
 IUSE=static-libs threads tools +udev +usb xml
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 SLOT=0
 SRC_URI=https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP14/pcsc-cyberjack_3.99.5final.SP14.tar.gz -> pcsc-cyberjack_3.99.5final.SP14.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	c0964e43ba712cb933da5f65b958fa88	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=5334e087e24d64b7cbb94fbba7053a79
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c7667b8964eff397a14a0e3fac34c8f2
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
index eb25ea42e280..1dcd54db8550 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
@@ -4,7 +4,7 @@ DEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courier
 DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
 EAPI=7
 HOMEPAGE=https://www.cyrusimap.org/sasl/
-INHERIT=eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
+INHERIT=flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
 IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 elibc_FreeBSD java
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-with-attribution
@@ -12,5 +12,5 @@ RDEPEND=net-mail/mailbase virtual/libcrypt:= authdaemond? ( || ( net-mail/courie
 REQUIRED_USE=ldapdb? ( openldap )
 SLOT=2
 SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	pam	b097695df28f3974e3af860d6704d4f2	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	db-use	063d3e7add942762a8203b52ec3066c2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=c13954188353ab8104499a8e0e82f39d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	pam	b097695df28f3974e3af860d6704d4f2	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	db-use	063d3e7add942762a8203b52ec3066c2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=9768ff98188e71c143edd0d2f4b481d7
diff --git a/metadata/md5-cache/dev-libs/eventlog-0.2.12 b/metadata/md5-cache/dev-libs/eventlog-0.2.12
index 9eeebf397a2e..7747a797448f 100644
--- a/metadata/md5-cache/dev-libs/eventlog-0.2.12
+++ b/metadata/md5-cache/dev-libs/eventlog-0.2.12
@@ -3,11 +3,11 @@ DEPEND=>=app-portage/elt-patches-20170815
 DESCRIPTION=Support library for syslog-ng
 EAPI=5
 HOMEPAGE=http://www.balabit.com/products/syslog_ng/
-INHERIT=libtool eutils ltprune
+INHERIT=eutils libtool ltprune
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_0.2.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=faba37e327c06e6cafc6daaa569b07b8
+_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	libtool	f143db5a74ccd9ca28c1234deffede96
+_md5_=83f897582921b89f1c4bca9311b56455
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.10 b/metadata/md5-cache/dev-libs/expat-2.2.10
index 66b4fb903a2d..301d4e5faf66 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.10
+++ b/metadata/md5-cache/dev-libs/expat-2.2.10
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stream-oriented XML parser library
 EAPI=7
 HOMEPAGE=https://libexpat.github.io/
-INHERIT=autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
+INHERIT=autotools multilib-minimal usr-ldscript
 IUSE=elibc_FreeBSD examples static-libs 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=40ce54a5b3b3bf71b0499acf18efffd2
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=1169c670c354a990859cc12845ffe9a2
diff --git a/metadata/md5-cache/dev-libs/expat-2.3.0 b/metadata/md5-cache/dev-libs/expat-2.3.0
index 25daa9b875c7..c1ca5501e0f2 100644
--- a/metadata/md5-cache/dev-libs/expat-2.3.0
+++ b/metadata/md5-cache/dev-libs/expat-2.3.0
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stream-oriented XML parser library
 EAPI=7
 HOMEPAGE=https://libexpat.github.io/
-INHERIT=autotools eutils libtool multilib toolchain-funcs multilib-minimal usr-ldscript
+INHERIT=autotools multilib-minimal usr-ldscript
 IUSE=elibc_FreeBSD examples static-libs 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_3_0/expat-2.3.0.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=2c89bf1f7fce005b6501eabc5f50637d
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=6d49106807492fa69061f550072e2c41
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.1 b/metadata/md5-cache/dev-libs/ffcall-2.1
index bac6055c9efb..d5f0443fc681 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.1
+++ b/metadata/md5-cache/dev-libs/ffcall-2.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Build foreign function call interfaces in embedded interpreter
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libffcall/
-INHERIT=eutils flag-o-matic ltprune toolchain-funcs
+INHERIT=flag-o-matic ltprune
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=e116652fb5e932dc517fcddecb926039
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=c0d0d19a5dac57272488b09a04cd59ed
diff --git a/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1 b/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
index 212600d70bf2..16ca19bb0a20 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
+++ b/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/go-1.3
 DESCRIPTION=FUSE bindings for Go
 EAPI=5
 HOMEPAGE=https://github.com/hanwen/go-fuse
-INHERIT=eutils vcs-clean
+INHERIT=vcs-clean
 KEYWORDS=~amd64
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/hanwen/go-fuse/archive/8c85ded140ac1889372a0e22d8d21e3d10a303bd.tar.gz -> go-fuse-0_p20140812.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
-_md5_=0f4d7b263fd59101eb002da02eda3ebc
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=591bfbd0335f6c2b8fd50c1da3ee0c12
diff --git a/metadata/md5-cache/dev-libs/go-fuse-0_p20150422 b/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
index f8a8dc232044..cff4e2ff5c55 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
+++ b/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/go-1.3
 DESCRIPTION=FUSE bindings for Go
 EAPI=5
 HOMEPAGE=https://github.com/hanwen/go-fuse
-INHERIT=eutils vcs-clean
+INHERIT=vcs-clean
 KEYWORDS=~amd64
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/hanwen/go-fuse/archive/ffed29ec8b88f61c1b8954134cc48ef03bb26ce1.tar.gz -> go-fuse-0_p20150422.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
-_md5_=ff30d154fd130beb8a080a8256686b94
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=167aeea633f2d574874372726bdb5057
diff --git a/metadata/md5-cache/dev-libs/go-fuse-9999 b/metadata/md5-cache/dev-libs/go-fuse-9999
index 04184f5251a1..6d31d4a31e71 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-9999
+++ b/metadata/md5-cache/dev-libs/go-fuse-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=strip
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3fd4ae51dff5dd8398e6b806f838e30
+_md5_=380779320a01a317e81c871e490cd43c
diff --git a/metadata/md5-cache/dev-libs/go-usb-9999 b/metadata/md5-cache/dev-libs/go-usb-9999
index 99eb3cfc5771..70f851d98755 100644
--- a/metadata/md5-cache/dev-libs/go-usb-9999
+++ b/metadata/md5-cache/dev-libs/go-usb-9999
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/go-1.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=CGO bindings for libusb
 EAPI=5
 HOMEPAGE=https://github.com/hanwen/usb
-INHERIT=git-r3 multilib
+INHERIT=git-r3
 LICENSE=BSD
 PROPERTIES=live
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=593a85ee9257499a4ffc7652cd3529cd
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=da3baa614f660d7987a30bf06a70603d
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
index bf33c76f3c10..5fcf62aa7f35 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/gobject-introspection-common-1.66.1 >=dev-libs/glib-2.58.0:2 d
 DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-INHERIT=gnome.org meson python-single-r1 toolchain-funcs xdg
+INHERIT=gnome.org meson python-single-r1 xdg
 IUSE=doctool gtk-doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.66/gobject-introspection-1.66.1.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=f32b282bc8735e20fe0e6cd7f3352240
+_md5_=5ed1e801c2c278ed8f7c83824bb191d1
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
index f06547353760..6ad55f13faf1 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.68.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/gobject-introspection-common-1.68.0 >=dev-libs/glib-2.58.0:2 d
 DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-INHERIT=gnome.org meson python-single-r1 toolchain-funcs xdg
+INHERIT=gnome.org meson python-single-r1 xdg
 IUSE=doctool gtk-doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=a95ece316be940040e7887bbc022439f
+_md5_=e2d015e0f0bb6ef8120b673fff2df350
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.2.1 b/metadata/md5-cache/dev-libs/jemalloc-5.2.1
index c8d7557b162b..8c610eca95af 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.2.1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.2.1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
 EAPI=7
 HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
-INHERIT=autotools toolchain-funcs multilib-minimal
+INHERIT=autotools multilib-minimal
 IUSE=debug hardened lazy-lock prof static-libs stats xmalloc 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 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=264dcf37d57d82db6c9ef4676fb76049
+_md5_=0e104b984fa472818141886125bea0d5
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1 b/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
index cd1dae285938..dc4e69cf3ba8 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jemalloc is a general-purpose scalable concurrent allocator
 EAPI=7
 HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
-INHERIT=autotools toolchain-funcs multilib-minimal
+INHERIT=autotools multilib-minimal
 IUSE=debug lazy-lock prof static-libs stats xmalloc 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 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=f0cda50dde4a3f743ed553baef2b519f
+_md5_=3e177af2fbd5c2367d5f9367ca69733c
diff --git a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1 b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1
index 5136e7b0545a..d31d6d717338 100644
--- a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/gf-complete sys-devel/gnuconfig >=app-portage/elt-patches-201708
 DESCRIPTION=A Library in C Facilitating Erasure Coding for Storage Applications
 EAPI=5
 HOMEPAGE=http://jerasure.org/
-INHERIT=autotools eutils ltprune
+INHERIT=autotools ltprune
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/gf-complete
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/jerasure-2.0.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
-_md5_=9292221f91f5a677c7dd26ba3b5942e3
+_md5_=f128e5d7b0130eb583fca574f90b800b
diff --git a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2 b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
index 2c44d5823c81..6d246f243026 100644
--- a/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
+++ b/metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
@@ -4,11 +4,11 @@ DEPEND=dev-libs/gf-complete
 DESCRIPTION=A Library in C Facilitating Erasure Coding for Storage Applications
 EAPI=7
 HOMEPAGE=http://jerasure.org
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/gf-complete
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/jerasure-2.0.0.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=76aa91fbf4761bd60dd6866dbb4cae57
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=2bae15febc27a4934798574f80825078
diff --git a/metadata/md5-cache/dev-libs/kqoauth-0.98-r3 b/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
index 14f6092d998e..45814199b357 100644
--- a/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
+++ b/metadata/md5-cache/dev-libs/kqoauth-0.98-r3
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
 DESCRIPTION=Library for Qt that implements the OAuth 1.0 authentication specification
 EAPI=7
 HOMEPAGE=https://github.com/kypeli/kQOAuth
+INHERIT=qmake-utils
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/kypeli/kQOAuth/archive/0.98.tar.gz -> kqoauth-0.98.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d202af1a50d8d972b2b36fd5a93031bd
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
+_md5_=5fa26ccb739e0d3c9820b6675ea685db
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.2 b/metadata/md5-cache/dev-libs/leatherman-1.12.2
index 0e72b309cd2d..9eabd8878d6d 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.2
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.2
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*
 DESCRIPTION=A C++ toolkit
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/leatherman
-INHERIT=cmake-utils multilib
+INHERIT=cmake-utils
 IUSE=debug static-libs test
 KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1.12.2
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.2.tar.gz -> leatherman-1.12.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=77380a9cc2b8448455ff4fdb4372d6ad
+_md5_=d3c22dc1d4bd7f7e2d7d8d93b21ab909
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.4 b/metadata/md5-cache/dev-libs/leatherman-1.12.4
index ee3f80a4051b..25b8f5f921b3 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.4
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.4
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*
 DESCRIPTION=A C++ toolkit
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/leatherman
-INHERIT=cmake-utils multilib
+INHERIT=cmake-utils
 IUSE=debug static-libs test
 KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1.12.4
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.4.tar.gz -> leatherman-1.12.4.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=6810043892581cea467811cd1063e28a
+_md5_=d3c22dc1d4bd7f7e2d7d8d93b21ab909
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.18-r2 b/metadata/md5-cache/dev-libs/leveldb-1.18-r2
index 17dccac51722..3172f9b6bd17 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.18-r2
+++ b/metadata/md5-cache/dev-libs/leveldb-1.18-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= static-libs? ( app-arch/snappy[static-libs(-)] ) )
-DESCRIPTION=a fast key-value storage library written at Google
+DESCRIPTION=A fast key-value storage library written at Google
 EAPI=5
 HOMEPAGE=http://leveldb.org/ https://github.com/google/leveldb
-INHERIT=eutils multilib toolchain-funcs versionator
+INHERIT=epatch multilib toolchain-funcs versionator
 IUSE=+snappy static-libs +tcmalloc kernel_FreeBSD
 KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= static-libs? ( app-arch/snappy[static-libs(-)] ) )
 SLOT=0
 SRC_URI=https://github.com/google/leveldb/archive/v1.18.tar.gz -> leveldb-1.18.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=79d60c12c3c2a22d20b9320a54881b12
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=fb26ccc8b39d3e08a2d94d51568b848e
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
index 5fab105bc0eb..127b57823f5e 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=A library to allow applications to export a menu into the Unity Menu bar
 EAPI=6
 HOMEPAGE=https://launchpad.net/libappindicator
-INHERIT=autotools eutils ltprune multilib-minimal vala xdg-utils
+INHERIT=autotools ltprune multilib-minimal vala xdg-utils
 IUSE=+introspection 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 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-3
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=3
 SRC_URI=https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c54e0812d6f854a01882e53a0813903
+_md5_=34895d4ef13860b8021000bfd7d1f214
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
index 325513fc90a1..4c88787aa76a 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
@@ -4,7 +4,7 @@ DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,
 DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libcdio/
-INHERIT=autotools multilib-minimal flag-o-matic
+INHERIT=autotools multilib-minimal
 IUSE=+cxx static-libs test 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
@@ -12,5 +12,5 @@ RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=74c03f37c24efbc08f8ceb6e27a40461
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=a484589a07c3c0f3a583cf9b5586c432
diff --git a/metadata/md5-cache/dev-libs/libclthreads-2.4.2 b/metadata/md5-cache/dev-libs/libclthreads-2.4.2
index 986f601f62e1..4a6665c7bc46 100644
--- a/metadata/md5-cache/dev-libs/libclthreads-2.4.2
+++ b/metadata/md5-cache/dev-libs/libclthreads-2.4.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=POSIX threads C++ access library
 EAPI=7
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/index.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-2.4.2.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=873c4f5d2f1f353ca6365097c3bcc59e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=7c313e5eca49608ba79230b3af49500e
diff --git a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2 b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
index c2aa906718f6..11b08739b6df 100644
--- a/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
+++ b/metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
@@ -3,7 +3,7 @@ DEPEND=media-libs/libpng:0= doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-p
 DESCRIPTION=A collection of portable C++ classes
 EAPI=5
 HOMEPAGE=http://www.coyotegulch.com/products/libcoyotl/
-INHERIT=eutils autotools ltprune
+INHERIT=autotools epatch ltprune
 IUSE=doc static-libs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libpng:0=
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/libcoyotl-3.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
-_md5_=1a5a29139728016b354cd6854a190b94
+_md5_=347eadbf18be4dbbab659a043f0e62a1
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.19 b/metadata/md5-cache/dev-libs/libdbh-5.0.19
index 1e3c58042e9c..667c8050ae89 100644
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.19
+++ b/metadata/md5-cache/dev-libs/libdbh-5.0.19
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install prepare setup
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a small library to create and manage 64-bit disk based hash tables
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libdbh/
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/dbh/dbh/5.0.19/libdbh2-5.0.19.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_=70c6d1e642a5d169c26f6bebf2db551e
+_md5_=f07381f96d1932d8dc363f788596d707
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1 b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
index 2d4e08247dfc..ec51b2a030be 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare pretend setup test
 DESCRIPTION=Suffix-sorting library (for BWT)
 EAPI=7
 HOMEPAGE=https://github.com/y-256/libdivsufsort
-INHERIT=cmake multilib toolchain-funcs
+INHERIT=cmake toolchain-funcs
 IUSE=openmp
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/y-256/libdivsufsort/archive/2.0.1.tar.gz -> libdivsufsort-2.0.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=9c16d9afcf5330416980d43ed090036d
+_md5_=9a24fe8aae92fa91ece5c4b619668550
diff --git a/metadata/md5-cache/dev-libs/libedit-20191211.3.1 b/metadata/md5-cache/dev-libs/libedit-20191211.3.1
index 8c2582470391..32715f59af40 100644
--- a/metadata/md5-cache/dev-libs/libedit-20191211.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20191211.3.1
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=BSD replacement for libreadline
 EAPI=7
 HOMEPAGE=https://thrysoee.dk/editline/
-INHERIT=autotools multilib-minimal toolchain-funcs usr-ldscript
+INHERIT=autotools 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 arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi
 SLOT=0
 SRC_URI=https://thrysoee.dk/editline/libedit-20191211-3.1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=7e66a85a0986023825eccea917ffa143
+_md5_=5776c97866e4273159efccb94d530606
diff --git a/metadata/md5-cache/dev-libs/libedit-20210216.3.1 b/metadata/md5-cache/dev-libs/libedit-20210216.3.1
index 82ecc9afbed4..81a27ca94399 100644
--- a/metadata/md5-cache/dev-libs/libedit-20210216.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20210216.3.1
@@ -1,15 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install test
 DEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
 DESCRIPTION=BSD replacement for libreadline
 EAPI=7
 HOMEPAGE=https://thrysoee.dk/editline/
-INHERIT=autotools multilib-minimal toolchain-funcs usr-ldscript
+INHERIT=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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?]
 SLOT=0
 SRC_URI=https://thrysoee.dk/editline/libedit-20210216-3.1.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=b785e2f3383092c4604b02b47d1b9c6d
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=926e768a725d4baaebb23eaf69905f87
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
index 836a0ed05a10..e44d905ab01a 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
@@ -3,7 +3,7 @@ DEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-
 DESCRIPTION=A ELF object file access library
 EAPI=6
 HOMEPAGE=http://www.mr511.de/software/
-INHERIT=eutils multilib autotools multilib-minimal
+INHERIT=autotools multilib-minimal
 IUSE=debug nls elibc_FreeBSD 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 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
@@ -11,4 +11,4 @@ RDEPEND=!dev-libs/elfutils
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=bb72a596d0edb37cccd6fbbcf932ee4d
+_md5_=91ff7f90522a585e60c200824b6aa5c5
diff --git a/metadata/md5-cache/dev-libs/liberasurecode-1.6.2 b/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
index f412dc56e01a..9d0f0cc1e62c 100644
--- a/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
+++ b/metadata/md5-cache/dev-libs/liberasurecode-1.6.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/autoconf doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=doc? ( app-doc/doxygen ) 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=Erasure Code API library written in C with pluggable Erasure Code backends.
 EAPI=6
 HOMEPAGE=https://bitbucket.org/tsg-/liberasurecode/overview
-INHERIT=autotools eutils ltprune multilib toolchain-funcs
+INHERIT=autotools ltprune
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/openstack/liberasurecode/archive/1.6.2.tar.gz -> liberasurecode-1.6.2.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_=ba4ec0e101795a93d75fd44a578cd2c1
+_md5_=448c45b709575763c590384ce7999ef4
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
index b91190695e63..bf3f2b4f8a95 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r6
@@ -3,7 +3,7 @@ DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 sys-devel/gnuconfig >=app-portage
 DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=6
 HOMEPAGE=https://www.gnome.org/~veillard/gamin/
-INHERIT=autotools epatch flag-o-matic libtool ltprune gnome.org multilib-minimal
+INHERIT=autotools epatch ltprune gnome.org multilib-minimal
 IUSE=debug kernel_linux 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 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.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	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=32874ac5ac6608d318adb3b361555f7a
+_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=104a0d5157b97da745dea6116ba96545
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.1.1 b/metadata/md5-cache/dev-libs/libgpiod-1.1.1
index 921817b41d87..5647876161c9 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.1.1
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.1.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=C library and tools for interacting with the linux GPIO character device
 EAPI=6
 HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
-INHERIT=multilib multilib-minimal
+INHERIT=multilib-minimal
 IUSE=static-libs +tools 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 ~x86
 LICENSE=LGPL-2.1
 SLOT=0/1
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.1.1.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=f878e066bf8ae8bb317817d0bf70397b
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=18e1371c1de71838bcd7ab08070e7b3b
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.4.1 b/metadata/md5-cache/dev-libs/libgpiod-1.4.1
index 4fb920445e3f..e06e75c0a9a0 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.4.1
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.4.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=C library and tools for interacting with the linux GPIO character device
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
-INHERIT=eutils multilib multilib-minimal
+INHERIT=multilib-minimal
 IUSE=static-libs +tools cxx python test 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 x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.4.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=19ec6c068bf2d2f04ee9c1b2c6e8a129
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=10e633df505f591cc03546d9db6e5688
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.15 b/metadata/md5-cache/dev-libs/libiconv-1.15
index fd6355746c5f..7531823f4998 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.15
+++ b/metadata/md5-cache/dev-libs/libiconv-1.15
@@ -3,7 +3,7 @@ DEPEND=!sys-libs/glibc !sys-libs/musl !userland_GNU? ( !sys-apps/man-pages ) >=a
 DESCRIPTION=GNU charset conversion library for libc which doesn't implement it
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libiconv/
-INHERIT=libtool toolchain-funcs multilib-minimal usr-ldscript
+INHERIT=libtool multilib-minimal usr-ldscript
 IUSE=prefix 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 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+ GPL-3+
@@ -11,4 +11,4 @@ RDEPEND=!sys-libs/glibc !sys-libs/musl !userland_GNU? ( !sys-apps/man-pages )
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.15.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=8219e25728b5dcfc933ab8ce90ecd695
+_md5_=f97d78804b4acd132e78b75e9a918e91
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.24.1 b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
index 1cfedabe25a6..2d7f461f0836 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.24.1
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2
 DESCRIPTION=MATE library to access weather information from online services
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-INHERIT=eapi7-ver mate
+INHERIT=mate
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmateweather-1.24.1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	libtool	f143db5a74ccd9ca28c1234deffede96	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	autotools	9e63f92c2a5d867fea55ecb160c7d354	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	mate	0746707eb54b01af9c594947527af4eb
-_md5_=8ffd8617bb82649b74d05012082a1717
+_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	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	autotools	9e63f92c2a5d867fea55ecb160c7d354	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	mate	0746707eb54b01af9c594947527af4eb
+_md5_=a9c728b056705d53ef2f3ffed6d185ae
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.7.2 b/metadata/md5-cache/dev-libs/libnfc-1.7.2
index ee4b64d43555..cd290f282269 100644
--- a/metadata/md5-cache/dev-libs/libnfc-1.7.2
+++ b/metadata/md5-cache/dev-libs/libnfc-1.7.2
@@ -1,5 +1,6 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 DESCRIPTION=Near Field Communications (NFC) library
 EAPI=7
 HOMEPAGE=http://www.libnfc.org/
@@ -9,5 +10,4 @@ LICENSE=LGPL-3
 RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.7.2/libnfc-1.7.2.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87f23c24088fe358a2aeb8b5a1ee5345
+_md5_=a282821e98d5dca38f841456bf3bbc14
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.8.0 b/metadata/md5-cache/dev-libs/libnfc-1.8.0
index 2094c9cb4955..845d6c637b81 100644
--- a/metadata/md5-cache/dev-libs/libnfc-1.8.0
+++ b/metadata/md5-cache/dev-libs/libnfc-1.8.0
@@ -1,5 +1,6 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 ) doc? ( app-doc/doxygen )
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 DESCRIPTION=Near Field Communications (NFC) library
 EAPI=7
 HOMEPAGE=http://www.libnfc.org/
@@ -9,5 +10,4 @@ LICENSE=LGPL-3
 RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.8.0/libnfc-1.8.0.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87f23c24088fe358a2aeb8b5a1ee5345
+_md5_=a282821e98d5dca38f841456bf3bbc14
diff --git a/metadata/md5-cache/dev-libs/libpcre-debian-8-r2 b/metadata/md5-cache/dev-libs/libpcre-debian-8-r2
index 581e2981139c..c9ff07d7b700 100644
--- a/metadata/md5-cache/dev-libs/libpcre-debian-8-r2
+++ b/metadata/md5-cache/dev-libs/libpcre-debian-8-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=libpcre(posix).so.3 symlinks for compatibility with Debian
 EAPI=6
 HOMEPAGE=http://www.pcre.org/
-INHERIT=multilib multilib-minimal
+INHERIT=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=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libpcre:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=3
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=ce21e5327497138515b6854b727d60a0
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=549f9eda98c84261e4fb5c5ce515caf4
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.2 b/metadata/md5-cache/dev-libs/libpwquality-1.4.2
index 9d82df306890..b1f9ebdb841c 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.2
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.2
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python?
 DESCRIPTION=Library for password quality checking and generating random passwords
 EAPI=7
 HOMEPAGE=https://github.com/libpwquality/libpwquality
-INHERIT=pam python-r1 toolchain-funcs usr-ldscript
+INHERIT=pam python-r1 usr-ldscript
 IUSE=pam python static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.2/libpwquality-1.4.2.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=1c4b79fc1225fbbe0aad09008c1cbcd5
+_md5_=df43d7b7f3cded94936d5185c9a3ee9f
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
index bbf8084905a9..f7347a976c94 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python?
 DESCRIPTION=Library for password quality checking and generating random passwords
 EAPI=7
 HOMEPAGE=https://github.com/libpwquality/libpwquality
-INHERIT=pam python-r1 toolchain-funcs usr-ldscript
+INHERIT=pam python-r1 usr-ldscript
 IUSE=pam python static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=7c7f1ad8ab66d513770b75a368c8633a
+_md5_=df43d7b7f3cded94936d5185c9a3ee9f
diff --git a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1 b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
index bbe2ccb53986..0e32c806820a 100644
--- a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quantopian/libpy/archive/0.2.5.tar.gz -> libpy-0.2.5.tar.gz test? ( https://github.com/google/googletest/archive/23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz -> gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=d019d93ddcd830801278bf529349deb6
+_md5_=b4085a82745c364031c4e955841d6d88
diff --git a/metadata/md5-cache/dev-libs/libspnav-0.2.3 b/metadata/md5-cache/dev-libs/libspnav-0.2.3
index 8c591a7910c7..9ac4e27c9108 100644
--- a/metadata/md5-cache/dev-libs/libspnav-0.2.3
+++ b/metadata/md5-cache/dev-libs/libspnav-0.2.3
@@ -3,11 +3,12 @@ DEPEND=X? ( x11-libs/libX11 )
 DESCRIPTION=libspnav is a replacement for the magellan library with a cleaner API
 EAPI=7
 HOMEPAGE=http://spacenav.sourceforge.net/
+INHERIT=toolchain-funcs
 IUSE=X
 KEYWORDS=amd64 ppc64 x86
 LICENSE=BSD
 RDEPEND=app-misc/spacenavd[X?] X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%200.2.3/libspnav-0.2.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=89cf609d3858109995c7cd4a8e5a638a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=eaf80301ab12903753c6562cdf0e3f42
diff --git a/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1 b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
index 45753212dcbc..7866cc150435 100644
--- a/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
+++ b/metadata/md5-cache/dev-libs/libspnav-0.2.3-r1
@@ -3,11 +3,12 @@ DEPEND=X? ( x11-libs/libX11 )
 DESCRIPTION=libspnav is a replacement for the magellan library with a cleaner API
 EAPI=7
 HOMEPAGE=http://spacenav.sourceforge.net/
+INHERIT=toolchain-funcs
 IUSE=static-libs X
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=app-misc/spacenavd[X?] X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%200.2.3/libspnav-0.2.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dc27acd0df280820d3b29c7890957396
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=c9785d24950233b079bc3c70d42c6a32
diff --git a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309 b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309
index fddbdd9838b1..7c0731b1f62b 100644
--- a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309
+++ b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150309
@@ -3,10 +3,10 @@ DEPEND=sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
 EAPI=5
 HOMEPAGE=http://www.leonerd.org.uk/code/libvterm/
-INHERIT=eutils flag-o-matic ltprune multilib
+INHERIT=flag-o-matic ltprune multilib
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/libvterm-neovim-0.0_pre20150309.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=19bca3b0120752e455e980f8d961047b
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=afd8e461487bd614b9464ebecf457f47
diff --git a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621 b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621
index 0830827df8e3..4449420ac490 100644
--- a/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621
+++ b/metadata/md5-cache/dev-libs/libvterm-neovim-0.0_pre20150621
@@ -3,10 +3,10 @@ DEPEND=sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
 EAPI=5
 HOMEPAGE=http://www.leonerd.org.uk/code/libvterm/
-INHERIT=eutils flag-o-matic ltprune multilib
+INHERIT=flag-o-matic ltprune multilib
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/libvterm-neovim-0.0_pre20150621.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=19bca3b0120752e455e980f8d961047b
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=afd8e461487bd614b9464ebecf457f47
diff --git a/metadata/md5-cache/dev-libs/libx86-1.1-r4 b/metadata/md5-cache/dev-libs/libx86-1.1-r4
index c2eaeae9f522..efd7bb20ebfc 100644
--- a/metadata/md5-cache/dev-libs/libx86-1.1-r4
+++ b/metadata/md5-cache/dev-libs/libx86-1.1-r4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=A hardware-independent library for executing real-mode x86 code
 EAPI=6
 HOMEPAGE=https://www.codon.org.uk/~mjg59/libx86/
-INHERIT=eutils toolchain-funcs flag-o-matic
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=static-libs
 KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=58b79afcce279e1d8554ca2c396f8f61
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=6bcb8fcea0adab3c77e54eb11c8dee7f
diff --git a/metadata/md5-cache/dev-libs/light-1.2.2 b/metadata/md5-cache/dev-libs/light-1.2.2
index e64cf99122b3..7815f197928e 100644
--- a/metadata/md5-cache/dev-libs/light-1.2.2
+++ b/metadata/md5-cache/dev-libs/light-1.2.2
@@ -4,11 +4,11 @@ DEPEND=udev? ( virtual/libudev:= )
 DESCRIPTION=A program to control backlights (and other hardware lights)
 EAPI=7
 HOMEPAGE=https://github.com/haikarainen/light
-INHERIT=autotools eutils flag-o-matic
+INHERIT=autotools
 IUSE=udev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/haikarainen/light/archive/v1.2.2.tar.gz -> light-1.2.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=4dcbdc03b478930adc354d0e64d83292
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=df8c4f9eb33c1f360d48e39ab0f6827b
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
index 5eef243957d6..311426d6b0a2 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
@@ -3,11 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Library for locking devices
 EAPI=5
 HOMEPAGE=http://packages.debian.org/source/sid/lockdev
-INHERIT=toolchain-funcs perl-module eutils versionator autotools ltprune multilib-minimal
+INHERIT=perl-module epatch versionator autotools ltprune multilib-minimal
 IUSE=perl 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 ~s390 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=4476cc727326ef5c782fdf519bcdd2b9
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=c0495dd1a20ffb5bd9cbbb9914456ed6
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
index d7dc863c552f..9395260ab635 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
@@ -3,11 +3,11 @@ DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Simple and small C++ XML parser
 EAPI=6
 HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
-INHERIT=flag-o-matic toolchain-funcs multilib versionator
+INHERIT=epatch flag-o-matic toolchain-funcs multilib versionator
 IUSE=debug doc static-libs +stl
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_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	c0964e43ba712cb933da5f65b958fa88	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=feb91fb0ff0727c1940b686f5e9ef20b
+_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	c0964e43ba712cb933da5f65b958fa88	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=4fc4cbc37773e3c1b44a0ce0459e7a60
diff --git a/metadata/md5-cache/dev-libs/weston-9.0.0 b/metadata/md5-cache/dev-libs/weston-9.0.0
index 50df09bafca3..daa311d04b20 100644
--- a/metadata/md5-cache/dev-libs/weston-9.0.0
+++ b/metadata/md5-cache/dev-libs/weston-9.0.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-pr
 DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
-INHERIT=meson readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=meson readme.gentoo-r1 xdg-utils
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT CC-BY-SA-3.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-9.0.0.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a283c1de5692961a9bce9310bed0b01
+_md5_=0353e555ed14797bf6a13b7564b8de03
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index e30570352c66..17ef833ff8c0 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-pr
 DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
-INHERIT=meson readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
+INHERIT=meson readme.gentoo-r1 xdg-utils git-r3
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland
 LICENSE=MIT CC-BY-SA-3.0
 PROPERTIES=live
@@ -13,4 +13,4 @@ REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? (
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=15ba04f557c82676e74b6820176f465d
+_md5_=dc955d7d10d6b023f374291e476cbd79
diff --git a/metadata/md5-cache/dev-lisp/abcl-1.5.0 b/metadata/md5-cache/dev-lisp/abcl-1.5.0
index 3383aecc9060..da8dcd215470 100644
--- a/metadata/md5-cache/dev-lisp/abcl-1.5.0
+++ b/metadata/md5-cache/dev-lisp/abcl-1.5.0
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8
 DESCRIPTION=Armed Bear Common Lisp is a Common Lisp implementation for the JVM.
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/armedbear/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://abcl.org/releases/1.5.0/abcl-src-1.5.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=7748fe7daa2b0aea8f3682384df52926
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=cc45416b32d3541eb784b6602c99b8fc
diff --git a/metadata/md5-cache/dev-lisp/abcl-1.8.0 b/metadata/md5-cache/dev-lisp/abcl-1.8.0
index cef2f1f1db8e..b02c9a6e9ef5 100644
--- a/metadata/md5-cache/dev-lisp/abcl-1.8.0
+++ b/metadata/md5-cache/dev-lisp/abcl-1.8.0
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8
 DESCRIPTION=Armed Bear Common Lisp is a Common Lisp implementation for the JVM.
 EAPI=7
 HOMEPAGE=http://common-lisp.net/project/armedbear/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
 IUSE=elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://abcl.org/releases/1.8.0/abcl-src-1.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=9f54b85077a8e83e2aa6c5cfb17a00cb
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=aba8f2272108e997390bb85df5117d6f
diff --git a/metadata/md5-cache/dev-lisp/alexandria-20171029 b/metadata/md5-cache/dev-lisp/alexandria-20171029
index fb0035dc642d..45eff72f0b0a 100644
--- a/metadata/md5-cache/dev-lisp/alexandria-20171029
+++ b/metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -3,7 +3,7 @@ DEPEND=doc? ( sys-apps/texinfo )
 DESCRIPTION=A collection of portable utilities for Common Lisp
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/alexandria/
-INHERIT=common-lisp-3 eutils
+INHERIT=common-lisp-3
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=public-domain
@@ -11,4 +11,4 @@ PDEPEND=virtual/commonlisp
 SLOT=0
 SRC_URI=mirror://gentoo/alexandria-20171029.tar.bz2
 _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	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
-_md5_=b8bf26f69fa2c28044cda34308be83e9
+_md5_=0d40c4cc214000f193e1c7809887b97a
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.1 b/metadata/md5-cache/dev-lisp/asdf-3.3.1
index 92a866b856ed..dcde82e0ff76 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.1
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.1
@@ -3,12 +3,12 @@ DEPEND=!dev-lisp/cl-asdf !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi )
 DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/asdf/
-INHERIT=eutils prefix common-lisp-3
+INHERIT=prefix common-lisp-3
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.1 virtual/commonlisp
 SLOT=0/3.3.1
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.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	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
-_md5_=1548fb42019aa8df39fbb9782d032ae9
+_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c	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	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
+_md5_=d99c2236957181e31298f415d7462fa9
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.2 b/metadata/md5-cache/dev-lisp/asdf-3.3.2
index 0051b9598d56..e69fca886bb6 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.2
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.2
@@ -3,12 +3,12 @@ DEPEND=!dev-lisp/cl-asdf !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi )
 DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/asdf/
-INHERIT=eutils prefix common-lisp-3
+INHERIT=prefix common-lisp-3
 IUSE=doc
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.2 virtual/commonlisp
 SLOT=0/3.3.2
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.2.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	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
-_md5_=4b319d4755e9935d2cade3302012da52
+_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c	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	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
+_md5_=0e0d0f03600eb3f423f0d067127bd77a
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1 b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
index d10c339402ce..5a7ae3271ad9 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
@@ -3,7 +3,7 @@ DEPEND=!dev-lisp/cl-asdf !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi ) test?
 DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/asdf/
-INHERIT=eutils prefix common-lisp-3
+INHERIT=prefix common-lisp-3
 IUSE=doc test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,5 +11,5 @@ PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.2 virtual/commonlisp
 RESTRICT=!test? ( test )
 SLOT=0/3.3.2-r1
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.2.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	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
-_md5_=95bf4147f310739ce52ea2edc44b380c
+_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c	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	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
+_md5_=d4eca016e139769ed53e83d343ffc311
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49.92 b/metadata/md5-cache/dev-lisp/clisp-2.49.92
index 67a78fb07acf..9fd7c6ffecaf 100644
--- a/metadata/md5-cache/dev-lisp/clisp-2.49.92
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.92
@@ -3,12 +3,12 @@ DEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev
 DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
 EAPI=6
 HOMEPAGE=https://clisp.sourceforge.io/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs xdg-utils
+INHERIT=flag-o-matic multilib toolchain-funcs xdg-utils
 IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib
 KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm:0= ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
 SLOT=2/8
 SRC_URI=mirror://gentoo/clisp-2.49.92.tar.bz2
-_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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ec5b7626aea34d3ed145812e797a546
+_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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a7ab54d58e8b663d3a95916e4028ac6c
diff --git a/metadata/md5-cache/dev-lisp/clozurecl-1.11.5 b/metadata/md5-cache/dev-lisp/clozurecl-1.11.5
index 371a9571a766..982e67b5043d 100644
--- a/metadata/md5-cache/dev-lisp/clozurecl-1.11.5
+++ b/metadata/md5-cache/dev-lisp/clozurecl-1.11.5
@@ -3,12 +3,12 @@ DEPEND=>=dev-lisp/asdf-2.33-r3:=
 DESCRIPTION=Common Lisp implementation, derived from Digitool's MCL product
 EAPI=6
 HOMEPAGE=https://ccl.clozure.com
-INHERIT=eutils flag-o-matic multilib toolchain-funcs vcs-clean
+INHERIT=flag-o-matic multilib toolchain-funcs vcs-clean
 IUSE=doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lisp/asdf-2.33-r3:=
 SLOT=0
 SRC_URI=x86? ( https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-linuxx86.tar.gz ) amd64? ( https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-linuxx86.tar.gz ) arm? ( https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-linuxarm.tar.gz ) x64-macos? ( https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-darwinx86.tar.gz ) x86-solaris? ( https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-solarisx86.tar.gz ) x64-solaris? ( https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-solarisx86.tar.gz ) doc? ( https://ccl.clozure.com/docs/ccl.html )
-_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	c0964e43ba712cb933da5f65b958fa88
-_md5_=8b40ad3d84956b64b8f2396b9e194302
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=e3804a3ec7c36abfdb4633c024a875c3
diff --git a/metadata/md5-cache/dev-lisp/clozurecl-1.12 b/metadata/md5-cache/dev-lisp/clozurecl-1.12
index 88443ab8c764..114749a7733e 100644
--- a/metadata/md5-cache/dev-lisp/clozurecl-1.12
+++ b/metadata/md5-cache/dev-lisp/clozurecl-1.12
@@ -3,12 +3,12 @@ DEPEND=>=dev-lisp/asdf-2.33-r3:=
 DESCRIPTION=Common Lisp implementation, derived from Digitool's MCL product
 EAPI=6
 HOMEPAGE=https://ccl.clozure.com
-INHERIT=eutils flag-o-matic multilib toolchain-funcs vcs-clean
+INHERIT=flag-o-matic multilib toolchain-funcs vcs-clean
 IUSE=doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lisp/asdf-2.33-r3:=
 SLOT=0
 SRC_URI=x86? ( https://github.com/Clozure/ccl/releases/download/v1.12/ccl-1.12-linuxx86.tar.gz ) amd64? ( https://github.com/Clozure/ccl/releases/download/v1.12/ccl-1.12-linuxx86.tar.gz ) x64-macos? ( https://github.com/Clozure/ccl/releases/download/v1.12/ccl-1.12-darwinx86.tar.gz ) x86-solaris? ( https://github.com/Clozure/ccl/releases/download/v1.12/ccl-1.12-solarisx86.tar.gz ) x64-solaris? ( https://github.com/Clozure/ccl/releases/download/v1.12/ccl-1.12-solarisx86.tar.gz ) doc? ( https://ccl.clozure.com/docs/ccl.html )
-_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	c0964e43ba712cb933da5f65b958fa88
-_md5_=f15b0d7a1f2d7f64f974d7d56b484c1f
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=0d0c474f5cda8c96e43615cc2846854c
diff --git a/metadata/md5-cache/dev-lisp/clx-0.7.5 b/metadata/md5-cache/dev-lisp/clx-0.7.5
index ef567dc154fc..a710abad073a 100644
--- a/metadata/md5-cache/dev-lisp/clx-0.7.5
+++ b/metadata/md5-cache/dev-lisp/clx-0.7.5
@@ -3,7 +3,7 @@ DEPEND=sys-apps/texinfo doc? ( virtual/texi2dvi )
 DESCRIPTION=CLX is the Common Lisp interface to the X11 protocol primarily for SBCL.
 EAPI=6
 HOMEPAGE=http://www.cliki.net/CLX
-INHERIT=common-lisp-3 eutils
+INHERIT=common-lisp-3
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=!dev-lisp/cl-clx
 SLOT=0
 SRC_URI=https://github.com/sharplispers/clx/archive/0.7.5.tar.gz -> clx-0.7.5.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	common-lisp-3	38ae0912688c97fa9147aaff8c26d799
-_md5_=89177febec4377ff81cee19543b4e7a4
+_md5_=ff318471fe0fafb30c95380ee4a24aee
diff --git a/metadata/md5-cache/dev-lisp/cmucl-21c b/metadata/md5-cache/dev-lisp/cmucl-21c
index 7da815ed517c..aac1d8c2910e 100644
--- a/metadata/md5-cache/dev-lisp/cmucl-21c
+++ b/metadata/md5-cache/dev-lisp/cmucl-21c
@@ -3,12 +3,12 @@ DEPEND=>=dev-lisp/asdf-2.33-r3:= x11-libs/motif:0 sys-devel/bc doc? ( virtual/la
 DESCRIPTION=CMU Common Lisp is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://www.cons.org/cmucl/
-INHERIT=eutils toolchain-funcs multilib
+INHERIT=toolchain-funcs multilib
 IUSE=X doc source
 KEYWORDS=x86
 LICENSE=public-domain
 RDEPEND=>=dev-lisp/asdf-2.33-r3:= x11-libs/motif:0
 SLOT=0
 SRC_URI=http://common-lisp.net/project/cmucl/downloads/release/21c/cmucl-src-21c.tar.bz2 http://common-lisp.net/project/cmucl/downloads/release/21c/cmucl-21c-x86-linux.tar.bz2
-_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
-_md5_=5a3f4ebb74538a41f37178a01b01257b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3ed7040fdd5e64974039d9755fe2d8e6
diff --git a/metadata/md5-cache/dev-lisp/ecls-16.1.3 b/metadata/md5-cache/dev-lisp/ecls-16.1.3
index 7e034ea0e1ec..6c782134f382 100644
--- a/metadata/md5-cache/dev-lisp/ecls-16.1.3
+++ b/metadata/md5-cache/dev-lisp/ecls-16.1.3
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp:0 dev-libs/libffi libatomic? ( dev-libs/libatomic_ops ) >=de
 DESCRIPTION=ECL is an embeddable Common Lisp implementation
 EAPI=6
 HOMEPAGE=https://common-lisp.net/project/ecl/
-INHERIT=eutils multilib
+INHERIT=multilib
 IUSE=cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=BSD-2 LGPL-2.1+
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0 dev-libs/libffi libatomic? ( dev-libs/libatomic_ops ) >=d
 RESTRICT=test
 SLOT=0/16.1.3
 SRC_URI=https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz
-_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
-_md5_=bc83d2b51375d7ff3cd736e756a5e31a
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b5a775cce115638c2575b2b2e548ade0
diff --git a/metadata/md5-cache/dev-lisp/ecls-20.4.24 b/metadata/md5-cache/dev-lisp/ecls-20.4.24
index 3547d18b1e62..9a68dcd4fdfd 100644
--- a/metadata/md5-cache/dev-lisp/ecls-20.4.24
+++ b/metadata/md5-cache/dev-lisp/ecls-20.4.24
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp:0 dev-libs/libffi libatomic? ( dev-libs/libatomic_ops ) >=de
 DESCRIPTION=ECL is an embeddable Common Lisp implementation
 EAPI=6
 HOMEPAGE=https://common-lisp.net/project/ecl/
-INHERIT=eutils multilib
+INHERIT=multilib
 IUSE=cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
 LICENSE=BSD-2 LGPL-2.1+
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0 dev-libs/libffi libatomic? ( dev-libs/libatomic_ops ) >=d
 RESTRICT=test
 SLOT=0/20.4.24
 SRC_URI=https://common-lisp.net/project/ecl/static/files/release/ecl-20.4.24.tgz
-_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
-_md5_=09a66934c8be3f9b353f9e1004875156
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b706f01a1d34a147c1e7ee9504d108d9
diff --git a/metadata/md5-cache/dev-lisp/ecls-21.2.1 b/metadata/md5-cache/dev-lisp/ecls-21.2.1
index ad2dceda690d..2288cf54b099 100644
--- a/metadata/md5-cache/dev-lisp/ecls-21.2.1
+++ b/metadata/md5-cache/dev-lisp/ecls-21.2.1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp:0 dev-libs/libffi libatomic? ( dev-libs/libatomic_ops ) >=de
 DESCRIPTION=ECL is an embeddable Common Lisp implementation
 EAPI=6
 HOMEPAGE=https://common-lisp.net/project/ecl/
-INHERIT=eutils multilib
+INHERIT=multilib
 IUSE=cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
 LICENSE=BSD-2 LGPL-2.1+
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0 dev-libs/libffi libatomic? ( dev-libs/libatomic_ops ) >=d
 RESTRICT=test
 SLOT=0/21.2.1
 SRC_URI=https://common-lisp.net/project/ecl/static/files/release/ecl-21.2.1.tgz
-_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
-_md5_=c83e85e1e0c1dc17a406540a2155690e
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e12a1b9a7ce547769249472aa7bb29bd
diff --git a/metadata/md5-cache/dev-lisp/ecls-21.2.1-r1 b/metadata/md5-cache/dev-lisp/ecls-21.2.1-r1
index a8049f37f895..f3a1b4d3925a 100644
--- a/metadata/md5-cache/dev-lisp/ecls-21.2.1-r1
+++ b/metadata/md5-cache/dev-lisp/ecls-21.2.1-r1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp:0 dev-libs/libffi dev-libs/libatomic_ops >=dev-libs/boehm-gc
 DESCRIPTION=ECL is an embeddable Common Lisp implementation
 EAPI=6
 HOMEPAGE=https://common-lisp.net/project/ecl/
-INHERIT=eutils multilib
+INHERIT=multilib
 IUSE=cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
 LICENSE=BSD-2 LGPL-2.1+
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0 dev-libs/libffi dev-libs/libatomic_ops >=dev-libs/boehm-g
 RESTRICT=test
 SLOT=0/21.2.1
 SRC_URI=https://common-lisp.net/project/ecl/static/files/release/ecl-21.2.1.tgz
-_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
-_md5_=106716f21f82b1853ad7038f9bbdd157
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0147d2f5f85a2ddb4af82cc0ae228acb
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.13_pre99 b/metadata/md5-cache/dev-lisp/gcl-2.6.13_pre99
index 7d8131d961ca..a5f35bcff917 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.13_pre99
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.13_pre99
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp virtual/latex-base emacs? ( app-editors/emacs:= ) readline?
 DESCRIPTION=GNU Common Lisp
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gcl/gcl.html
-INHERIT=elisp-common eutils flag-o-matic
+INHERIT=elisp-common flag-o-matic
 IUSE=+ansi athena emacs +readline tk X
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2 GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp virtual/latex-base emacs? ( app-editors/emacs:= ) readline?
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/gcl-2.6.13_pre99.tar.xz
-_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=320917b02f0ef1c670edbb0159bf4afe
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=2ccedda847035efc2581b343bc2a5bb2
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.3.11 b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
index 2e5b130baf90..88e60bb6d760 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.3.11
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.3.11
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.3.11
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.3.11-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.3.11-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.9-armhf-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=985c0477c8c227e0a392a9f0f26082fb
+_md5_=2de97bb10852d1f2bb067eb2aaf70184
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.9 b/metadata/md5-cache/dev-lisp/sbcl-1.4.9
index 23081a330c45..b30ad9acf569 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.4.9
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.9
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.4.9
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.9-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.8-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=bc2a1ade0384411f04817bc370166c46
+_md5_=5de64dc97a0700a06863dee318473785
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.0.10 b/metadata/md5-cache/dev-lisp/sbcl-2.0.10
index a53990c9f03d..b00e3ea23c7e 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.0.10
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.0.10
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.0.10
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.0.10-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.0.10-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=a7b60e12f38bc31b7e8468387516ceaf
+_md5_=970f5516f6e3d8903eb6a412c5674fb2
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.0.11 b/metadata/md5-cache/dev-lisp/sbcl-2.0.11
index 919248130d99..5b8c9589dc86 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.0.11
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.0.11
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.0.11
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.0.11-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.0.11-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=1795af80356fe5f18f1a74bc9eef223a
+_md5_=8b4e55bfd56969603cb9835b8ca98759
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.0 b/metadata/md5-cache/dev-lisp/sbcl-2.1.0
index f1cf6ea645d2..71e55cf1f149 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.0
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.0
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.0-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.0-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=e195f8aab65009dc6f03694d4ce60ad4
+_md5_=6221a1ed74d7eee0612514401f56741a
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.1 b/metadata/md5-cache/dev-lisp/sbcl-2.1.1
index 95a8d9c5cb2a..c5b5b43d2b52 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.1
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.1
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.1
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.1-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.1-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=6f0aa9f7bfe299f10cb80edb8abd8b6a
+_md5_=52cebfa1fa6c994065b9ff61656f3a71
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.2 b/metadata/md5-cache/dev-lisp/sbcl-2.1.2
index dafcd0347f11..025df0041c96 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.2
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.2
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.2
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.2-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.2-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=0ef2cfe8dc2258f60c891fdc391be54e
+_md5_=0b243274f79b49a80b868751d251e7d0
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.1.3 b/metadata/md5-cache/dev-lisp/sbcl-2.1.3
index a29984131441..2702a1f68d96 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.1.3
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.1.3
@@ -3,7 +3,7 @@ DEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0
 DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
 EAPI=6
 HOMEPAGE=http://sbcl.sourceforge.net/
-INHERIT=multilib eutils flag-o-matic pax-utils toolchain-funcs
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
 IUSE=debug doc source +threads +unicode pax_kernel zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.1.3
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.1.3-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.1.3-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=4c80a3b9e64ab55ac9faba341d6ec8ca
+_md5_=990a524dc831cd2babcdc7cd08aa8738
diff --git a/metadata/md5-cache/dev-ml/camlidl-1.05-r1 b/metadata/md5-cache/dev-ml/camlidl-1.05-r1
index 5785e9e1fa62..5c2cb2894409 100644
--- a/metadata/md5-cache/dev-ml/camlidl-1.05-r1
+++ b/metadata/md5-cache/dev-ml/camlidl-1.05-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt]
 DESCRIPTION=CamlIDL is a stub code generator for using C/C++ libraries from O'Caml
 EAPI=5
 HOMEPAGE=http://caml.inria.fr/camlidl/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt]
 SLOT=0/1.05
 SRC_URI=http://caml.inria.fr/distrib/bazar-ocaml/camlidl-1.05.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
-_md5_=b416fdadf6f3dc00428c0073c3057992
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=483495005833fe2e8149026cdeb0f07a
diff --git a/metadata/md5-cache/dev-ml/cudf-0.9 b/metadata/md5-cache/dev-ml/cudf-0.9
index 1813eb72b601..3a0f7a3a4f59 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.9
+++ b/metadata/md5-cache/dev-ml/cudf-0.9
@@ -4,7 +4,7 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-l
 DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
 EAPI=7
 HOMEPAGE=http://www.mancoosi.org/cudf/
-INHERIT=multilib toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=+ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/36602/cudf-0.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=186f78c20bb341454a0cf0c82a84be5c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=72b6a8861bccc15c367b27fb75bb4d9a
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2 b/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2
index 3a6eb4f8e15e..836b474b8e2d 100644
--- a/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2
+++ b/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] <=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 RESTRICT=test
 SLOT=0/5.0.1_p16
 SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1-16.debian.tar.xz
-_md5_=d1802ec478cfa50243b440529704410e
+_md5_=b5d8ceed26f0a7912d64121a0c72a6f4
diff --git a/metadata/md5-cache/dev-ml/dune-1.11.4 b/metadata/md5-cache/dev-ml/dune-1.11.4
index 44ec6a58c23f..b1a8a2356bc0 100644
--- a/metadata/md5-cache/dev-ml/dune-1.11.4
+++ b/metadata/md5-cache/dev-ml/dune-1.11.4
@@ -10,5 +10,4 @@ RDEPEND=dev-lang/ocaml !dev-ml/jbuilder
 RESTRICT=test
 SLOT=0/1.11.4
 SRC_URI=https://github.com/ocaml/dune/archive/1.11.4.tar.gz -> dune-1.11.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=e6b24145acad488f9d0bb250d955d369
+_md5_=165fa355387f1f3992262e39ff8e02c0
diff --git a/metadata/md5-cache/dev-ml/dune-2.1.0 b/metadata/md5-cache/dev-ml/dune-2.1.0
index 87bc304d4d01..b47aded5d749 100644
--- a/metadata/md5-cache/dev-ml/dune-2.1.0
+++ b/metadata/md5-cache/dev-ml/dune-2.1.0
@@ -10,5 +10,4 @@ RDEPEND=>=dev-lang/ocaml-4.07:= !dev-ml/jbuilder
 RESTRICT=test
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/dune/archive/2.1.0.tar.gz -> dune-2.1.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=e40e4485f86cdad6b673738a430f842f
+_md5_=3130168325b90b743a828beece8ee5f2
diff --git a/metadata/md5-cache/dev-ml/dune-2.7.1 b/metadata/md5-cache/dev-ml/dune-2.7.1
index 46d92f39bd30..89b72c5d3f27 100644
--- a/metadata/md5-cache/dev-ml/dune-2.7.1
+++ b/metadata/md5-cache/dev-ml/dune-2.7.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-4.08:=
 DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=multiprocessing
 IUSE=test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
@@ -11,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.7.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=9f088f02e4935ffdb78ad332639d6c68
+_md5_=dd92b8c45ea26a571f9fa746d8eee548
diff --git a/metadata/md5-cache/dev-ml/lablgl-1.05-r1 b/metadata/md5-cache/dev-ml/lablgl-1.05-r1
index dab0e2e114d3..ca453f4ab058 100644
--- a/metadata/md5-cache/dev-ml/lablgl-1.05-r1
+++ b/metadata/md5-cache/dev-ml/lablgl-1.05-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] x11-libs/libXext x11-libs/libXmu x11
 DESCRIPTION=Objective CAML interface for OpenGL
 EAPI=5
 HOMEPAGE=http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html
-INHERIT=multilib eutils toolchain-funcs
+INHERIT=multilib toolchain-funcs
 IUSE=doc glut +ocamlopt tk
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] x11-libs/libXext x11-libs/libXmu x11-libs/libX11 virtual/opengl virtual/glu dev-ml/camlp4:= glut? ( media-libs/freeglut ) tk? ( >=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0= dev-ml/labltk:= )
 SLOT=0/1.05
 SRC_URI=http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.05.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=60ad6ea0ac7d91f60f8e7afe42cbdbd9
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=69f8150113ccc64b674c8db6ff09cc1c
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.7 b/metadata/md5-cache/dev-ml/labltk-8.06.7
index 14f30f82759e..cb8e3b4a967c 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.7
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.7
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?] >=dev-ml/f
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
-INHERIT=findlib eutils
+INHERIT=findlib
 IUSE=+ocamlopt X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?]
 SLOT=0/8.06.7
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.7.tar.gz -> labltk-8.06.7.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=bf810c4e2cc994451e62633dbd05afc4
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_md5_=c80e4b28cfb847a73637bb5f9e06e1fe
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.9 b/metadata/md5-cache/dev-ml/labltk-8.06.9
index f0d7f2f0701f..8cdfaad03a21 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.9
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.9
@@ -3,12 +3,12 @@ DEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-ml/findlib >=d
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
-INHERIT=findlib eutils
+INHERIT=findlib
 IUSE=+ocamlopt X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]
 SLOT=0/8.06.9
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.9.tar.gz -> labltk-8.06.9.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=1f3b7d08050c6ebe957ece82cba3b8db
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_md5_=0f521f98630df1ac61c2e220f05d8783
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
index 9c048d57910c..b809858e6916 100644
--- a/metadata/md5-cache/dev-ml/menhir-20190924
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0
 DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=7
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-INHERIT=findlib eutils
+INHERIT=findlib
 IUSE=examples +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
 SLOT=0/20190924
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20190924/menhir-20190924.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=0f66fff880fb0dee0d8f488473ca4158
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_md5_=5841849f52bd68f8fda3a6f345b5ab33
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index aa33c2f32072..523a62b6daf1 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -3,7 +3,7 @@ DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib
 DESCRIPTION=OCaml module to access monotonic wall-clock time
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
-INHERIT=eutils opam
+INHERIT=opam
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=ISC
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
-_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	opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=ec5f0b04769f0608312ca837933ed963
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
+_md5_=b3937426d0a01d9b7a099c82b885651f
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
index bde7159febe1..18e38b5ef2b1 100644
--- a/metadata/md5-cache/dev-ml/num-1.3-r1
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -4,11 +4,11 @@ DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] >=de
 DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
-INHERIT=multilib findlib
+INHERIT=findlib
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.3.tar.gz -> num-1.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=fcf99ccb31e6a5eb44d2374354312464
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_md5_=2c99de16380933bea986fda5f2a99343
diff --git a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4 b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
index 1c6252463b36..5d9010d9d92f 100644
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
+++ b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
@@ -4,10 +4,10 @@ DEPEND=>=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A library implementing a simplex algorithm
 EAPI=7
 HOMEPAGE=https://github.com/OCamlPro-Iguernlala/ocplib-simplex
-INHERIT=autotools findlib multilib
+INHERIT=autotools findlib
 KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Iguernlala/ocplib-simplex/archive/v0.4.tar.gz -> ocplib-simplex-0.4.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=db1b5c4c5fcd6a27dfd90cba1a30b8b3
+_md5_=15581ffa1f1c180f16113afbdab0c591
diff --git a/metadata/md5-cache/dev-ml/opam-1.3.1-r2 b/metadata/md5-cache/dev-ml/opam-1.3.1-r2
index 1c925737b489..dfe96361d7b0 100644
--- a/metadata/md5-cache/dev-ml/opam-1.3.1-r2
+++ b/metadata/md5-cache/dev-ml/opam-1.3.1-r2
@@ -3,7 +3,7 @@ DEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-m
 DESCRIPTION=A source-based package manager for OCaml
 EAPI=5
 HOMEPAGE=http://opam.ocaml.org/
-INHERIT=eutils
+INHERIT=epatch
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3-with-linking-exception
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-
 RESTRICT=!test? ( test )
 SLOT=0/1.3.1
 SRC_URI=https://github.com/ocaml/opam/archive/1.3.1.tar.gz -> opam-1.3.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
-_md5_=fdc582ae624ee30adba0f5178cd4a80b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=f691fc96d33ef9ebd7b3a015ae021343
diff --git a/metadata/md5-cache/dev-ml/xml-light-2.2-r3 b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
index c34004b9c911..2114605999fb 100644
--- a/metadata/md5-cache/dev-ml/xml-light-2.2-r3
+++ b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip dev-lang/ocaml:=[ocamlopt?]
 DESCRIPTION=Minimal Xml parser and printer for OCaml
 EAPI=5
 HOMEPAGE=http://tech.motion-twin.com/xmllight.html
-INHERIT=eutils multilib
+INHERIT=epatch multilib
 IUSE=doc +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.2
 SRC_URI=http://tech.motion-twin.com/zip/xml-light-2.2.zip
-_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
-_md5_=c7dc79ddc30f3b527e090a1f7bf7b064
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=61936dd8730283dd7923774dac482cfc
diff --git a/metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1 b/metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1
index 808bcfa5d46b..e90d394a614d 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1
@@ -3,11 +3,11 @@ DEPEND=dev-perl/DBI dev-perl/DBD-Pg dev-lang/perl
 DESCRIPTION=Safer access to your database through a DBI database handle
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DBIx-Safe
-INHERIT=perl-module eutils
+INHERIT=perl-module
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=dev-perl/DBI dev-perl/DBD-Pg dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBIx-Safe-1.2.5.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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
-_md5_=144ed20841f8b8e9659929fc0d646f83
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=570cf25dbaa807b96f084b05d6d758ec
diff --git a/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0 b/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
index 73d5b22843f9..25b5afa25313 100644
--- a/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
+++ b/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
@@ -3,12 +3,12 @@ DEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl
 DESCRIPTION=Interface to the pcap(3) LBL packet capture library
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-Pcap
-INHERIT=perl-module eutils
+INHERIT=perl-module
 IUSE=examples
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-Pcap-0.18.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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
-_md5_=358d13ff1b1fa7d7a0d677f9f1fd43fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=6efa6a388ec1cc7530ecd07e975cbe28
diff --git a/metadata/md5-cache/dev-perl/Net-Server-2.9.0 b/metadata/md5-cache/dev-perl/Net-Server-2.9.0
index f30719c9639c..8192ff62660f 100644
--- a/metadata/md5-cache/dev-perl/Net-Server-2.9.0
+++ b/metadata/md5-cache/dev-perl/Net-Server-2.9.0
@@ -3,12 +3,12 @@ DEPEND=dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) >=virtual/perl-E
 DESCRIPTION=Extensible, general Perl server engine
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-Server
-INHERIT=perl-module eutils
+INHERIT=perl-module
 IUSE=ipv6
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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
-_md5_=f903079e5a4585ecb374c4d195689d82
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=578068951a2068833c6a2f13ba720657
diff --git a/metadata/md5-cache/dev-perl/OpenGL-0.700.0 b/metadata/md5-cache/dev-perl/OpenGL-0.700.0
index 7d60f88958d9..411857ef4a37 100644
--- a/metadata/md5-cache/dev-perl/OpenGL-0.700.0
+++ b/metadata/md5-cache/dev-perl/OpenGL-0.700.0
@@ -3,12 +3,12 @@ DEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/li
 DESCRIPTION=Perl interface providing graphics display using OpenGL
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/OpenGL
-INHERIT=perl-module eutils
+INHERIT=perl-module
 IUSE=examples
 KEYWORDS=amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=media-libs/freeglut:0= x11-libs/libICE:0= x11-libs/libXext:0= x11-libs/libXi:0= x11-libs/libXmu:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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
-_md5_=278c3704ea56f93b5f3afa8b19d895f4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=51c9e65c99d915afb3fe522ddf42d602
diff --git a/metadata/md5-cache/dev-perl/PDL-2.17.0-r1 b/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
index d7bc8f1f9dac..f7d3c13a5904 100644
--- a/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
+++ b/metadata/md5-cache/dev-perl/PDL-2.17.0-r1
@@ -3,7 +3,7 @@ DEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-per
 DESCRIPTION=Perl Data Language for scientific computing
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/PDL
-INHERIT=perl-module eutils fortran-2
+INHERIT=perl-module fortran-2
 IUSE=+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test
 KEYWORDS=amd64 arm ppc x86
 LICENSE=|| ( Artistic GPL-1+ ) public-domain PerlDL
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-pe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHM/PDL-2.017.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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	fortran-2	b4796813ccda91c9c0d3463fc90aa969
-_md5_=923ffec71fce27c2b4535f3894b50818
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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	fortran-2	b4796813ccda91c9c0d3463fc90aa969
+_md5_=c5f11b5e360cb2043aaf94448aa6fd80
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
index eaec632513da..11b690440034 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
@@ -3,7 +3,7 @@ DEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww
 DESCRIPTION=Lightweight interface to the SOAP protocol both on client and server side
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/SOAP-Lite
-INHERIT=perl-module eutils
+INHERIT=perl-module
 IUSE=ssl test xmpp examples
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libww
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.26.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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
-_md5_=57d1400b37ea99122c8a2a7c38052001
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=1f5756271d8416ddd3f2d0ef93d36230
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0
index d858c5c8a095..cfee62f7b37f 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-perl/LaTeX-Driver-0.70.0 >=dev-perl/LaTeX-Encode-0.20.0 dev-perl/La
 DESCRIPTION=LaTeX support for the Template Toolkit
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Template-Plugin-Latex
-INHERIT=perl-module eutils
+INHERIT=perl-module
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
@@ -11,5 +11,5 @@ RDEPEND=>=dev-perl/LaTeX-Driver-0.70.0 >=dev-perl/LaTeX-Encode-0.20.0 dev-perl/L
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EH/EHUELS/Template-Plugin-Latex-3.12.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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
-_md5_=8265c33ee6b5f8e49e0ffcfd2cd60100
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=f51a4285401fb569179b1a61ccb048b2
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-1.0.0 b/metadata/md5-cache/dev-perl/XML-SAX-1.0.0
index c05d21ae57cb..020bf35938ca 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-1.0.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-1.0.0
@@ -3,11 +3,11 @@ DEPEND=>=dev-perl/XML-SAX-Base-1.50.0 >=dev-perl/XML-NamespaceSupport-1.40.0 >=d
 DESCRIPTION=Perl module for using and building Perl SAX2 XML parsers, filters, and drivers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-SAX
-INHERIT=perl-module eutils
+INHERIT=perl-module
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-SAX-Base-1.50.0 >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 virtual/perl-File-Temp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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
-_md5_=1afcc9a847e1f19a8914b9cde268b686
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=706029e27a34240c467dc71c61059507
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.6.0 b/metadata/md5-cache/dev-python/PyECLib-1.6.0
index 13edd3b317e1..e300f3f0f567 100644
--- a/metadata/md5-cache/dev-python/PyECLib-1.6.0
+++ b/metadata/md5-cache/dev-python/PyECLib-1.6.0
@@ -3,7 +3,7 @@ DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3
 DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
 EAPI=6
 HOMEPAGE=https://pypi.org/project/PyECLib/
-INHERIT=distutils-r1 eutils multilib
+INHERIT=distutils-r1 multilib
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.6.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=20676bf1e66721e139796de16fad2486
+_md5_=2eace067c0902a3cba1f8469518ccecc
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21 b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
index 3381c4ee28ed..0227c97ef91f 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
+++ b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Required testing tools needed in the several Salt Stack projects
 EAPI=7
 HOMEPAGE=https://saltstack.com/community/
-INHERIT=eutils distutils-r1
+INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/salt-testing/archive/v2018.9.21.tar.gz -> SaltTesting-2018.9.21.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=3cb1555c264785c13db212b8c04e0447
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=f450182d1281ac9d8c3740f7ef0feee6
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.7 b/metadata/md5-cache/dev-python/aesara-2.0.7
new file mode 100644
index 000000000000..3ae6a2258885
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.0.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=7
+HOMEPAGE=https://github.com/pymc-devs/aesara
+INHERIT=distutils-r1 optfeature
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pymc-devs/aesara/archive/rel-2.0.7.tar.gz -> aesara-rel-2.0.7.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	optfeature	2e90be23a14db1ea432d6b216eb2a81e
+_md5_=c75913cd943da4442bafc3a76e7304aa
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.6.0 b/metadata/md5-cache/dev-python/hypothesis-6.6.0
index 7e3481c40025..41b6580a05fd 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.6.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.6.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 eutils multiprocessing optfeature
+INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MPL-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.6.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	optfeature	2e90be23a14db1ea432d6b216eb2a81e
-_md5_=34dc186e16834af71b171bde2a38ee57
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	optfeature	2e90be23a14db1ea432d6b216eb2a81e
+_md5_=3b652b98904982eb6cfe455603d45e21
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.8.1 b/metadata/md5-cache/dev-python/hypothesis-6.8.1
index 92e45f059886..a2f24e5f2191 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.8.1
+++ b/metadata/md5-cache/dev-python/hypothesis-6.8.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 eutils multiprocessing optfeature
+INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MPL-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.8.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	optfeature	2e90be23a14db1ea432d6b216eb2a81e
-_md5_=f232863ece56f2a72a8c2037a4b43120
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	optfeature	2e90be23a14db1ea432d6b216eb2a81e
+_md5_=d230529680ea9562f41b4dd221fe55e2
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.8.9 b/metadata/md5-cache/dev-python/hypothesis-6.8.9
index 2cb8a1000a1c..32f81a624ddf 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.8.9
+++ b/metadata/md5-cache/dev-python/hypothesis-6.8.9
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 eutils multiprocessing optfeature
+INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MPL-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.8.9.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	optfeature	2e90be23a14db1ea432d6b216eb2a81e
-_md5_=f232863ece56f2a72a8c2037a4b43120
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	optfeature	2e90be23a14db1ea432d6b216eb2a81e
+_md5_=d230529680ea9562f41b4dd221fe55e2
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.9.0 b/metadata/md5-cache/dev-python/hypothesis-6.9.0
index cafe7c87279c..d498876c1918 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.9.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.9.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 eutils multiprocessing optfeature
+INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MPL-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.9.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	optfeature	2e90be23a14db1ea432d6b216eb2a81e
-_md5_=f232863ece56f2a72a8c2037a4b43120
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	optfeature	2e90be23a14db1ea432d6b216eb2a81e
+_md5_=d230529680ea9562f41b4dd221fe55e2
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.9.1 b/metadata/md5-cache/dev-python/hypothesis-6.9.1
index 66d0c3fd14a2..4650fd6311d7 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.9.1
+++ b/metadata/md5-cache/dev-python/hypothesis-6.9.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 eutils multiprocessing optfeature
+INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MPL-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.9.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	optfeature	2e90be23a14db1ea432d6b216eb2a81e
-_md5_=f232863ece56f2a72a8c2037a4b43120
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	optfeature	2e90be23a14db1ea432d6b216eb2a81e
+_md5_=d230529680ea9562f41b4dd221fe55e2
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.9.2 b/metadata/md5-cache/dev-python/hypothesis-6.9.2
index 3d7ed90dd3fd..3df391937f2d 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.9.2
+++ b/metadata/md5-cache/dev-python/hypothesis-6.9.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 eutils multiprocessing optfeature
+INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MPL-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.9.2.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	optfeature	2e90be23a14db1ea432d6b216eb2a81e
-_md5_=f232863ece56f2a72a8c2037a4b43120
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	optfeature	2e90be23a14db1ea432d6b216eb2a81e
+_md5_=d230529680ea9562f41b4dd221fe55e2
diff --git a/metadata/md5-cache/dev-python/jsonref-0.1 b/metadata/md5-cache/dev-python/jsonref-0.1
index e3dbf7f1c6ed..8bb1a3bf231e 100644
--- a/metadata/md5-cache/dev-python/jsonref-0.1
+++ b/metadata/md5-cache/dev-python/jsonref-0.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An implementation of JSON Reference for Python
 EAPI=7
 HOMEPAGE=https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref/
-INHERIT=eutils distutils-r1
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonref/jsonref-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=c640aebb13c6e80836bd717ded67b294
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=299fa732dbb380d139502317d0f25ede
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.8 b/metadata/md5-cache/dev-python/mygpoclient-1.8
index 173b54bdd7d1..ec2cce4a0289 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.8
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.8
@@ -4,7 +4,7 @@ DEPEND=dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3
 DESCRIPTION=A gpodder.net client library
 EAPI=7
 HOMEPAGE=https://github.com/gpodder/mygpoclient https://mygpoclient.readthedocs.io/en/latest/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/mygpoclient/archive/1.8.tar.gz -> mygpoclient-1.8.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=6ef87b145273a90bcd3b84d5429a9ed4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=4eb197a13de71b73fb70d519b6ad1b32
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.2-r2 b/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
index 5f848428d9cd..c61bd2d7c16e 100644
--- a/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
+++ b/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Set of facilities to extend Python with C++
 EAPI=7
 HOMEPAGE=http://cxx.sourceforge.net
-INHERIT=eutils distutils-r1
+INHERIT=distutils-r1
 IUSE=doc examples python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=64c0fee9b6142e41c9aa0e6bd4cc4054
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=acfc810d2191da9dc885bcab88a00e3d
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.11 b/metadata/md5-cache/dev-python/pysvn-1.9.11
index 1acd0d20a774..571ff7a6d533 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.9.11
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.11
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_7(-)?,python_targets_pyth
 DESCRIPTION=Object-oriented python bindings for subversion
 EAPI=7
 HOMEPAGE=https://pysvn.sourceforge.io/
-INHERIT=eutils distutils-r1 toolchain-funcs
+INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc examples python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=Apache-1.1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.11/pysvn-1.9.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=b0bee82dd2e0974279614c11f1bf27ea
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=7290a88eb614aa7c323ec8625c2680df
diff --git a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1 b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
index 895d1dca620d..e4da692d5887 100644
--- a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+++ b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-python/twisted-16.0.0[python_targets_python3_7(-)?,python_targets_p
 DESCRIPTION=GitHub API client implemented using Twisted
 EAPI=6
 HOMEPAGE=https://github.com/tomprince/txgithub https://pypi.org/project/txgithub/
-INHERIT=eutils distutils-r1
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomprince/txgithub/archive/15.0.0.tar.gz -> txgithub-15.0.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=86e17c4610c2c1054023d542186e56da
+_md5_=dc232a2f97c691d3b842d9ba5266fb97
diff --git a/metadata/md5-cache/dev-python/wheel-0.36.2 b/metadata/md5-cache/dev-python/wheel-0.36.2
index 7df9ac5eac42..fea3e1e4588e 100644
--- a/metadata/md5-cache/dev-python/wheel-0.36.2
+++ b/metadata/md5-cache/dev-python/wheel-0.36.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A built-package format for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/wheel/
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/wheel/archive/0.36.2.tar.gz -> wheel-0.36.2.gh.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=2f9d24c53b66b9cfd1c11970f7cff91f
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=0aa16873bdffe6c4daf3ccfc79ddabd6
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.16-r1 b/metadata/md5-cache/dev-ruby/facter-3.14.16-r1
index 006e65a9af38..5b88f73962d5 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.16-r1
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.16-r1
@@ -4,7 +4,7 @@ DEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openss
 DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
 EAPI=7
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-INHERIT=cmake eutils ruby-ng
+INHERIT=cmake ruby-ng
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.16.tar.gz -> facter-3.14.16.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	estack	055c42df72f76a4f45ec92b35e83cd56	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd
-_md5_=dea72c42ef0ec27061e8566cd6e6545a
+_md5_=27c59ea2bf3e5638c1118588cbd027ff
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.19.2 b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
index 1f488c365362..f3be6ed4ada5 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.19.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
@@ -3,7 +3,7 @@ DEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=6
 HOMEPAGE=https://github.com/defunkt/fakefs
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.19.2.tar.gz -> fakefs-0.19.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=263f68284bb834a2a1413262108ac6b7
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	estack	055c42df72f76a4f45ec92b35e83cd56	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=731d3025da4d27e5451095defa918bd5
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.20.1 b/metadata/md5-cache/dev-ruby/fakefs-0.20.1
index 140918a1af92..5f5bf584cc70 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.20.1
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.20.1
@@ -3,7 +3,7 @@ DEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=6
 HOMEPAGE=https://github.com/defunkt/fakefs
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.20.1.tar.gz -> fakefs-0.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=f6d2734f5edafc80385f2ad8bb6df06c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=3a6b0d46d97d08402bebbafff5540065
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.1 b/metadata/md5-cache/dev-ruby/fakefs-1.2.1
index 6940fe4000b2..351515963223 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.1
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.2.1
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=7
 HOMEPAGE=https://github.com/defunkt/fakefs
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.1.tar.gz -> fakefs-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=8f191b780672b5168339b63597b37dea
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=f6f8b023240465ccf4cef96422cb9a9d
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.2 b/metadata/md5-cache/dev-ruby/fakefs-1.2.2
index 7ce75b37df78..3feb25511b65 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.2.2
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=7
 HOMEPAGE=https://github.com/defunkt/fakefs
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.2.tar.gz -> fakefs-1.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=e67fe978e269103bd2b14057a72421cc
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=3da97511a8f8628caaa59a30c48a7a65
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.3 b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
index d1170d32e447..539f9e2f34ae 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.3
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=7
 HOMEPAGE=https://github.com/defunkt/fakefs
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.3.tar.gz -> fakefs-1.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=82643277ecb495574446fa21ded88672
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=169fd77d996b816f64b6d6f38a6c9501
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
index c8202c6a7b1c..cd91d38b016c 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Various middleware for Faraday
 EAPI=7
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=+parsexml +oauth +mashify +rashify test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.14.0.tar.gz -> faraday_middleware-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=48f7e472a233ceeca45af5fac0a3b6fc
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=15dedaf40c188fa5c806ac8f0cb1c599
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
index 404a88a04373..476f864b7922 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Various middleware for Faraday
 EAPI=7
 HOMEPAGE=https://github.com/lostisland/faraday_middleware
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=+parsexml +oauth +mashify +rashify test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.0.0.tar.gz -> faraday_middleware-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=75caa77ec5497d09bde970d772a2e914
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=d96cbde6c5221e0ee22f97d9a535f6fa
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
index e582e4dc91fa..d544c17e334f 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
@@ -3,7 +3,7 @@ DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/faraday_middleware:*[ruby_targets
 DESCRIPTION=Response JSON parser using MultiJson and FaradayMiddleware
 EAPI=6
 HOMEPAGE=https://github.com/denro/faraday_middleware-multi_json
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=41aa4de922c18be65270dd723721f501
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=efeb17d634c226265c11fc95a4c69160
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.10.1 b/metadata/md5-cache/dev-ruby/mini_magick-4.10.1
index 5f7a4e989129..fe778adbdc16 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.10.1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.10.1
@@ -4,7 +4,7 @@ DEPEND=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_ruby25? (
 DESCRIPTION=Manipulate images with minimal use of memory
 EAPI=7
 HOMEPAGE=https://github.com/minimagick/minimagick
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.10.1.tar.gz -> mini_magick-4.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=76810672de5ce48d04474c25f981b589
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=033668352d779504114ac63b51ec8598
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
index df7a40920146..9b0ef0c59274 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
@@ -4,7 +4,7 @@ DEPEND=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_ruby25? (
 DESCRIPTION=Manipulate images with minimal use of memory
 EAPI=7
 HOMEPAGE=https://github.com/minimagick/minimagick
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.11.0.tar.gz -> mini_magick-4.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=bd65b19ba491258409c3e15e639f6731
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=9dca8e57070ca9fbb4e4a79c4b3aafb7
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1 b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
index cae62909a4ae..c0e625985c67 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
@@ -3,7 +3,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Adds a streamy multipart form post capability to Net::HTTP
 EAPI=6
 HOMEPAGE=https://github.com/nicksieger/multipart-post
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multipart-post-2.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=ac7baab7d233820ac9c24677f96b9cad
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=6904787bef89683631b0aaf2b626f5c2
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.4 b/metadata/md5-cache/dev-ruby/oauth2-1.4.4
index 6131ccd396cd..0513b9473a80 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.4
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.4
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
 EAPI=7
 HOMEPAGE=https://github.com/intridea/oauth2
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.4.tar.gz -> oauth2-1.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=b94c5fdca5532694fbddc4b3918d1da1
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=eee1046d6d1e2c1444b3ed287a8d377b
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.7 b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
index 36f3d7b3d070..ed8f1e7da6f4 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.7
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
 EAPI=7
 HOMEPAGE=https://github.com/intridea/oauth2
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.7.tar.gz -> oauth2-1.4.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=61e176c2ea92f54c8a1bf6a69e326aa6
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=227c2d5647e4aeca5d329e179966598e
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
index 75559781d835..e99d0fc13e02 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Provide a standard and simplified way to build and package Ruby extensions
 EAPI=7
 HOMEPAGE=https://github.com/luislavena/rake-compiler
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
 KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.0.tar.gz -> rake-compiler-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=f9af20c0c2f624ec59edfd46e5b68e21
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=476c8a26185ce6e9fec8c60e115444d3
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index 692c714f4abf..c9a97607b48b 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/rexical/tree/master
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=f9162f5173484cd5d3824ed7fbd18662
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=cb5eb30632fe5a6179bd33438c8e4d00
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
index 04997990598c..bf7726699d79 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.1.tar.gz -> ruby-prof-1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=f78128e21dcbfc7747584ad17196e31e
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	estack	055c42df72f76a4f45ec92b35e83cd56	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
+_md5_=b4f92c18ad2205838c18be95d6fab4c6
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
index 1e06ce98cfe3..3dc88d0fbd73 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.2.tar.gz -> ruby-prof-1.4.2.tgz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	estack	055c42df72f76a4f45ec92b35e83cd56	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-fakegem	d9894561694732185fbcad470b121f2e
-_md5_=4ac1cfa176b435c4eeff977e5bda9e20
+_md5_=09879b02fd1beaaed3192abde17e5853
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1 b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
index 98dd15be2b03..a600157f70ad 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
+++ b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
@@ -3,12 +3,12 @@ DEPEND=ssl? ( dev-libs/openssl:0 ) emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=6
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
-INHERIT=eutils elisp-common
+INHERIT=elisp-common
 IUSE=emacs ssl static
 KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_8.tgz
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
-_md5_=ae91f7a1ff23cbd335bfefa082209e55
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
+_md5_=f0b6f6feabff8541c67265511679f57e
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2 b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
index 38f2c2dd2d54..2ac7de2f8fb1 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
+++ b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
@@ -3,12 +3,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=6
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
-INHERIT=eutils elisp-common
+INHERIT=elisp-common
 IUSE=emacs libressl ssl static
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_8.tgz
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
-_md5_=547b776c2c54063342d57e712b28d3b7
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
+_md5_=fd5548f6e77a825a5ff3665015b05774
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.9.3 b/metadata/md5-cache/dev-scheme/gambit-4.9.3
index 7cd9209e3667..d1ec11052280 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.9.3
+++ b/metadata/md5-cache/dev-scheme/gambit-4.9.3
@@ -4,12 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=7
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
-INHERIT=eutils elisp-common
+INHERIT=elisp-common
 IUSE=emacs libressl ssl static
 KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
-_md5_=0ed75a92541658a3a9483b6abf1e6f28
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc
+_md5_=7088430597eaa34f47ed2d76ba1dd77d
diff --git a/metadata/md5-cache/dev-scheme/scm-5.5.6-r3 b/metadata/md5-cache/dev-scheme/scm-5.5.6-r3
index 15236513d93c..f8e3773895b3 100644
--- a/metadata/md5-cache/dev-scheme/scm-5.5.6-r3
+++ b/metadata/md5-cache/dev-scheme/scm-5.5.6-r3
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip >=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-lib
 DESCRIPTION=SCM is a Scheme implementation from the author of slib
 EAPI=6
 HOMEPAGE=http://swiss.csail.mit.edu/~jaffer/SCM
-INHERIT=versionator eutils flag-o-matic
+INHERIT=versionator flag-o-matic
 IUSE=arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix
 KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=LGPL-3
 RDEPEND=app-arch/unzip >=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
 SLOT=0
 SRC_URI=http://groups.csail.mit.edu/mac/ftpdir/scm/scm-5e6.zip
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=69953d4fb7b908efc66343eb0c71d86f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=28a217c3ca45ef65ae34c778fff5988c
diff --git a/metadata/md5-cache/dev-scheme/tinyscheme-1.41 b/metadata/md5-cache/dev-scheme/tinyscheme-1.41
index 9aa255a2c566..fb1f3c988f14 100644
--- a/metadata/md5-cache/dev-scheme/tinyscheme-1.41
+++ b/metadata/md5-cache/dev-scheme/tinyscheme-1.41
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Lightweight scheme interpreter
 EAPI=5
 HOMEPAGE=http://tinyscheme.sourceforge.net
-INHERIT=flag-o-matic multilib toolchain-funcs
+INHERIT=epatch flag-o-matic multilib toolchain-funcs
 IUSE=static-libs
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyscheme/tinyscheme-1.41.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=a205e33b07d938a2865295e0d3c2e7b1
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=dea824a42b05a8fb7e59a996bb0d30c0
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.12 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
index d9f554721546..9fb101856a5d 100644
--- a/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tk:0 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DESCRIPTION=High-level widget set for Tcl/Tk
 EAPI=6
 HOMEPAGE=http://tcllib.sourceforge.net/
-INHERIT=eutils multilib virtualx
+INHERIT=multilib virtualx
 IUSE=doc test
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=tcltk
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/tk:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/BWidget/1.9.12/bwidget-1.9.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	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=83aebb60df8e639c5ff2794568419399
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=1f53accaf625e70d3b96e2790ae2dff4
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.14 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.14
index f8cee259ec00..1414a0f154a5 100644
--- a/metadata/md5-cache/dev-tcltk/bwidget-1.9.14
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.14
@@ -4,7 +4,7 @@ DEPEND=dev-lang/tk:0
 DESCRIPTION=High-level widget set for Tcl/Tk
 EAPI=7
 HOMEPAGE=http://tcllib.sourceforge.net/
-INHERIT=eutils multilib virtualx
+INHERIT=multilib virtualx
 IUSE=doc test
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=tcltk
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/tk:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/BWidget/1.9.14/bwidget-1.9.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=4c2e65321fa58cead5f61cecdc220a7d
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=119bdbc70eed5e2733a8a6828bf973ba
diff --git a/metadata/md5-cache/dev-tcltk/itcl-4.1.1 b/metadata/md5-cache/dev-tcltk/itcl-4.1.1
index 04a56f20a56a..9a399d19b754 100644
--- a/metadata/md5-cache/dev-tcltk/itcl-4.1.1
+++ b/metadata/md5-cache/dev-tcltk/itcl-4.1.1
@@ -3,10 +3,11 @@ DEPEND=>=dev-lang/tcl-8.6:0=
 DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
 EAPI=7
 HOMEPAGE=http://incrtcl.sourceforge.net/
+INHERIT=multilib
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.6:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.1.1/itcl4.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e5a4f17c0178b98d5e097544e81676c
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5eea0fa05fdbad84b8b9e84cf39ad3a1
diff --git a/metadata/md5-cache/dev-tcltk/itcl-4.2.0 b/metadata/md5-cache/dev-tcltk/itcl-4.2.0
index e2df1abaaa54..be5be27a43d0 100644
--- a/metadata/md5-cache/dev-tcltk/itcl-4.2.0
+++ b/metadata/md5-cache/dev-tcltk/itcl-4.2.0
@@ -3,10 +3,11 @@ DEPEND=>=dev-lang/tcl-8.6:0=
 DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
 EAPI=7
 HOMEPAGE=http://incrtcl.sourceforge.net/
+INHERIT=multilib
 KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.6:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.2.0/itcl4.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ef0aa6fb25bac74c5a2eb1ec15a78f3
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5506addea997bbaf3560a0e51020e36c
diff --git a/metadata/md5-cache/dev-tcltk/tclxml-3.2.7 b/metadata/md5-cache/dev-tcltk/tclxml-3.2.7
index 4b7250207ceb..1373964affc1 100644
--- a/metadata/md5-cache/dev-tcltk/tclxml-3.2.7
+++ b/metadata/md5-cache/dev-tcltk/tclxml-3.2.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/tcl-8.2:0 >=dev-libs/libxml2-2.6.9 dev-libs/libxslt >=dev-tclt
 DESCRIPTION=Pure Tcl implementation of an XML parser
 EAPI=7
 HOMEPAGE=http://tclxml.sourceforge.net/
+INHERIT=multilib
 IUSE=debug threads
 KEYWORDS=~alpha amd64 ppc sparc x86
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/tcl-8.2:0 >=dev-libs/libxml2-2.6.9 dev-libs/libxslt >=dev-tcl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wjoye/tclxml/archive/v3.2.7.tar.gz -> tclxml-3.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e1a48d89407acd032b3f24b4a427758e
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e8f67263d9ee1f754dba20484b2d9bd5
diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.9.1 b/metadata/md5-cache/dev-tcltk/tdom-0.9.1
index 1908764a638a..cc6b954a59e8 100644
--- a/metadata/md5-cache/dev-tcltk/tdom-0.9.1
+++ b/metadata/md5-cache/dev-tcltk/tdom-0.9.1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0= dev-libs/expat sys-devel/gnuconfig >=app-portage/elt-patc
 DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
 EAPI=6
 HOMEPAGE=https://core.tcl.tk/tdom/
-INHERIT=autotools eutils flag-o-matic multilib toolchain-funcs
+INHERIT=autotools flag-o-matic multilib toolchain-funcs
 IUSE=static-libs threads
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-1.1
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tcl:0= dev-libs/expat
 SLOT=0
 SRC_URI=http://tdom.org/downloads/tdom-0.9.1-src.tgz
 _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	c0964e43ba712cb933da5f65b958fa88
-_md5_=a6564e1aef5a53bbc460b168d4f05894
+_md5_=5cff87a6f8bd2c60c4100a849a082353
diff --git a/metadata/md5-cache/dev-tcltk/tkcon-2.5-r1 b/metadata/md5-cache/dev-tcltk/tkcon-2.5-r1
index ac78145db821..6c46c06a1c49 100644
--- a/metadata/md5-cache/dev-tcltk/tkcon-2.5-r1
+++ b/metadata/md5-cache/dev-tcltk/tkcon-2.5-r1
@@ -3,11 +3,12 @@ DEPEND=dev-lang/tk:*
 DESCRIPTION=Tk GUI console
 EAPI=7
 HOMEPAGE=http://tkcon.sourceforge.net/
+INHERIT=multilib
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/tk:*
 SLOT=0
 SRC_URI=mirror://sourceforge/tkcon/tkcon-2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c2cd11b5b06c42c35bb5db0fe6c27e7
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=13ee523deda8b06d96275ffb7036b76c
diff --git a/metadata/md5-cache/dev-tcltk/tls-1.7.16 b/metadata/md5-cache/dev-tcltk/tls-1.7.16
index 923d5d93e0ba..e5de3964c535 100644
--- a/metadata/md5-cache/dev-tcltk/tls-1.7.16
+++ b/metadata/md5-cache/dev-tcltk/tls-1.7.16
@@ -3,7 +3,6 @@ DEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
 DESCRIPTION=TLS OpenSSL extension to Tcl
 EAPI=6
 HOMEPAGE=http://tls.sourceforge.net/
-INHERIT=eutils
 IUSE=tk
 KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
@@ -11,5 +10,4 @@ RDEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://core.tcl.tk/tcltls/uv/tcltls-1.7.16.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
-_md5_=70d7a2dcd8191f2f90823a9a37cfb810
+_md5_=4ce4b6fea8bba67b5cb699f61c6ebd9f
diff --git a/metadata/md5-cache/dev-util/babeltrace-1.5.8 b/metadata/md5-cache/dev-util/babeltrace-1.5.8
index 95cc06ceb0b1..6206624b0fd0 100644
--- a/metadata/md5-cache/dev-util/babeltrace-1.5.8
+++ b/metadata/md5-cache/dev-util/babeltrace-1.5.8
@@ -3,7 +3,6 @@ DEPEND=dev-libs/glib:2 dev-libs/popt dev-libs/elfutils sys-apps/util-linux sys-d
 DESCRIPTION=A command-line tool and library to read and convert trace files
 EAPI=7
 HOMEPAGE=https://babeltrace.org/
-INHERIT=eutils
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
@@ -11,5 +10,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/popt dev-libs/elfutils sys-apps/util-linux
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.efficios.com/files/babeltrace/babeltrace-1.5.8.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=60b528ead16e4fed49880536563e4a73
+_md5_=fb3d6bf6d3308acaa9929f0e64cfbe82
diff --git a/metadata/md5-cache/dev-util/buildbot-2.10.0 b/metadata/md5-cache/dev-util/buildbot-2.10.0
index fb1afa8b49ae..c0db1693cde2 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.10.0
+++ b/metadata/md5-cache/dev-util/buildbot-2.10.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.10.0.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=6116947f79e84abe411adfa0b20937ce
+_md5_=bca274cb9571b7012922587d69f4a441
diff --git a/metadata/md5-cache/dev-util/buildbot-2.10.1 b/metadata/md5-cache/dev-util/buildbot-2.10.1
index 0497903b352b..e49219803bf5 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.10.1
+++ b/metadata/md5-cache/dev-util/buildbot-2.10.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.10.1.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=6116947f79e84abe411adfa0b20937ce
+_md5_=bca274cb9571b7012922587d69f4a441
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.2-r1 b/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
index 62e4e697c425..9c2240d056f0 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.8.2.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=6ab4eeea2b0c4c398414d9c47ca82a45
+_md5_=49b6766f3cba6ce66003aa7d6e60b7f0
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.4 b/metadata/md5-cache/dev-util/buildbot-2.8.4
index ff3ee1674a4f..611a5d262b76 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.8.4.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=158d385bc8ec414cf016009d530fc013
+_md5_=685c8c483f80131138384082469f7765
diff --git a/metadata/md5-cache/dev-util/buildbot-3.0.2 b/metadata/md5-cache/dev-util/buildbot-3.0.2
index 5e319e0e4eec..d4c0ab0c064a 100644
--- a/metadata/md5-cache/dev-util/buildbot-3.0.2
+++ b/metadata/md5-cache/dev-util/buildbot-3.0.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-3.0.2.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=9acade63683091d333846dbd67123179
+_md5_=e2ae5c51d863fc19f5599b4de9d974d7
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index c5fbb8a413d5..739936ad87f6 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=5dd1974ed32470c935d328e61e046daa
+_md5_=33304edf8c06a9ec7ae21aaa1fb52a27
diff --git a/metadata/md5-cache/dev-util/cccc-3.1.5-r1 b/metadata/md5-cache/dev-util/cccc-3.1.5-r1
index b481e223172e..c514d4687b1c 100644
--- a/metadata/md5-cache/dev-util/cccc-3.1.5-r1
+++ b/metadata/md5-cache/dev-util/cccc-3.1.5-r1
@@ -3,11 +3,11 @@ DEPEND=apidoc? ( app-doc/doxygen[dot] )
 DESCRIPTION=Source metrics (line counts, complexity, etc) for Java and C++
 EAPI=6
 HOMEPAGE=http://sarnold.github.io/cccc/
-INHERIT=eutils toolchain-funcs flag-o-matic
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=apidoc debug doc mfc
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/sarnold/cccc/archive/3.1.5.tar.gz -> cccc-3.1.5.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=b307dae4d4b7710730e0d8e0077f123f
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=eeb259cacf1beaf99a41e98426fc3201
diff --git a/metadata/md5-cache/dev-util/cccc-3.1.6 b/metadata/md5-cache/dev-util/cccc-3.1.6
index daeec26590ad..0586cbadb6e9 100644
--- a/metadata/md5-cache/dev-util/cccc-3.1.6
+++ b/metadata/md5-cache/dev-util/cccc-3.1.6
@@ -3,11 +3,11 @@ DEPEND=apidoc? ( app-doc/doxygen[dot] )
 DESCRIPTION=Source metrics (line counts, complexity, etc) for Java and C++
 EAPI=6
 HOMEPAGE=http://sarnold.github.io/cccc/
-INHERIT=eutils toolchain-funcs flag-o-matic
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=apidoc debug doc mfc
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/sarnold/cccc/archive/3.1.6.tar.gz -> cccc-3.1.6.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=b307dae4d4b7710730e0d8e0077f123f
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=65f5975e41e2e022659a38d54fb509ac
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.123 b/metadata/md5-cache/dev-util/debootstrap-1.0.123
index 5588758235c2..61e51cefecb1 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.123
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.123
@@ -7,5 +7,4 @@ LICENSE=MIT
 RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.123.tar.gz mirror://gentoo/devices.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72d4959bb830429f50d896c07a3060c9
+_md5_=672ed15f34bb03a4918c0e895167bd6e
diff --git a/metadata/md5-cache/dev-util/hxd-0.70.02-r2 b/metadata/md5-cache/dev-util/hxd-0.70.02-r2
index cefea009ed20..9c64ad1a8a05 100644
--- a/metadata/md5-cache/dev-util/hxd-0.70.02-r2
+++ b/metadata/md5-cache/dev-util/hxd-0.70.02-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Binary to hexadecimal converter
 EAPI=6
 HOMEPAGE=http://www-tet.ee.tu-berlin.de/solyga/linux/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linux.xulin.de/c/hxd-0.70.02.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
-_md5_=577cf4b3f81a8f91ef459a9020678a04
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=92bfd2fb535de921a248d5e1403e3433
diff --git a/metadata/md5-cache/dev-util/kup-0.3.4-r1 b/metadata/md5-cache/dev-util/kup-0.3.4-r1
index fee4e09e7d0a..e905639ff724 100644
--- a/metadata/md5-cache/dev-util/kup-0.3.4-r1
+++ b/metadata/md5-cache/dev-util/kup-0.3.4-r1
@@ -2,11 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=kernel.org uploader tool
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/software/network/kup
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/BSD-Resource dev-perl/Config-Simple
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/kup/kup-0.3.4.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
-_md5_=68105cdd44495d7188763e22492eb36f
+_md5_=20c017d271d7617405aa89f2442ccb34
diff --git a/metadata/md5-cache/dev-util/kup-0.3.6 b/metadata/md5-cache/dev-util/kup-0.3.6
index 9524daf06976..162f4c708903 100644
--- a/metadata/md5-cache/dev-util/kup-0.3.6
+++ b/metadata/md5-cache/dev-util/kup-0.3.6
@@ -7,5 +7,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/BSD-Resource dev-perl/Config-Simple
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/kup/kup-0.3.6.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67e4e3d46c7359776e18a450b6dca978
+_md5_=f5c97b0d69e7a4b4d589b3fb544eed7a
diff --git a/metadata/md5-cache/dev-util/perf-5.10.16 b/metadata/md5-cache/dev-util/perf-5.10.16
index 1b3f0ac2d4b4..2fe327599d84 100644
--- a/metadata/md5-cache/dev-util/perf-5.10.16
+++ b/metadata/md5-cache/dev-util/perf-5.10.16
@@ -4,7 +4,7 @@ DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
-INHERIT=bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+INHERIT=bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
 IUSE=audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.16.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=3513aacc6d62bac0ce0d3057b6e04aa6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=4515d41ea34447ba431d90df5268045e
diff --git a/metadata/md5-cache/dev-util/perf-5.11 b/metadata/md5-cache/dev-util/perf-5.11
index 6c040a96eece..d45ed30cab80 100644
--- a/metadata/md5-cache/dev-util/perf-5.11
+++ b/metadata/md5-cache/dev-util/perf-5.11
@@ -4,7 +4,7 @@ DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
-INHERIT=bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+INHERIT=bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
 IUSE=audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=3513aacc6d62bac0ce0d3057b6e04aa6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=4515d41ea34447ba431d90df5268045e
diff --git a/metadata/md5-cache/dev-util/perf-5.8 b/metadata/md5-cache/dev-util/perf-5.8
index 98a433330caa..63464700d35e 100644
--- a/metadata/md5-cache/dev-util/perf-5.8
+++ b/metadata/md5-cache/dev-util/perf-5.8
@@ -3,7 +3,7 @@ DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
-INHERIT=bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+INHERIT=bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
 IUSE=audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=0a8f67cb049350972c7412b38114fe52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=1cd44b129f5a41d614c54bb48ceba641
diff --git a/metadata/md5-cache/dev-util/perf-5.9.9 b/metadata/md5-cache/dev-util/perf-5.9.9
index 5aee359c3ffa..0fe8fc2c9e91 100644
--- a/metadata/md5-cache/dev-util/perf-5.9.9
+++ b/metadata/md5-cache/dev-util/perf-5.9.9
@@ -4,7 +4,7 @@ DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
-INHERIT=bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+INHERIT=bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
 IUSE=audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.9.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=c5724cb8bc008a6d28414adedb52cd5b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	llvm	9a7b0b234f4be44fe82e04eefb36e8f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=771865b239c4bf50ac6f8e8a268bd70b
diff --git a/metadata/md5-cache/dev-util/quilt-0.66 b/metadata/md5-cache/dev-util/quilt-0.66
index 6c8e4675d822..bc896a6155e4 100644
--- a/metadata/md5-cache/dev-util/quilt-0.66
+++ b/metadata/md5-cache/dev-util/quilt-0.66
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DESCRIPTION=quilt patch manager
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/quilt
-INHERIT=bash-completion-r1 eutils
+INHERIT=bash-completion-r1
 IUSE=emacs graphviz elibc_Darwin elibc_SunOS
 KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) elibc_Dar
 RESTRICT=test
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/quilt/quilt-0.66.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=c2c5981491ec1b5ceeaf7ab6b2c34e10
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
+_md5_=076fc8cb770925674502b5d35f389299
diff --git a/metadata/md5-cache/dev-util/quilt-0.66-r1 b/metadata/md5-cache/dev-util/quilt-0.66-r1
index 4dd30368fdec..8eb13933c4e5 100644
--- a/metadata/md5-cache/dev-util/quilt-0.66-r1
+++ b/metadata/md5-cache/dev-util/quilt-0.66-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare setup
 DESCRIPTION=quilt patch manager
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/quilt
-INHERIT=bash-completion-r1 eutils
+INHERIT=bash-completion-r1
 IUSE=emacs graphviz elibc_Darwin elibc_SunOS
 KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/ed dev-util/diffstat graphviz? ( media-gfx/graphviz ) elibc_Dar
 RESTRICT=test
 SLOT=0
 SRC_URI=https://savannah.nongnu.orgdownload/quilt/quilt-0.66.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=f03027e15794a29d8ca232f60be7b6f8
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
+_md5_=0b2bdd6893fa8b28154cfdfb2df8af0c
diff --git a/metadata/md5-cache/dev-util/webhook-2.7.0 b/metadata/md5-cache/dev-util/webhook-2.7.0
index 354a7d800933..7076c433f9d0 100644
--- a/metadata/md5-cache/dev-util/webhook-2.7.0
+++ b/metadata/md5-cache/dev-util/webhook-2.7.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=lightweight incoming webhook server to run shell commands
 EAPI=7
 HOMEPAGE=https://github.com/adnanh/webhook/
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD-2 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/adnanh/webhook/archive/2.7.0.tar.gz -> webhook-2.7.0.tar.gz mirror://goproxy//github.com/clbanning/mxj/@v/v1.8.4.zip -> github.com%2Fclbanning%2Fmxj%2F@v%2Fv1.8.4.zip mirror://goproxy//github.com/clbanning/mxj/@v/v1.8.4.mod -> github.com%2Fclbanning%2Fmxj%2F@v%2Fv1.8.4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-chi/chi/@v/v4.0.2+incompatible.zip -> github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.0.2+incompatible.zip mirror://goproxy//github.com/go-chi/chi/@v/v4.0.2+incompatible.mod -> github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.0.2+incompatible.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.2.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.2.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.2.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	go-module	92660621959e7fab813173772987588b	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35381c118549185c4e693549ca4c09ce
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=3b612251713ef617868b27c9c6b8dac8
diff --git a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1 b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
index 4418693ee2e2..035699250895 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
+++ b/metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Generates patchset information from a CVS repository
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=208ab3e45a16c65c9a238529a35ed5ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=f8330cad0302d64e4a574f463e799efa
diff --git a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2 b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
index 2988ea4a623e..28b03f8e5eab 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
+++ b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib app-text/asciidoc
 DESCRIPTION=Generates patchset information from a CVS repository (supports fast-import)
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=3
 SRC_URI=http://www.catb.org/~esr/cvsps/cvsps-3.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=e070009d4303b5efab581232913caa78
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=51fe0ec1a24b7fa6bbe6e2eb805957a2
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.5.2 b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
index f4491ed74f67..72029bd7ab36 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.5.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
@@ -4,7 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
-INHERIT=bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+INHERIT=bash-completion-r1 elisp-common distutils-r1 flag-o-matic
 IUSE=+chg emacs gpg test tk zsh-completion python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=d7db7da79e50fc479282e8e6004ce5ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=032c1aa7f2417a8b5b72ad01b4874cf5
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1
index 47b203accc28..e921c219c9a6 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1
@@ -4,7 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
-INHERIT=bash-completion-r1 cargo elisp-common eutils distutils-r1 flag-o-matic
+INHERIT=bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic
 IUSE=+chg emacs gpg test tk rust zsh-completion debug python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.6.1.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.60/download -> cc-1.0.60.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cpython/0.4.1/download -> cpython-0.4.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download -> crossbeam-queue-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.17/download -> flate2-1.0.17.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.5.6/download -> memoffset-0.5.6.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.2/download -> miniz_oxide-0.4.2.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.18/download -> pkg-config-0.3.18.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/python27-sys/0.4.1/download -> python27-sys-0.4.1.crate https://crates.io/api/v1/crates/python3-sys/0.4.1/download -> python3-sys-0.4.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.4.0/download -> rayon-1.4.0.crate https://crates.io/api/v1/crates/rayon-core/1.8.1/download -> rayon-core-1.8.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.41/download -> syn-1.0.41.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.5.0/download -> twox-hash-1.5.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	9addecaaccf5f5938f36c0163768a6e6	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=b1db2b3285bf53ec7286705cad5c678c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	9addecaaccf5f5938f36c0163768a6e6	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=93110467c772cda9a049868d16a14094
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.7 b/metadata/md5-cache/dev-vcs/mercurial-5.7
index a8108f152ec5..64c66bbc5596 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.7
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.7
@@ -4,7 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
-INHERIT=bash-completion-r1 cargo elisp-common eutils distutils-r1 flag-o-matic
+INHERIT=bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic
 IUSE=+chg emacs gpg test tk rust zsh-completion debug python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.7.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpython/0.4.1/download -> cpython-0.4.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.1.3/download -> format-bytes-0.1.3.crate https://crates.io/api/v1/crates/format-bytes-macros/0.1.2/download -> format-bytes-macros-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.4.1/download -> python27-sys-0.4.1.crate https://crates.io/api/v1/crates/python3-sys/0.4.1/download -> python3-sys-0.4.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	9addecaaccf5f5938f36c0163768a6e6	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=f51ea596b6d1517f96e08f3d3ef7314f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	9addecaaccf5f5938f36c0163768a6e6	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=ff6278d2fa118a2330535845fb4dd414
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index 4f7834bff727..1feee8742d41 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -4,7 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
-INHERIT=bash-completion-r1 cargo elisp-common eutils distutils-r1 mercurial flag-o-matic
+INHERIT=bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic
 IUSE=+chg emacs gpg test tk rust zsh-completion debug python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2+
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	9addecaaccf5f5938f36c0163768a6e6	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	mercurial	9f2bfb53237de8f79541b5592ed52f7a	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=955cbf342a5df45a7e01128e490aed01
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	9addecaaccf5f5938f36c0163768a6e6	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	mercurial	9f2bfb53237de8f79541b5592ed52f7a	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=bc44b8c26439e84d2308f9bf6d2ccd90
diff --git a/metadata/md5-cache/games-action/deathchase3d-0.9-r1 b/metadata/md5-cache/games-action/deathchase3d-0.9-r1
index ded1de0a73f3..9b97a2c39512 100644
--- a/metadata/md5-cache/games-action/deathchase3d-0.9-r1
+++ b/metadata/md5-cache/games-action/deathchase3d-0.9-r1
@@ -3,11 +3,9 @@ DEPEND=media-libs/libsdl[video]
 DESCRIPTION=A remake of the Sinclair Spectrum game of the same name
 EAPI=6
 HOMEPAGE=http://www.autismuk.freeserve.co.uk/
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=http://www.autismuk.freeserve.co.uk/deathchase3d-0.9.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
-_md5_=a2d78e9f6b046710ef0960c1a8ceb074
+_md5_=6f77ed056e382f7aedeacf2d4e8f2c7a
diff --git a/metadata/md5-cache/games-action/descent1-data-1.4a b/metadata/md5-cache/games-action/descent1-data-1.4a
index 4d2fd00f3e73..602ed5a1b832 100644
--- a/metadata/md5-cache/games-action/descent1-data-1.4a
+++ b/metadata/md5-cache/games-action/descent1-data-1.4a
@@ -3,7 +3,7 @@ DEPEND=cdinstall? ( app-arch/unzip ) !cdinstall? ( app-arch/innoextract )
 DESCRIPTION=Data files for Descent 1
 EAPI=6
 HOMEPAGE=http://www.interplay.com/games/descent.php
-INHERIT=cdrom estack eutils
+INHERIT=cdrom estack
 IUSE=doc cdinstall
 KEYWORDS=~amd64 ~x86
 LICENSE=descent-data
@@ -12,5 +12,5 @@ RDEPEND=!games-action/descent1-demodata
 RESTRICT=bindist !cdinstall? ( fetch )
 SLOT=0
 SRC_URI=cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/descent-game-content-10to14a-patch.zip ) !cdinstall? ( setup_descent_1.4a_(16596).exe )
-_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	cdrom	dd6ba7b03316338a4fdd3ebbade8a719	estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=4b24b2005e35bb0f92633bffceab3911
+_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	cdrom	dd6ba7b03316338a4fdd3ebbade8a719	estack	055c42df72f76a4f45ec92b35e83cd56
+_md5_=037a1ff5c0aefa1025d820155f77165a
diff --git a/metadata/md5-cache/games-action/descent2-data-1.2 b/metadata/md5-cache/games-action/descent2-data-1.2
index 899d18cc412c..a72b6fac7916 100644
--- a/metadata/md5-cache/games-action/descent2-data-1.2
+++ b/metadata/md5-cache/games-action/descent2-data-1.2
@@ -3,7 +3,7 @@ DEPEND=cdinstall? ( app-arch/arj dev-util/xdelta:3 ) !cdinstall? ( app-arch/inno
 DESCRIPTION=Data files for Descent 2
 EAPI=6
 HOMEPAGE=http://www.interplay.com/games/descent.php
-INHERIT=cdrom estack eutils
+INHERIT=cdrom estack
 IUSE=doc videos cdinstall
 KEYWORDS=~amd64 ~x86
 LICENSE=descent-data
@@ -12,5 +12,5 @@ RDEPEND=!<games-action/d2x-0.2.5-r3 !games-action/descent2-demodata
 RESTRICT=bindist !cdinstall? ( fetch )
 SLOT=0
 SRC_URI=cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz ) !cdinstall? ( setup_descent_2_1.1_(16596).exe )
-_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	cdrom	dd6ba7b03316338a4fdd3ebbade8a719	estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=c5e0f21bcf4510b51990d81fc96f522a
+_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	cdrom	dd6ba7b03316338a4fdd3ebbade8a719	estack	055c42df72f76a4f45ec92b35e83cd56
+_md5_=dca7700696211dc1df8f330d2bb5cc49
diff --git a/metadata/md5-cache/games-action/descent2-vertigo-1.0 b/metadata/md5-cache/games-action/descent2-vertigo-1.0
index 0806a2e8d6cd..8fa24c84c699 100644
--- a/metadata/md5-cache/games-action/descent2-vertigo-1.0
+++ b/metadata/md5-cache/games-action/descent2-vertigo-1.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst unpack
 DESCRIPTION=Data files for Descent 2: The Vertigo Series
 EAPI=6
 HOMEPAGE=http://www.interplay.com/games/descent.php
-INHERIT=cdrom estack eutils
+INHERIT=cdrom estack
 IUSE=videos
 KEYWORDS=~amd64 ~x86
 LICENSE=descent-data
 PROPERTIES=interactive
 RESTRICT=bindist
 SLOT=0
-_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	cdrom	dd6ba7b03316338a4fdd3ebbade8a719	estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=faa3411ff5040bb6a5de946dee4c679a
+_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	cdrom	dd6ba7b03316338a4fdd3ebbade8a719	estack	055c42df72f76a4f45ec92b35e83cd56
+_md5_=248256e90b2a8dcda38ce618b7146889
diff --git a/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1 b/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1
index 8dd204715fff..2443568d9990 100644
--- a/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1
+++ b/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1
@@ -3,11 +3,11 @@ DEPEND=acct-group/gamestat sys-libs/ncurses:0 virtual/pkgconfig sys-devel/gnucon
 DESCRIPTION=A simple console game, where you drive a car across the moon's surface
 EAPI=6
 HOMEPAGE=https://www.seehuhn.de/pages/moon-buggy.html
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/gamestat sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://m.seehuhn.de/programs/moon-buggy-1.0.51.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_=95a437d176fe45659efcbd61298db895
+_md5_=bb341257173930f1dbfd4223b43128aa
diff --git a/metadata/md5-cache/games-action/noiz2sa-0.51a-r1 b/metadata/md5-cache/games-action/noiz2sa-0.51a-r1
index 61e8485d133e..25f66dac3ff2 100644
--- a/metadata/md5-cache/games-action/noiz2sa-0.51a-r1
+++ b/metadata/md5-cache/games-action/noiz2sa-0.51a-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/sdl-mixer[vorbis] virtual/opengl
 DESCRIPTION=Abstract Shooting Game
 EAPI=6
 HOMEPAGE=http://www.asahi-net.or.jp/~cs8k-cyu/windows/noiz2sa_e.html https://sourceforge.net/projects/noiz2sa/
-INHERIT=eutils user
+INHERIT=user
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/sdl-mixer[vorbis] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/noiz2sa/noiz2sa-0.51a.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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=25dddaded2788c6e3b12575130abb515
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=5f84afc62d0286d6899012525515c485
diff --git a/metadata/md5-cache/games-action/rrootage-0.23a-r1 b/metadata/md5-cache/games-action/rrootage-0.23a-r1
index 2e794a1ec8bf..6637a145fd38 100644
--- a/metadata/md5-cache/games-action/rrootage-0.23a-r1
+++ b/metadata/md5-cache/games-action/rrootage-0.23a-r1
@@ -3,11 +3,9 @@ DEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/libsdl[video] media-libs/sdl-mixe
 DESCRIPTION=Abstract shooter - defeat auto-created huge battleships
 EAPI=6
 HOMEPAGE=http://www.asahi-net.or.jp/~cs8k-cyu/windows/rr_e.html http://rrootage.sourceforge.net/
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/rrootage/rRootage-0.23a.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
-_md5_=47e4f970e3db634b1c953550ae1af4c6
+_md5_=2a0c3f60b9b06669f77d9f6be5164552
diff --git a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1-r1 b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1-r1
index 71ed333c1c69..1b5524417db3 100644
--- a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1-r1
+++ b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1-r1
@@ -11,4 +11,4 @@ RESTRICT=fetch strip
 SLOT=0
 SRC_URI=shadowgroundsUpdate1.run
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac4bab15c6a43ab4925c3729699aedfd
+_md5_=23aef1343177402abddc4eb9a9dde356
diff --git a/metadata/md5-cache/games-board/sjeng-11.2_p8_p1 b/metadata/md5-cache/games-board/sjeng-11.2_p8_p1
index c2474a2a2020..42aa4317dac8 100644
--- a/metadata/md5-cache/games-board/sjeng-11.2_p8_p1
+++ b/metadata/md5-cache/games-board/sjeng-11.2_p8_p1
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/gdbm:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/sjeng/Sjeng-Free-11.2.tar.gz mirror://debian/pool/main/s/sjeng/sjeng_11.2-8.1.diff.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=f00b415c5172501bb304cf4cd5721b6f
+_md5_=89a12429d4834629a570c2a52f73df4c
diff --git a/metadata/md5-cache/games-fps/quakeforge-0.7.2-r1 b/metadata/md5-cache/games-fps/quakeforge-0.7.2-r1
index a855a5c1d1b8..22b03167ebd5 100644
--- a/metadata/md5-cache/games-fps/quakeforge-0.7.2-r1
+++ b/metadata/md5-cache/games-fps/quakeforge-0.7.2-r1
@@ -3,7 +3,7 @@ DEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl alsa? ( media-libs/
 DESCRIPTION=New 3d engine based off of id Softwares's Quake and QuakeWorld game engine
 EAPI=6
 HOMEPAGE=http://www.quakeforge.net/
-INHERIT=eutils flag-o-matic autotools
+INHERIT=flag-o-matic autotools
 IUSE=alsa cdinstall debug dga fbcon flac ipv6 ncurses oss png sdl vorbis wildmidi X xdg xv zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl alsa? ( media-libs
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/quake/quakeforge-0.7.2.tar.bz2
-_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	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=0cf5aab32b2bf670000205abdc89012d
+_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	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=35f89f6a2354ef821bd47dd420b25332
diff --git a/metadata/md5-cache/games-fps/rott-1.1.2-r1 b/metadata/md5-cache/games-fps/rott-1.1.2-r1
index 38f7e19baaae..ae09b1321819 100644
--- a/metadata/md5-cache/games-fps/rott-1.1.2-r1
+++ b/metadata/md5-cache/games-fps/rott-1.1.2-r1
@@ -3,12 +3,10 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer app-arch/unz
 DESCRIPTION=Rise of the Triad for Linux!
 EAPI=6
 HOMEPAGE=http://www.icculus.org/rott/
-INHERIT=eutils
 IUSE=demo
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=http://www.icculus.org/rott/releases/rott-1.1.2.tar.gz demo? ( http://filesingularity.timedoctor.org/swdata.zip )
-_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
-_md5_=0a8ccdb72ec2157c57465f1fceafe4ea
+_md5_=54ba22b6f64a0923da574f36a6d74bf6
diff --git a/metadata/md5-cache/games-fps/wolfgl-0.93-r2 b/metadata/md5-cache/games-fps/wolfgl-0.93-r2
index bdc93f4dcf32..514a07a13eb9 100644
--- a/metadata/md5-cache/games-fps/wolfgl-0.93-r2
+++ b/metadata/md5-cache/games-fps/wolfgl-0.93-r2
@@ -3,11 +3,9 @@ DEPEND=virtual/opengl app-arch/unzip x11-base/xorg-proto
 DESCRIPTION=Wolfenstein and Spear of Destiny port using OpenGL
 EAPI=6
 HOMEPAGE=http://wolfgl.sourceforge.net/
-INHERIT=eutils
 KEYWORDS=~x86
 LICENSE=GPL-2
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=mirror://gentoo/wolfgl-0.93.tbz2 mirror://sourceforge/wolfgl/wolfdata.zip mirror://sourceforge/wolfgl/sdmdata.zip
-_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
-_md5_=b80e1c05b5972d335d4f0a15a6a20cf7
+_md5_=bca751fecc6a233fadacc82d8f664e3f
diff --git a/metadata/md5-cache/games-kids/gmult-8.0-r1 b/metadata/md5-cache/games-kids/gmult-8.0-r1
index 790e6f7a002c..da78700c01bf 100644
--- a/metadata/md5-cache/games-kids/gmult-8.0-r1
+++ b/metadata/md5-cache/games-kids/gmult-8.0-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl sys-devel/gettext virtual
 DESCRIPTION=Multiplication Puzzle emulates the multiplication game found in Emacs
 EAPI=6
 HOMEPAGE=http://www.mterry.name/gmult/
-INHERIT=eutils gnome2-utils flag-o-matic
+INHERIT=gnome2-utils flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl
 SLOT=0
 SRC_URI=https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2
 _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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=70ea4d905aa8415919fa727c0dae44b9
+_md5_=0b332db981b2595be3f8024dd6e948f1
diff --git a/metadata/md5-cache/games-mud/crystal-0.2.4-r1 b/metadata/md5-cache/games-mud/crystal-0.2.4-r1
index e4982d80623f..cbb78a643a6e 100644
--- a/metadata/md5-cache/games-mud/crystal-0.2.4-r1
+++ b/metadata/md5-cache/games-mud/crystal-0.2.4-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/openssl:0= sys-libs/ncurses:0= sys-libs/zlib virtual/libiconv vi
 DESCRIPTION=The crystal MUD client
 EAPI=6
 HOMEPAGE=http://www.evilmagic.org/crystal/
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= sys-libs/ncurses:0= sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=http://www.evilmagic.org/dist/crystal-0.2.4.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_=8b4f20a7c77a79800a7e3588866c6fcd
+_md5_=c3f7d45effb0324820c0e0448eceb18b
diff --git a/metadata/md5-cache/games-mud/gmudix-1.0-r1 b/metadata/md5-cache/games-mud/gmudix-1.0-r1
index 3b514bccde0d..e709f1ae2339 100644
--- a/metadata/md5-cache/games-mud/gmudix-1.0-r1
+++ b/metadata/md5-cache/games-mud/gmudix-1.0-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-p
 DESCRIPTION=GTK+ MUD client with many features and an easy scripting language
 EAPI=6
 HOMEPAGE=http://dw.nl.eu.org/mudix.html
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dw.nl.eu.org/gmudix/gmudix-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
-_md5_=df1eaa7a2197bcab8868e728c3645f11
+_md5_=13ab76c4069b06456cd3284c8966cccd
diff --git a/metadata/md5-cache/games-mud/kildclient-3.0.1-r1 b/metadata/md5-cache/games-mud/kildclient-3.0.1-r1
index 3b43d2d2fec6..24ea6222fbfc 100644
--- a/metadata/md5-cache/games-mud/kildclient-3.0.1-r1
+++ b/metadata/md5-cache/games-mud/kildclient-3.0.1-r1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/perl dev-perl/Locale-gettext dev-perl/JSON sys-libs/zlib x11-lib
 DESCRIPTION=Powerful MUD client with a built-in PERL interpreter
 EAPI=6
 HOMEPAGE=http://kildclient.sourceforge.net
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=doc gnutls spell
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/perl dev-perl/Locale-gettext dev-perl/JSON sys-libs/zlib x11-li
 SLOT=0
 SRC_URI=mirror://sourceforge/kildclient/kildclient-3.0.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_=7529815f599f94d00e03501b49464a4a
+_md5_=afec22b2ec30e62a718e0ac5f21463be
diff --git a/metadata/md5-cache/games-rpg/xu4-0.9-r1 b/metadata/md5-cache/games-rpg/xu4-0.9-r1
index 0d0df2bf915d..7a4d0f81b143 100644
--- a/metadata/md5-cache/games-rpg/xu4-0.9-r1
+++ b/metadata/md5-cache/games-rpg/xu4-0.9-r1
@@ -3,11 +3,9 @@ DEPEND=dev-libs/libxml2 media-libs/libsdl[sound,video] media-libs/sdl-mixer[timi
 DESCRIPTION=A remake of the computer game Ultima IV
 EAPI=6
 HOMEPAGE=http://xu4.sourceforge.net/
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/libsdl[sound,video] media-libs/sdl-mixer[timidity]
 SLOT=0
 SRC_URI=mirror://sourceforge/xu4/xu4-0.9.tar.gz mirror://sourceforge/xu4/ultima4-1.01.zip mirror://sourceforge/xu4/u4upgrad.zip
-_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
-_md5_=9ff4bee37f837705458a8fdb1ce4c28d
+_md5_=e1121209bea3548407b5c029732a716a
diff --git a/metadata/md5-cache/games-server/monopd-0.10.2-r1 b/metadata/md5-cache/games-server/monopd-0.10.2-r1
index d3ae66281e9c..3c0145716a88 100644
--- a/metadata/md5-cache/games-server/monopd-0.10.2-r1
+++ b/metadata/md5-cache/games-server/monopd-0.10.2-r1
@@ -3,7 +3,7 @@ DEPEND=systemd? ( sys-apps/systemd ) >=dev-cpp/muParser-2 dev-libs/utfcpp sys-de
 DESCRIPTION=server for atlantik games
 EAPI=6
 HOMEPAGE=http://gtkatlantic.gradator.net/
-INHERIT=autotools eutils flag-o-matic systemd
+INHERIT=autotools flag-o-matic systemd
 IUSE=systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/gtkatlantic/monopd/monopd-0.10.2.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	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=65e53e971d2000ad8a9c3f0bc5edd6d3
+_md5_=85a403a821fdefc08a0b2fb57f19be2c
diff --git a/metadata/md5-cache/games-server/mtavc-0.5-r2 b/metadata/md5-cache/games-server/mtavc-0.5-r2
index 29086aa43952..7811494fae67 100644
--- a/metadata/md5-cache/games-server/mtavc-0.5-r2
+++ b/metadata/md5-cache/games-server/mtavc-0.5-r2
@@ -2,11 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=dedicated server for GTA3 multiplayer
 EAPI=6
 HOMEPAGE=http://mtavc.com/
-INHERIT=eutils
 KEYWORDS=-* ~x86
 LICENSE=MTA-0.5
 RDEPEND=sys-libs/libstdc++-v3:5
 SLOT=0
 SRC_URI=http://files.gonnaplay.com/201/MTAServer0_5-linux.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
-_md5_=3ea9a9387b2d09f27070cde8d94886fb
+_md5_=a7b29291e1fe14334aebb2277bda9bc6
diff --git a/metadata/md5-cache/games-simulation/senken-0.3.0-r1 b/metadata/md5-cache/games-simulation/senken-0.3.0-r1
index e3427c732dfb..b792402f5342 100644
--- a/metadata/md5-cache/games-simulation/senken-0.3.0-r1
+++ b/metadata/md5-cache/games-simulation/senken-0.3.0-r1
@@ -3,12 +3,10 @@ DEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( vir
 DESCRIPTION=city simulation game
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/senken/
-INHERIT=eutils
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gentoo/senken-0.3.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
-_md5_=4f6369171bae93c9d1e7a02f1cc08dc8
+_md5_=bc58d92a2b5c0868551a17f3270d2299
diff --git a/metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r2 b/metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r2
index eb0dd5397190..04228da3f6aa 100644
--- a/metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r2
+++ b/metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r2
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=Simulation of a true AI. Go from computer to computer, chased by the whole world
 EAPI=7
 HOMEPAGE=http://www.emhsoft.com/singularity/ https://github.com/singularity/singularity
-INHERIT=desktop eutils python-single-r1
+INHERIT=desktop python-single-r1 wrapper
 IUSE=python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 CC-BY-SA-2.5
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/singularity/singularity/releases/download/singularity-1.0a1/singularity-1.0a1.tar.gz http://emhsoft.com/singularity/endgame-singularity-music-007.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=c8411bc099805f3c78ae33f0b8b19edc
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=080a89a36e3221534f618e691c2ffc34
diff --git a/metadata/md5-cache/games-simulation/sky-rogue-1.3 b/metadata/md5-cache/games-simulation/sky-rogue-1.3
index 80be1d58f14a..4ebff0292a0c 100644
--- a/metadata/md5-cache/games-simulation/sky-rogue-1.3
+++ b/metadata/md5-cache/games-simulation/sky-rogue-1.3
@@ -4,11 +4,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A fwooshy rogue-lite action flight simulator
 EAPI=7
 HOMEPAGE=https://skyroguegame.com/
+INHERIT=desktop wrapper xdg
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=sys-libs/zlib virtual/opengl
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=sky-rogue-linux.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e170314031e3933b30441b9da01e803c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=b62609a023eb3b5c38d3d1e2ff0d8729
diff --git a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605 b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
index 8ec66d1e4d54..ec5e311a0d65 100644
--- a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
+++ b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
@@ -4,12 +4,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cute game where you cultivate slimes on a distant planet
 EAPI=7
 HOMEPAGE=http://www.slimerancher.com/
-INHERIT=eutils desktop unpacker xdg
+INHERIT=desktop unpacker wrapper xdg
 KEYWORDS=-* ~amd64
 LICENSE=GOG-EULA
 RDEPEND=sys-libs/glibc virtual/opengl
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=slime_rancher_1_4_1c_34605.sh
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=bbba890681391a101eaede1b8ff09645
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=5f15fd2faa5c8a7615ae806b55dd976a
diff --git a/metadata/md5-cache/games-simulation/train-valley-1.3.31403 b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
index e21a9fbc87ee..29d0fb027f1d 100644
--- a/metadata/md5-cache/games-simulation/train-valley-1.3.31403
+++ b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
@@ -2,7 +2,7 @@ DEFINED_PHASES=install nofetch postinst postrm unpack
 DESCRIPTION=Build railroads in order to connect cities, tunnels, and bridges
 EAPI=7
 HOMEPAGE=http://train-valley.com/tv1.html
-INHERIT=eutils desktop unpacker xdg-utils
+INHERIT=desktop unpacker wrapper xdg-utils
 IUSE=+gui
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl x11-libs/libX11 x11-libs/libXrandr gui? ( dev-libs/glib:2
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=train_valley_1_3_31403.sh
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99cc096340db6d2b530d94241a6e8c78
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3d2ecad15059f3ef9ae186d38f73bec6
diff --git a/metadata/md5-cache/games-sports/foobillard-3.0a-r1 b/metadata/md5-cache/games-sports/foobillard-3.0a-r1
index 950df3994a28..e79eca374784 100644
--- a/metadata/md5-cache/games-sports/foobillard-3.0a-r1
+++ b/metadata/md5-cache/games-sports/foobillard-3.0a-r1
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9:2 media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9:2 media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut )
 DESCRIPTION=8ball, 9ball, snooker and carambol game
-EAPI=6
+EAPI=7
 HOMEPAGE=http://foobillard.sourceforge.net/
 INHERIT=autotools desktop flag-o-matic toolchain-funcs
 IUSE=sdl video_cards_nvidia
@@ -10,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9:2 media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut )
 SLOT=0
 SRC_URI=mirror://gentoo/foobillard-3.0a.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=8ffb61083ce86c27e4011d4b41075d4a
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=670a612d7206d3f7569e1e9cb85fc757
diff --git a/metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1 b/metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1
index 10c9a20c6666..07c745bc8fec 100644
--- a/metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1
+++ b/metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1
@@ -3,7 +3,7 @@ DEPEND=virtual/opengl virtual/glu media-libs/freealut media-libs/freeglut >=medi
 DESCRIPTION=A fork of the famous open racing car simulator TORCS
 EAPI=6
 HOMEPAGE=http://speed-dreams.sourceforge.net/
-INHERIT=autotools eutils versionator
+INHERIT=autotools desktop versionator
 IUSE=xrandr
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=virtual/opengl virtual/glu media-libs/freealut media-libs/freeglut >=med
 SLOT=0
 SRC_URI=mirror://sourceforge/speed-dreams/speed-dreams-1.4.0-r2307-src.tar.bz2
 _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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=ce88c46751301f60abacef4f3ce88149
+_md5_=cf11bd6f44464bddb24391ed91254bdc
diff --git a/metadata/md5-cache/games-sports/torcs-1.3.6-r1 b/metadata/md5-cache/games-sports/torcs-1.3.6-r1
index 7ad5508162c8..10049d424197 100644
--- a/metadata/md5-cache/games-sports/torcs-1.3.6-r1
+++ b/metadata/md5-cache/games-sports/torcs-1.3.6-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/li
 DESCRIPTION=The Open Racing Car Simulator
 EAPI=6
 HOMEPAGE=http://torcs.sourceforge.net/
-INHERIT=autotools eutils multilib vcs-clean
+INHERIT=autotools desktop vcs-clean
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 FreeArt
 RDEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis:= media-libs/openal >=media-libs/plib-1.8.5 sys-libs/zlib:0= virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=mirror://sourceforge/torcs/torcs-1.3.6.tar.bz2
 _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_=8b6c6d59c1c06116845eb1c589227d4d
+_md5_=8f8043d0263db012ec26e81bbca2f474
diff --git a/metadata/md5-cache/games-sports/trophy-2.0.3-r1 b/metadata/md5-cache/games-sports/trophy-2.0.3-r1
index 3b6c23461005..167fe9b4140c 100644
--- a/metadata/md5-cache/games-sports/trophy-2.0.3-r1
+++ b/metadata/md5-cache/games-sports/trophy-2.0.3-r1
@@ -3,11 +3,11 @@ DEPEND=dev-games/clanlib:0.8[opengl] virtual/pkgconfig
 DESCRIPTION=2D Racing Game
 EAPI=6
 HOMEPAGE=http://trophy.sourceforge.net/
-INHERIT=eutils gnome2-utils
+INHERIT=gnome2-utils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-games/clanlib:0.8[opengl]
 SLOT=0
 SRC_URI=mirror://sourceforge/trophy/trophy-2.0.3.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=681f23b2bac3ec41c974ba585179f673
+_md5_=fafc81698141e847b4a68b59580c5a5d
diff --git a/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1 b/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
index 5e0a023d6dc8..217936e7eee1 100644
--- a/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
+++ b/metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
 DESCRIPTION=Global thermonuclear war simulation with multiplayer support
 EAPI=6
 HOMEPAGE=http://www.introversion.co.uk/defcon/
-INHERIT=eutils toolchain-funcs gnome2-utils
+INHERIT=desktop toolchain-funcs gnome2-utils
 IUSE=+system-libs
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=Introversion
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libogg media-libs/libvorbis >=sys-libs/glibc-2.3 x11-libs/lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=x86? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_i386.deb ) amd64? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_amd64.deb )
-_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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=5f3cb7f648245aa072992be275d2e712
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
+_md5_=c4d42a317b8f9a70fe384fdaa7bf162f
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100 b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
index 9153b3cacff9..0ae79960f67f 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
+++ b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
@@ -4,7 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 DESCRIPTION=Cross-platform 3D realtime strategy game
 EAPI=7
 HOMEPAGE=https://megaglest.org/ https://github.com/MegaGlest/megaglest-source
-INHERIT=cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
+INHERIT=cmake desktop lua-single virtualx wxwidgets xdg-utils
 IUSE=debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos lua_single_target_lua5-1 lua_single_target_lua5-2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 BitstreamVera
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wxwidgets	407be90c398e52298054aff2093912a3
-_md5_=93a04682653903c8d1b0609d8f3b7769
+_md5_=a8d22a40be3e34a79d328834a2ce5b6b
diff --git a/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1 b/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
index 634de80cfc98..0c099bb2e452 100644
--- a/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
+++ b/metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
@@ -3,7 +3,7 @@ DEPEND=dev-java/apple-java-extensions-bin:0 dev-java/commons-httpclient:3 dev-ja
 DESCRIPTION=An open source clone of the popular Axis and Allies boardgame
 EAPI=5
 HOMEPAGE=http://triplea.sourceforge.net/
-INHERIT=eutils java-pkg-2 java-ant-2 versionator
+INHERIT=desktop epatch java-pkg-2 java-ant-2 versionator
 IUSE=test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/apple-java-extensions-bin:0 dev-java/commons-httpclient:3 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_1_8_0_9_source_code_only.zip
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=6f049f12f809fb0e5cbac394d9ff32c4
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
+_md5_=17279ece30fbd2cf999c195b6c25aecf
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.28.0 b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.28.0
index 712f8137e22b..78c643ca8453 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.28.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.28.0
@@ -3,7 +3,7 @@ DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-
 DESCRIPTION=Cairo back-end component for the GNUstep GUI Library
 EAPI=7
 HOMEPAGE=http://www.gnustep.org
-INHERIT=eutils gnustep-base
+INHERIT=gnustep-base
 IUSE=opengl xim debug doc
 KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.28.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a
-_md5_=999ba89c076d6375457058e869a51696
+_md5_=49c19e5e1245a1a4497b788c27ce2699
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0 b/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0
index b342b05bcdcf..77c886ce8123 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0
@@ -3,7 +3,7 @@ DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep
 DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
 EAPI=7
 HOMEPAGE=http://www.gnustep.org
-INHERIT=eutils gnustep-base toolchain-funcs
+INHERIT=gnustep-base toolchain-funcs
 IUSE=+gnutls +icu +libffi zeroconf debug doc
 KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnuste
 SLOT=0/1.27
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.27.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a
-_md5_=b35f280911f082857451cd99507ce55a
+_md5_=115646ac8808a76479adb2bbd1a5b0d4
diff --git a/metadata/md5-cache/gnustep-libs/pantomime-1.2.3 b/metadata/md5-cache/gnustep-libs/pantomime-1.2.3
index be3f3fc688c0..c3791ff2bac4 100644
--- a/metadata/md5-cache/gnustep-libs/pantomime-1.2.3
+++ b/metadata/md5-cache/gnustep-libs/pantomime-1.2.3
@@ -3,7 +3,7 @@ DEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 DESCRIPTION=A set of Objective-C classes that model a mail system
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/gnustep-nonfsf/gnumail/
-INHERIT=eutils gnustep-2
+INHERIT=gnustep-2
 IUSE=debug doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1 Elm
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=mirror://nongnu/gnustep-nonfsf/Pantomime-1.2.3.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	gnustep-2	1051c5dfb0d9429bef576c60536dac89
-_md5_=2438ac134e4ef12d77e4874a48871ec1
+_md5_=01028365aee5af0859f21d29c81131e0
diff --git a/metadata/md5-cache/gui-wm/sway-1.5.1-r1 b/metadata/md5-cache/gui-wm/sway-1.5.1-r1
index 808f75de77ce..5bc6d083a16c 100644
--- a/metadata/md5-cache/gui-wm/sway-1.5.1-r1
+++ b/metadata/md5-cache/gui-wm/sway-1.5.1-r1
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre d
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
-INHERIT=eutils meson
+INHERIT=meson
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=MIT
@@ -12,5 +12,5 @@ RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind seatd systemd ) )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.5.1.tar.gz -> sway-1.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
-_md5_=1dc2a61e484a099f4463a31be0503c32
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
+_md5_=672364b8d57789cc80ffc1f3377b6ac9
diff --git a/metadata/md5-cache/gui-wm/sway-1.6 b/metadata/md5-cache/gui-wm/sway-1.6
index 729e9f7e7dfe..4cae34eb6725 100644
--- a/metadata/md5-cache/gui-wm/sway-1.6
+++ b/metadata/md5-cache/gui-wm/sway-1.6
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre d
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
-INHERIT=eutils meson
+INHERIT=meson
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=MIT
@@ -12,5 +12,5 @@ RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind seatd systemd ) )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.6.tar.gz -> sway-1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
-_md5_=6563a6ecd076d96f19c2b5fdc307ff43
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
+_md5_=215a486108c8c7fda7c288799f42e714
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index ddcdb77fa9cc..f0e4c4651d7c 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre d
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
-INHERIT=eutils meson git-r3
+INHERIT=meson git-r3
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind seatd systemd ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=6563a6ecd076d96f19c2b5fdc307ff43
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=215a486108c8c7fda7c288799f42e714
diff --git a/metadata/md5-cache/mail-client/neomutt-20201127 b/metadata/md5-cache/mail-client/neomutt-20201127
index 17bface1997d..110e5f721f63 100644
--- a/metadata/md5-cache/mail-client/neomutt-20201127
+++ b/metadata/md5-cache/mail-client/neomutt-20201127
@@ -11,5 +11,4 @@ REQUIRED_USE=autocrypt? ( gpgme )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20201127.tar.gz -> neomutt-20201127.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7614b89389efd8931ca0328d6679e72
+_md5_=02de5974790e4330cd58c795c58e92ef
diff --git a/metadata/md5-cache/mail-client/neomutt-20201127-r1 b/metadata/md5-cache/mail-client/neomutt-20201127-r1
index 435f37c208cd..6e55213bc09a 100644
--- a/metadata/md5-cache/mail-client/neomutt-20201127-r1
+++ b/metadata/md5-cache/mail-client/neomutt-20201127-r1
@@ -11,5 +11,4 @@ REQUIRED_USE=autocrypt? ( gpgme )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20201127.tar.gz -> neomutt-20201127.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=923629473d2e32c4f47fd2ec0dc460e7
+_md5_=c302f0ce6c4a0b5b314ee3ed84de76c7
diff --git a/metadata/md5-cache/mail-client/neomutt-20210205 b/metadata/md5-cache/mail-client/neomutt-20210205
index b9a7216f116c..48b0f273cce1 100644
--- a/metadata/md5-cache/mail-client/neomutt-20210205
+++ b/metadata/md5-cache/mail-client/neomutt-20210205
@@ -11,5 +11,4 @@ REQUIRED_USE=autocrypt? ( gpgme )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20210205.tar.gz -> neomutt-20210205.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdcb9a53ac0c70580c0dccfbfa519185
+_md5_=c302f0ce6c4a0b5b314ee3ed84de76c7
diff --git a/metadata/md5-cache/mail-client/neomutt-99999999 b/metadata/md5-cache/mail-client/neomutt-99999999
index a42576872aa9..833585c36a31 100644
--- a/metadata/md5-cache/mail-client/neomutt-99999999
+++ b/metadata/md5-cache/mail-client/neomutt-99999999
@@ -4,7 +4,7 @@ DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-li
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=7
 HOMEPAGE=https://neomutt.org/
-INHERIT=eutils git-r3
+INHERIT=git-r3
 IUSE=autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
 LICENSE=GPL-2
 PROPERTIES=live
@@ -13,5 +13,5 @@ REQUIRED_USE=autocrypt? ( gpgme )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=bdcb9a53ac0c70580c0dccfbfa519185
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=c302f0ce6c4a0b5b314ee3ed84de76c7
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26 b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
index 6e60e4115381..0d4e7c01ad10 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
+++ b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
@@ -4,7 +4,7 @@ DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd sys-apps/g
 DESCRIPTION=A milter providing DKIM signing and verification
 EAPI=7
 HOMEPAGE=http://opendkim.org/
-INHERIT=autotools db-use eutils systemd tmpfiles lua-single
+INHERIT=autotools db-use systemd tmpfiles lua-single
 IUSE=berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound lua_single_target_lua5-1 lua_single_target_lua5-2
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD GPL-2 Sendmail-Open-Source
@@ -13,5 +13,5 @@ REQUIRED_USE=sasl? ( ldap ) stats? ( opendbx ) querycache? ( berkdb ) lua? ( ^^
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/opendkim/opendkim-2.10.3.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
-_md5_=c09764f0c5fd2cc0ba69df658ac2be68
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=5384706e335125c65ccf3df689a216bb
diff --git a/metadata/md5-cache/mail-filter/postforward-1.1.0 b/metadata/md5-cache/mail-filter/postforward-1.1.0
index 011415a9f527..928e15e6f41e 100644
--- a/metadata/md5-cache/mail-filter/postforward-1.1.0
+++ b/metadata/md5-cache/mail-filter/postforward-1.1.0
@@ -3,12 +3,12 @@ DEPEND=dev-lang/go:0 >=dev-lang/go-1.10
 DESCRIPTION=Postfix Sender Rewriting Scheme forwarding agent
 EAPI=6
 HOMEPAGE=https://github.com/zoni/postforward
-INHERIT=eutils golang-build
+INHERIT=golang-build
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=mail-filter/postsrsd
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/zoni/postforward/archive/v1.1.0.tar.gz -> postforward-1.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	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664
-_md5_=8e5cbb34be973b88cf97793559e0dda9
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664
+_md5_=92290cd3a500e08cbf7e84da02deb7c8
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.2-r1 b/metadata/md5-cache/mail-mta/nullmailer-2.2-r1
index 33924db2101d..2f9c15045042 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2-r1
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2-r1
@@ -4,7 +4,7 @@ DEPEND=ssl? ( net-libs/gnutls:0= ) test? ( sys-apps/ucspi-tcp[ipv6] sys-process/
 DESCRIPTION=Simple relay-only local mail transport agent
 EAPI=7
 HOMEPAGE=http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer
-INHERIT=autotools eutils flag-o-matic multilib systemd user
+INHERIT=autotools flag-o-matic multilib systemd user
 IUSE=ssl test
 KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~x64-cygwin
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.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	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=c4ebdb0017cfdc2fca3d28347ee611b9
+_md5_=191400c62532a75c57cc48edc9a84333
diff --git a/metadata/md5-cache/media-fonts/culmus-0.120-r6 b/metadata/md5-cache/media-fonts/culmus-0.120-r6
index df19e7cda5fc..2305dfc57511 100644
--- a/metadata/md5-cache/media-fonts/culmus-0.120-r6
+++ b/metadata/md5-cache/media-fonts/culmus-0.120-r6
@@ -11,4 +11,4 @@ RDEPEND=!media-fonts/culmus-ancient
 SLOT=0
 SRC_URI=mirror://sourceforge/culmus/culmus-0.120.tar.gz mirror://sourceforge/culmus/culmus-type1-0.105.tar.gz fontforge? ( mirror://sourceforge/culmus/culmus-src-0.120.tar.gz ) ancient? ( !fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.TTF.tgz ) fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.tgz ) ) fancy? ( http://culmus.sourceforge.net/fancy/journal.tar.gz http://culmus.sourceforge.net/fancy/hillel.tar.gz http://culmus.sourceforge.net/fancy/anka.tar.gz http://culmus.sourceforge.net/fancy/comix.tar.gz http://culmus.sourceforge.net/fancy/gan.tar.gz http://culmus.sourceforge.net/fancy/ozrad.tar.gz http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz http://culmus.sourceforge.net/fancy/dorian.tar.gz http://culmus.sourceforge.net/fancy/gladia.tar.gz http://culmus.sourceforge.net/fancy/horev.tar.gz ) fancy? ( http://culmus.sourceforge.net/fancy-yg/ShmuelCLM.zip http://culmus.sourceforge.net/fancy-yg/MakabiYG.zip ) taamey? ( http://culmus.sourceforge.net/taamim/TaameyDavidCLM.zip http://culmus.sourceforge.net/taamim/TaameyFrankCLM.zip http://culmus.sourceforge.net/taamim/KeterAramTsova.zip http://culmus.sourceforge.net/taamim/KeterYG.zip )
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=dd51fc58c715b16ff6dd36575872293d
+_md5_=fe6881931f69bc48de38305a90a7ff39
diff --git a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1 b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
index 60fa453f6faf..e4cde7c58683 100644
--- a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
+++ b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
@@ -4,7 +4,7 @@ DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( vi
 DESCRIPTION=A fast, modern and generic image processing library
 EAPI=7
 HOMEPAGE=http://www.exactcode.de/site/open_source/exactimage/
-INHERIT=eutils lua-single multilib toolchain-funcs
+INHERIT=lua-single multilib toolchain-funcs
 IUSE=expat jpeg lua openexr php perl png ruby swig tiff truetype X lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( v
 REQUIRED_USE=lua? ( swig )
 SLOT=0
 SRC_URI=http://dl.exactcode.de/oss/exact-image/exact-image-1.0.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
-_md5_=69443bf02cd1b7e8eff1438aa6001420
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=483352b76d77767deae6747436ec7ecb
diff --git a/metadata/md5-cache/media-gfx/flam3-3.1.1 b/metadata/md5-cache/media-gfx/flam3-3.1.1
index f3cf8752c504..6a90bf1be9ac 100644
--- a/metadata/md5-cache/media-gfx/flam3-3.1.1
+++ b/metadata/md5-cache/media-gfx/flam3-3.1.1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libxml2 media-libs/libpng:= virtual/jpeg:= !<=x11-misc/electrics
 DESCRIPTION=Tools and a library for creating flame fractal images
 EAPI=6
 HOMEPAGE=https://flam3.com/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=static-libs
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libxml2 media-libs/libpng:= virtual/jpeg:= !<=x11-misc/electric
 SLOT=0
 SRC_URI=https://github.com/scottdraves/flam3/archive/v3.1.1.tar.gz -> flam3-3.1.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_=e39fef6b26fdb7d702bb5b2a8e9fd8d7
+_md5_=ddf744bd5617ce36e7ef2c287558e98d
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.6 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.6
index 543fa5b08175..0f2d3931778d 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.6
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.6
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/cor
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
-INHERIT=eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+INHERIT=eapi7-ver flag-o-matic libtool perl-functions toolchain-funcs multilib
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
@@ -12,5 +12,5 @@ REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
 RESTRICT=!test? ( test )
 SLOT=0/6.9.11-60
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-6.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
-_md5_=ee5e8e992c2d714d55ca8955df6a4987
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	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	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
+_md5_=d6d127605573d48380e1d3767f8a5de0
diff --git a/metadata/md5-cache/media-gfx/imageworsener-1.3.3 b/metadata/md5-cache/media-gfx/imageworsener-1.3.3
index cd28a985d644..a6bbb57ed781 100644
--- a/metadata/md5-cache/media-gfx/imageworsener-1.3.3
+++ b/metadata/md5-cache/media-gfx/imageworsener-1.3.3
@@ -11,5 +11,4 @@ REQUIRED_USE=test? ( jpeg png webp zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://entropymine.com/imageworsener/imageworsener-1.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a88aa2be2867258947d28ac39778411
+_md5_=c6448f81711e36df4631afc5fb464366
diff --git a/metadata/md5-cache/media-gfx/peps-2.0-r1 b/metadata/md5-cache/media-gfx/peps-2.0-r1
index 83bfb90ecb03..b8a853562765 100644
--- a/metadata/md5-cache/media-gfx/peps-2.0-r1
+++ b/metadata/md5-cache/media-gfx/peps-2.0-r1
@@ -3,12 +3,12 @@ DEPEND=app-text/ghostscript-gpl app-arch/gzip
 DESCRIPTION=Preprocess and convert EPS files to bitmap with Ghostscript
 EAPI=6
 HOMEPAGE=http://peps.redprince.net/peps/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=app-text/ghostscript-gpl app-arch/gzip
 SLOT=0
 SRC_URI=http://www.peps.redprince.net/peps/peps-2.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
-_md5_=9e2e5eb99f764d2ad73d4c59dd86866c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=9c7d4222537e8d70809f0716162ebf31
diff --git a/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2 b/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
index 4a1d7e3c1144..4aa2b5e9d845 100644
--- a/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
+++ b/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
@@ -3,11 +3,12 @@ DEPEND=jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu virt
 DESCRIPTION=A portable, high performance parallel ray tracing system
 EAPI=7
 HOMEPAGE=http://jedi.ks.uiuc.edu/~johns/raytracer/
+INHERIT=toolchain-funcs
 IUSE=doc examples jpeg mpi +opengl openmp png threads
 KEYWORDS=~amd64 ~ppc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= )
 SLOT=0
 SRC_URI=http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/tachyon-0.99b6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09cdf625fd61b78298f6c44f7cadece1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=869519d6f64085c68106b2726992ba6c
diff --git a/metadata/md5-cache/media-libs/esdl-1.3.1 b/metadata/md5-cache/media-libs/esdl-1.3.1
index e71271afa175..9dfc1949bf68 100644
--- a/metadata/md5-cache/media-libs/esdl-1.3.1
+++ b/metadata/md5-cache/media-libs/esdl-1.3.1
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/erlang-14[wxwidgets] media-libs/libsdl[opengl] image? ( media-
 DESCRIPTION=Erlang bindings for the SDL library
 EAPI=6
 HOMEPAGE=http://esdl.sourceforge.net/
-INHERIT=eutils fixheadtails multilib
+INHERIT=fixheadtails multilib
 IUSE=image truetype
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-14[wxwidgets] media-libs/libsdl[opengl] image? ( media-libs/sdl-image ) truetype? ( media-libs/sdl-ttf ) virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/esdl/esdl-1.3.1.src.tgz
-_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	fixheadtails	1721997ed44d035654efe12da50797ef
-_md5_=e5e050bf754f7deaa1fb91217283abfd
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=512f0c110e58ba42a12e054ca659ee47
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-2.23 b/metadata/md5-cache/media-libs/ffmpegsource-2.23
index 9b4245343a25..4b26e16f9982 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-2.23
+++ b/metadata/md5-cache/media-libs/ffmpegsource-2.23
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib >=media-video/ffmpeg-2.4:0= virtual/pkgconfig sys-devel/gnu
 DESCRIPTION=A libav/ffmpeg based source library for easy frame accurate access
 EAPI=6
 HOMEPAGE=https://github.com/FFMS/ffms2
-INHERIT=autotools eutils flag-o-matic ltprune vcs-snapshot
+INHERIT=autotools flag-o-matic ltprune vcs-snapshot
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib >=media-video/ffmpeg-2.4:0=
 SLOT=0/4
 SRC_URI=https://github.com/FFMS/ffms2/archive/2.23.tar.gz -> ffmpegsource-2.23.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	c0964e43ba712cb933da5f65b958fa88	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=bf0128586658129c6628bbd084e3575e
+_md5_=691889852e3823f55509c7782fe754c4
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-9999 b/metadata/md5-cache/media-libs/ffmpegsource-9999
index 65ad05685143..8042547452d5 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-9999
+++ b/metadata/md5-cache/media-libs/ffmpegsource-9999
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib >=media-video/ffmpeg-2.4:0= virtual/pkgconfig sys-devel/gnu
 DESCRIPTION=A libav/ffmpeg based source library for easy frame accurate access
 EAPI=6
 HOMEPAGE=https://github.com/FFMS/ffms2
-INHERIT=autotools eutils flag-o-matic git-r3 ltprune
+INHERIT=autotools flag-o-matic git-r3 ltprune
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-libs/zlib >=media-video/ffmpeg-2.4:0=
 SLOT=0/4
 _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	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=12ae20e9453a7add7f4ce4dc514c3ac5
+_md5_=2b6795929e175341452ae6cb440d07be
diff --git a/metadata/md5-cache/media-libs/ganv-1.8.0 b/metadata/md5-cache/media-libs/ganv-1.8.0
index f503044219a7..e6e98bc0dce7 100644
--- a/metadata/md5-cache/media-libs/ganv-1.8.0
+++ b/metadata/md5-cache/media-libs/ganv-1.8.0
@@ -3,12 +3,12 @@ DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 graphviz? ( media-gfx/
 DESCRIPTION=A GTK+ widget for interactive graph-like environments
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/ganv/
-INHERIT=eutils flag-o-matic waf-utils python-any-r1
+INHERIT=flag-o-matic waf-utils python-any-r1
 IUSE=+fdgl +graphviz introspection nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 graphviz? ( media-gfx/graphviz[gtk] ) introspection? ( app-text/yelp-tools dev-libs/gobject-introspection:=[doctool] )
 SLOT=0
 SRC_URI=http://download.drobilla.net/ganv-1.8.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=f08b947a4a4fc585b01c149f3c9e2c12
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=9aab52bbfbca76b7a7e22a92ba6eaf50
diff --git a/metadata/md5-cache/media-libs/ladspa-sdk-1.15-r1 b/metadata/md5-cache/media-libs/ladspa-sdk-1.15-r1
index 87f58b65e029..a067dca56983 100644
--- a/metadata/md5-cache/media-libs/ladspa-sdk-1.15-r1
+++ b/metadata/md5-cache/media-libs/ladspa-sdk-1.15-r1
@@ -3,11 +3,11 @@ DEPEND=>=sys-apps/sed-4
 DESCRIPTION=The Linux Audio Developer's Simple Plugin API
 EAPI=7
 HOMEPAGE=http://www.ladspa.org/
-INHERIT=eutils multilib toolchain-funcs portability flag-o-matic multilib-minimal
+INHERIT=multilib toolchain-funcs portability flag-o-matic 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 arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/ladspa_sdk_1.15.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	portability	c10bdc40668533b1faf15b1d89df0303	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=c80059ffe580e3e372ef0bfdf10d8736
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	portability	c10bdc40668533b1faf15b1d89df0303	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=9ec22384e1ce82e81333ff8fdca3362d
diff --git a/metadata/md5-cache/media-libs/leptonica-1.74.4 b/metadata/md5-cache/media-libs/leptonica-1.74.4
index f2d5c65f58dc..fb01f92fbee3 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.74.4
+++ b/metadata/md5-cache/media-libs/leptonica-1.74.4
@@ -3,7 +3,7 @@ DEPEND=gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=C library for image processing and analysis
 EAPI=6
 HOMEPAGE=http://www.leptonica.org/
-INHERIT=eutils ltprune multilib-minimal
+INHERIT=ltprune multilib-minimal
 IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg png tiff zlib )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.74.4/leptonica-1.74.4.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=2678c8d8b45efd7c29a26d587724acb0
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=81a62d750289c678a1e9a2b5c2867456
diff --git a/metadata/md5-cache/media-libs/libeot-0.01 b/metadata/md5-cache/media-libs/libeot-0.01
index 70ad6fa6942e..1974f5c1c7a7 100644
--- a/metadata/md5-cache/media-libs/libeot-0.01
+++ b/metadata/md5-cache/media-libs/libeot-0.01
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')
 EAPI=6
 HOMEPAGE=https://github.com/umanwizard/libeot
-INHERIT=eutils autotools ltprune
+INHERIT=autotools ltprune
 KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/umanwizard/libeot/archive/v0.01.tar.gz -> libeot-0.01.tgz
 _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_=09432802400bbf6dc5d75dd41628b3df
+_md5_=4bdc7816f830aeb04fac005b591691f5
diff --git a/metadata/md5-cache/media-libs/libeot-9999 b/metadata/md5-cache/media-libs/libeot-9999
index d0f0cb84669f..6e89b5b72f4a 100644
--- a/metadata/md5-cache/media-libs/libeot-9999
+++ b/metadata/md5-cache/media-libs/libeot-9999
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')
 EAPI=6
 HOMEPAGE=https://github.com/umanwizard/libeot
-INHERIT=eutils autotools ltprune git-r3
+INHERIT=autotools ltprune git-r3
 LICENSE=MPL-2.0
 PROPERTIES=live
 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	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=edd849d187e135c9b1f1646b9cd3840e
+_md5_=40f910f4b661d3dd6dea365c6d19549b
diff --git a/metadata/md5-cache/media-libs/libfpx-1.3.1_p10 b/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
index a4389db480e2..67879424e8dc 100644
--- a/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
+++ b/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
@@ -3,11 +3,11 @@ DEPEND=>=app-portage/elt-patches-20170815
 DESCRIPTION=A library for manipulating FlashPIX images
 EAPI=6
 HOMEPAGE=https://github.com/ImageMagick/libfpx
-INHERIT=eutils flag-o-matic libtool
+INHERIT=flag-o-matic libtool
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=Flashpix
 SLOT=0/1
 SRC_URI=mirror://imagemagick/delegates/libfpx-1.3.1-10.tar.bz2
-_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	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96
-_md5_=025ee32f490d57ebb64dca0f6bf89796
+_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	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96
+_md5_=57ef846ffba84435e7949c91492231ac
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1 b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
index 0bd64782a3b2..1cefbf136621 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
@@ -3,7 +3,7 @@ DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,ab
 DESCRIPTION=A library to play a wide range of module formats
 EAPI=6
 HOMEPAGE=http://mikmod.sourceforge.net/
-INHERIT=eutils ltprune multilib-minimal
+INHERIT=ltprune multilib-minimal
 IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 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
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2+ LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,a
 REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.11.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=a39cba43f7a6b7d0834c9e3b1fc27384
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=2249bc0fc3d231289f3983ceffb4fa15
diff --git a/metadata/md5-cache/media-libs/libsbsms-2.0.2-r1 b/metadata/md5-cache/media-libs/libsbsms-2.0.2-r1
index adde67b89202..12bb46e85eb7 100644
--- a/metadata/md5-cache/media-libs/libsbsms-2.0.2-r1
+++ b/metadata/md5-cache/media-libs/libsbsms-2.0.2-r1
@@ -3,11 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=A library for high quality time and pitch scale modification
 EAPI=6
 HOMEPAGE=http://sbsms.sourceforge.net/
-INHERIT=eutils autotools ltprune
+INHERIT=autotools ltprune
 IUSE=cpu_flags_x86_sse static-libs
 KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/sbsms/libsbsms-2.0.2.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_=8a95bf3ac2e75eefdec291aa144a59e4
+_md5_=b5e00a784d3da5777c5a00be7ddfb5aa
diff --git a/metadata/md5-cache/media-libs/phat-0.4.1-r1 b/metadata/md5-cache/media-libs/phat-0.4.1-r1
index 1b57961c73da..9c9dbfc80275 100644
--- a/metadata/md5-cache/media-libs/phat-0.4.1-r1
+++ b/metadata/md5-cache/media-libs/phat-0.4.1-r1
@@ -3,7 +3,7 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libX11 gnome-base/libgnomecanvas virtual/pkgconf
 DESCRIPTION=PHAT is a collection of GTK+ widgets geared toward pro-audio apps
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/phat.berlios/
-INHERIT=autotools eutils ltprune
+INHERIT=autotools ltprune
 IUSE=debug
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 gnome-base/libgnomecanvas
 SLOT=0
 SRC_URI=mirror://sourceforge/phat.berlios/phat-0.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_=f0d59048c64a2fdd6bfdaaa22083f6c3
+_md5_=06745ba07f9ae7dddcffa88d02c8bd06
diff --git a/metadata/md5-cache/media-libs/resid-0.16_p2-r1 b/metadata/md5-cache/media-libs/resid-0.16_p2-r1
index 252c416051a1..330b466a3029 100644
--- a/metadata/md5-cache/media-libs/resid-0.16_p2-r1
+++ b/metadata/md5-cache/media-libs/resid-0.16_p2-r1
@@ -3,11 +3,11 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=C++ library to emulate the C64 SID chip
 EAPI=6
 HOMEPAGE=http://sidplay2.sourceforge.net
-INHERIT=autotools eutils ltprune multilib-minimal versionator
+INHERIT=autotools ltprune multilib-minimal versionator
 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 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/sidplay2/resid-0.16-p2.tgz
 _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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=6109834dbecb03de171a7a5b1b989e1e
+_md5_=596c6dc4bc811d95601be920e5aa3e9d
diff --git a/metadata/md5-cache/media-libs/urt-3.1b-r3 b/metadata/md5-cache/media-libs/urt-3.1b-r3
index b528b8352f31..0b361ba452d7 100644
--- a/metadata/md5-cache/media-libs/urt-3.1b-r3
+++ b/metadata/md5-cache/media-libs/urt-3.1b-r3
@@ -3,12 +3,12 @@ DEPEND=X? ( x11-libs/libXext ) gif? ( media-libs/giflib ) postscript? ( app-text
 DESCRIPTION=the Utah Raster Toolkit is a library for dealing with raster images
 EAPI=6
 HOMEPAGE=https://www.cs.utah.edu/gdc/projects/urt/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs
+INHERIT=flag-o-matic multilib toolchain-funcs
 IUSE=gif postscript static-libs tiff tools X
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=URT gif? ( free-noncomm )
 RDEPEND=X? ( x11-libs/libXext ) gif? ( media-libs/giflib ) postscript? ( app-text/ghostscript-gpl ) tiff? ( media-libs/tiff:= )
 SLOT=0/3.1b-r2
 SRC_URI=ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z
-_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	c0964e43ba712cb933da5f65b958fa88
-_md5_=00e57175111a2874d52341fab28f0521
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=b97b2a39bea51c62768d80ad2842c0cb
diff --git a/metadata/md5-cache/media-plugins/cmt-plugins-1.17-r1 b/metadata/md5-cache/media-plugins/cmt-plugins-1.17-r1
index b7fabc8f7367..812ecc3151bf 100644
--- a/metadata/md5-cache/media-plugins/cmt-plugins-1.17-r1
+++ b/metadata/md5-cache/media-plugins/cmt-plugins-1.17-r1
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 DESCRIPTION=CMT (computer music toolkit) LADSPA library plugins
 EAPI=7
 HOMEPAGE=http://www.ladspa.org/
-INHERIT=eutils multilib toolchain-funcs multilib-minimal
+INHERIT=multilib 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 ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/cmt_1.17.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=745156e4494e0ab030867e3f05f8e254
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=28dae754c425b91b943ac3bf050df265
diff --git a/metadata/md5-cache/media-plugins/tap-plugins-1.0.1 b/metadata/md5-cache/media-plugins/tap-plugins-1.0.1
index 0d01568fa4da..16b47e425fd2 100644
--- a/metadata/md5-cache/media-plugins/tap-plugins-1.0.1
+++ b/metadata/md5-cache/media-plugins/tap-plugins-1.0.1
@@ -3,11 +3,11 @@ DEPEND=media-libs/ladspa-sdk
 DESCRIPTION=Tom's audio processing (TAP) LADSPA plugins
 EAPI=7
 HOMEPAGE=https://github.com/tomszilagyi/tap-plugins http://tap-plugins.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk
 SLOT=0
 SRC_URI=https://github.com/tomszilagyi/tap-plugins/archive/v1.0.1.tar.gz -> tap-plugins-1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=83cf80ab65d80aacc5785f6cb7a94b14
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e27ede85eb786d6c77a5144ae167d784
diff --git a/metadata/md5-cache/media-plugins/tap-plugins-9999 b/metadata/md5-cache/media-plugins/tap-plugins-9999
index aa0c781ae89e..a51f111ac490 100644
--- a/metadata/md5-cache/media-plugins/tap-plugins-9999
+++ b/metadata/md5-cache/media-plugins/tap-plugins-9999
@@ -4,10 +4,10 @@ DEPEND=media-libs/ladspa-sdk
 DESCRIPTION=Tom's audio processing (TAP) LADSPA plugins
 EAPI=7
 HOMEPAGE=https://github.com/tomszilagyi/tap-plugins http://tap-plugins.sourceforge.net/
-INHERIT=eutils toolchain-funcs git-r3
+INHERIT=toolchain-funcs git-r3
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-libs/ladspa-sdk
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=47bdb762e65737de23d992b7cad1567f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=4fa21187dddf267e1e065c178c631162
diff --git a/metadata/md5-cache/media-radio/direwolf-1.5 b/metadata/md5-cache/media-radio/direwolf-1.5
index 43b2a8fec02d..963fc9fa8454 100644
--- a/metadata/md5-cache/media-radio/direwolf-1.5
+++ b/metadata/md5-cache/media-radio/direwolf-1.5
@@ -4,12 +4,12 @@ DEPEND=media-libs/alsa-lib:= gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/
 DESCRIPTION=Decoded Information from Radio Emissions for Windows Or Linux Fans
 EAPI=7
 HOMEPAGE=https://github.com/wb2osz/direwolf/blob/master/README.md
-INHERIT=eutils systemd
+INHERIT=systemd
 IUSE=gps hamlib udev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=media-libs/alsa-lib:= gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/hamlib ) udev? ( virtual/libudev )
 SLOT=0
 SRC_URI=https://github.com/wb2osz/direwolf/archive/1.5.tar.gz -> direwolf-1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=cd0ddb73336ff6a784ab2a9ee528b960
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=7e8219a801a307087e78abb561caae28
diff --git a/metadata/md5-cache/media-radio/direwolf-1.5-r1 b/metadata/md5-cache/media-radio/direwolf-1.5-r1
index ef9caf3c6d15..0828ecdb2db5 100644
--- a/metadata/md5-cache/media-radio/direwolf-1.5-r1
+++ b/metadata/md5-cache/media-radio/direwolf-1.5-r1
@@ -4,12 +4,12 @@ DEPEND=media-libs/alsa-lib:= gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/
 DESCRIPTION=Decoded Information from Radio Emissions for Windows Or Linux Fans
 EAPI=7
 HOMEPAGE=https://github.com/wb2osz/direwolf/blob/master/README.md
-INHERIT=eutils systemd
+INHERIT=systemd
 IUSE=gps hamlib udev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=media-libs/alsa-lib:= gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/hamlib:= ) udev? ( virtual/libudev )
 SLOT=0
 SRC_URI=https://github.com/wb2osz/direwolf/archive/1.5.tar.gz -> direwolf-1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=890fce88e82b6ee8338ce926197fad43
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=592fe7e1ce2f1d788e9a1b4d222e8b6e
diff --git a/metadata/md5-cache/media-radio/flamp-2.2.03 b/metadata/md5-cache/media-radio/flamp-2.2.03
index c519f1bbe4ca..b874a1fb768d 100644
--- a/metadata/md5-cache/media-radio/flamp-2.2.03
+++ b/metadata/md5-cache/media-radio/flamp-2.2.03
@@ -3,11 +3,9 @@ DEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:= virtual/pkgconfig
 DESCRIPTION=Fldigi helper for transferring files
 EAPI=6
 HOMEPAGE=http://www.w1hkj.com
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flamp-2.2.03.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
-_md5_=d7d3d58e74c7677cd33d62913afad2a4
+_md5_=5276707c292ac700165558aba85f8b10
diff --git a/metadata/md5-cache/media-radio/flmsg-4.0.14 b/metadata/md5-cache/media-radio/flmsg-4.0.14
index 314859ea6d97..ccd536432356 100644
--- a/metadata/md5-cache/media-radio/flmsg-4.0.14
+++ b/metadata/md5-cache/media-radio/flmsg-4.0.14
@@ -8,5 +8,4 @@ LICENSE=GPL-3
 RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flmsg-4.0.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=306854a1784a7ac1607d95a361f09a1d
+_md5_=ba65b8dd8ae681371b93e2be517be838
diff --git a/metadata/md5-cache/media-radio/flmsg-4.0.17 b/metadata/md5-cache/media-radio/flmsg-4.0.17
index 9176e35b8787..9380d536b7d2 100644
--- a/metadata/md5-cache/media-radio/flmsg-4.0.17
+++ b/metadata/md5-cache/media-radio/flmsg-4.0.17
@@ -8,5 +8,4 @@ LICENSE=GPL-3
 RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flmsg-4.0.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=306854a1784a7ac1607d95a361f09a1d
+_md5_=ba65b8dd8ae681371b93e2be517be838
diff --git a/metadata/md5-cache/media-radio/flmsg-4.0.3 b/metadata/md5-cache/media-radio/flmsg-4.0.3
index 440d7f2fe300..63b9324eac37 100644
--- a/metadata/md5-cache/media-radio/flmsg-4.0.3
+++ b/metadata/md5-cache/media-radio/flmsg-4.0.3
@@ -3,11 +3,9 @@ DEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:= virtual/pkgconfig
 DESCRIPTION=Fldigi helper for creating radiograms
 EAPI=6
 HOMEPAGE=http://www.w1hkj.com
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flmsg-4.0.3.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
-_md5_=750d0f5a2bff174134d63f568b6e1aae
+_md5_=a232921513de006eff3577e2cfc861e5
diff --git a/metadata/md5-cache/media-radio/xdx-2.5.0 b/metadata/md5-cache/media-radio/xdx-2.5.0
index 2bf48324862d..5b51d84fa876 100644
--- a/metadata/md5-cache/media-radio/xdx-2.5.0
+++ b/metadata/md5-cache/media-radio/xdx-2.5.0
@@ -9,5 +9,4 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2
 SLOT=0
 SRC_URI=mirror://sourceforge/xdxclusterclient/xdx-2.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64539d0057ded299a59b1b5adee5b501
+_md5_=0a03a0730e898ae54a9991e2f84d2e25
diff --git a/metadata/md5-cache/media-sound/daudio-0.3-r1 b/metadata/md5-cache/media-sound/daudio-0.3-r1
index 1d6e69e42139..1476977f9ce3 100644
--- a/metadata/md5-cache/media-sound/daudio-0.3-r1
+++ b/metadata/md5-cache/media-sound/daudio-0.3-r1
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/libmad-0.15.0b-r1
 DESCRIPTION=Distributed audio on the local network
 EAPI=6
 HOMEPAGE=http://daudio.sourceforge.net/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ~ppc -sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmad-0.15.0b-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/daudio/daudio-0.3.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=1df4193a66bd041926d376e1b7e5215f
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=f38484362c8ed368fcd719c208601d8f
diff --git a/metadata/md5-cache/media-sound/ecasound-2.9.3 b/metadata/md5-cache/media-sound/ecasound-2.9.3
index dfc96b8346cb..85da931dc317 100644
--- a/metadata/md5-cache/media-sound/ecasound-2.9.3
+++ b/metadata/md5-cache/media-sound/ecasound-2.9.3
@@ -4,7 +4,7 @@ DEPEND=sys-libs/readline:0= alsa? ( media-libs/alsa-lib:= ) audiofile? ( media-l
 DESCRIPTION=a package for multitrack audio processing
 EAPI=7
 HOMEPAGE=https://ecasound.seul.org/ecasound/
-INHERIT=autotools eutils python-single-r1
+INHERIT=autotools python-single-r1
 IUSE=alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss python ruby sndfile static-libs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( lv2 ) python? ( ^^ ( python_single_target_python3_7 python_
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://ecasound.seul.org/download/ecasound-2.9.3.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=3c104a4a70c661b5f73d9962bdfd75a0
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
+_md5_=f3ea245ce7342ceafaf7b1432d966fcb
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20190315 b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20190315
index 51c10573430a..74f1c4456330 100644
--- a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20190315
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.15_p20190315
@@ -3,11 +3,12 @@ DEPEND=sys-devel/gettext doc? ( dev-perl/Text-Markdown ) dev-util/desktop-file-u
 DESCRIPTION=An open-source jukebox for large collections of mp3/ogg/flac files
 EAPI=7
 HOMEPAGE=https://gmusicbrowser.org/
+INHERIT=gnome2-utils xdg
 IUSE=dbus doc extras gstreamer libnotify mplayer
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )
 SLOT=0
 SRC_URI=https://github.com/squentin/gmusicbrowser/archive/4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d.tar.gz -> gmusicbrowser-1.1.15_p20190315.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31e1a34b24996f07e213dc353162be26
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=f36c969b79b32601e2f1d92497c125ae
diff --git a/metadata/md5-cache/media-sound/herrie-2.2-r1 b/metadata/md5-cache/media-sound/herrie-2.2-r1
index b655d1044ea4..f4b3f3188256 100644
--- a/metadata/md5-cache/media-sound/herrie-2.2-r1
+++ b/metadata/md5-cache/media-sound/herrie-2.2-r1
@@ -3,7 +3,7 @@ DEPEND=sys-libs/ncurses:0=[unicode?] >=dev-libs/glib-2:2 ao? ( media-libs/libao
 DESCRIPTION=Herrie is a command line music player
 EAPI=6
 HOMEPAGE=http://herrie.info/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD-2 GPL-2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] >=dev-libs/glib-2:2 ao? ( media-libs/libao
 REQUIRED_USE=|| ( ao alsa pulseaudio oss )
 SLOT=0
 SRC_URI=http://herrie.info/distfiles/herrie-2.2.tar.bz2
-_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
-_md5_=20009a592096e714bf27eedd064ee0cb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=baed3c95f88d901e984c8beffeb4d7a9
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
index 402494097602..7b72c45bc348 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
@@ -4,7 +4,7 @@ DEPEND=sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 DESCRIPTION=A low-latency audio server
 EAPI=7
 HOMEPAGE=http://www.jackaudio.org
-INHERIT=flag-o-matic eutils multilib-minimal
+INHERIT=flag-o-matic multilib-minimal
 IUSE=cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam 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 ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32
 SLOT=0
 SRC_URI=https://github.com/jackaudio/jack1/archive/0.125.0.tar.gz -> jack-audio-connection-kit-0.125.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=a5ceee034f2d21421a3165215b11c411
+_md5_=43cc132c9c6b8458b89b92f97f35da7d
diff --git a/metadata/md5-cache/media-sound/jack_capture-0.9.73 b/metadata/md5-cache/media-sound/jack_capture-0.9.73
index 8e4df9ddca7d..bc9caa6c31ed 100644
--- a/metadata/md5-cache/media-sound/jack_capture-0.9.73
+++ b/metadata/md5-cache/media-sound/jack_capture-0.9.73
@@ -3,11 +3,12 @@ DEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media
 DESCRIPTION=JACK Recording utility
 EAPI=7
 HOMEPAGE=https://github.com/kmatheussen/jack_capture
+INHERIT=toolchain-funcs
 IUSE=mp3 ogg osc
 KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media-libs/libogg ) osc? ( media-libs/liblo )
 SLOT=0
 SRC_URI=https://github.com/kmatheussen/jack_capture/archive/0.9.73.tar.gz -> jack_capture-0.9.73.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=89e4daf6c1c7e1c21faa2602c5f9a42d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e1342adf4efd77dec874cdfada79410d
diff --git a/metadata/md5-cache/media-sound/jack_capture-9999 b/metadata/md5-cache/media-sound/jack_capture-9999
index c15e8755f16e..b0b30d202c59 100644
--- a/metadata/md5-cache/media-sound/jack_capture-9999
+++ b/metadata/md5-cache/media-sound/jack_capture-9999
@@ -4,11 +4,11 @@ DEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media
 DESCRIPTION=JACK Recording utility
 EAPI=7
 HOMEPAGE=https://github.com/kmatheussen/jack_capture
-INHERIT=eutils toolchain-funcs git-r3
+INHERIT=toolchain-funcs git-r3
 IUSE=mp3 ogg osc
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media-libs/libogg ) osc? ( media-libs/liblo )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=ff33a84eeec91cc942b1ef9211fb0f4f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=d61657647646af772315769d0b367410
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r4 b/metadata/md5-cache/media-sound/lash-0.5.4-r4
index 2e7f74995546..7c7f9fbff1f1 100644
--- a/metadata/md5-cache/media-sound/lash-0.5.4-r4
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r4
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libxml2 sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 DESCRIPTION=LASH Audio Session Handler
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/lash/
-INHERIT=autotools eutils multilib-minimal python-single-r1
+INHERIT=autotools multilib-minimal python-single-r1
 IUSE=alsa debug gtk python 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 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libxml2 sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=7ce0f6d2462ce423d0cebfddeb327eda
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
+_md5_=3ed80deb8f0e136761dec00d5815c1b5
diff --git a/metadata/md5-cache/media-sound/mpg321-0.3.2 b/metadata/md5-cache/media-sound/mpg321-0.3.2
index c73a546f8aff..002cc6518370 100644
--- a/metadata/md5-cache/media-sound/mpg321-0.3.2
+++ b/metadata/md5-cache/media-sound/mpg321-0.3.2
@@ -4,12 +4,12 @@ DEPEND=app-eselect/eselect-mpg123 >=media-libs/libao-1 media-libs/libid3tag medi
 DESCRIPTION=A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=7
 HOMEPAGE=http://mpg321.sourceforge.net/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=alsa ipv6
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-mpg123 >=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg321/mpg321_0.3.2.orig.tar.gz -> mpg321-0.3.2.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=44837e66024b70552b218c607a7542f6
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=096bd003cfa8f8873d029c0d3bfbacd9
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.4 b/metadata/md5-cache/media-sound/rhythmbox-3.4.4
index f74c0c46d0ad..89f44748b839 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.4
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.4
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:
 DESCRIPTION=Music management and playback software for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
-INHERIT=eutils gnome2 python-single-r1 multilib virtualx
+INHERIT=gnome2 python-single-r1 multilib virtualx
 IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp +python test +udev upnp-av python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.4.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	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=280616bb0d240a7df6bee03c9c227894
+_md5_=79544eb54f573dbd84296ea50214764a
diff --git a/metadata/md5-cache/media-sound/sc2mpd-1.1.7 b/metadata/md5-cache/media-sound/sc2mpd-1.1.7
index 737fcba4cb62..02d9843bc55d 100644
--- a/metadata/md5-cache/media-sound/sc2mpd-1.1.7
+++ b/metadata/md5-cache/media-sound/sc2mpd-1.1.7
@@ -8,5 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat media-libs/alsa-lib media-libs/libsamplerate media-libs/libmpdclient <=net-libs/libmicrohttpd-0.9.70
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/sc2mpd-1.1.7.tar.gz https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-20200704.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=297a138bc87c738c685ff5a4c7688cf4
+_md5_=e893a0dcdab6152272ad5e61362e6a8c
diff --git a/metadata/md5-cache/media-sound/sndpeek-1.41-r1 b/metadata/md5-cache/media-sound/sndpeek-1.41-r1
index c6409d678bd2..1604086b2075 100644
--- a/metadata/md5-cache/media-sound/sndpeek-1.41-r1
+++ b/metadata/md5-cache/media-sound/sndpeek-1.41-r1
@@ -3,6 +3,7 @@ DEPEND=app-eselect/eselect-sndpeek media-libs/freeglut virtual/glu virtual/openg
 DESCRIPTION=real-time audio visualization
 EAPI=7
 HOMEPAGE=http://soundlab.cs.princeton.edu/software/sndpeek/
+INHERIT=toolchain-funcs
 IUSE=+alsa jack oss
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=app-eselect/eselect-sndpeek media-libs/freeglut virtual/glu virtual/open
 REQUIRED_USE=|| ( alsa jack oss )
 SLOT=0
 SRC_URI=http://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-1.41.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7b84a223c5cda97d5fd1d9f1c1b45de
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=f78db55b1ce6876ed1026416f910c370
diff --git a/metadata/md5-cache/media-sound/twolame-0.3.13-r2 b/metadata/md5-cache/media-sound/twolame-0.3.13-r2
index 07e2904f2ac2..81aa0a2d2f93 100644
--- a/metadata/md5-cache/media-sound/twolame-0.3.13-r2
+++ b/metadata/md5-cache/media-sound/twolame-0.3.13-r2
@@ -3,12 +3,12 @@ DEPEND=>=media-libs/libsndfile-1.0.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 DESCRIPTION=An optimised MPEG Audio Layer 2 (MP2) encoder
 EAPI=6
 HOMEPAGE=https://www.twolame.org
-INHERIT=eutils ltprune multilib-minimal
+INHERIT=ltprune 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 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsndfile-1.0.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/twolame/twolame-0.3.13.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=42555b9dca57a3e099ce720ae85c325f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=c6f607239bde27d957b42f7dd9e93674
diff --git a/metadata/md5-cache/media-video/acidrip-0.14-r4 b/metadata/md5-cache/media-video/acidrip-0.14-r4
index aa295ce3e4d3..e8c9c9b02edb 100644
--- a/metadata/md5-cache/media-video/acidrip-0.14-r4
+++ b/metadata/md5-cache/media-video/acidrip-0.14-r4
@@ -3,12 +3,12 @@ DEPEND=dev-perl/Gtk2 media-video/lsdvd media-video/mplayer[encode] encode? ( >=m
 DESCRIPTION=A gtk-perl mplayer/mencoder frontend for ripping DVDs
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/acidrip/
-INHERIT=perl-module
+INHERIT=epatch perl-module
 IUSE=encode
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Gtk2 media-video/lsdvd media-video/mplayer[encode] encode? ( >=media-sound/lame-3.92 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/acidrip/files/acidrip/0.14%20-%20Your%20two-wheeled%20knife/acidrip-0.14.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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=99ca20cedca67baaa8c275e19daa3940
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=79847fadf3763aadf28fca883dd1f745
diff --git a/metadata/md5-cache/media-video/cpvts-1.2-r1 b/metadata/md5-cache/media-video/cpvts-1.2-r1
index 69d7921c4b02..c4c648070f18 100644
--- a/metadata/md5-cache/media-video/cpvts-1.2-r1
+++ b/metadata/md5-cache/media-video/cpvts-1.2-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libdvdread
 DESCRIPTION=raw copy title sets from a DVD to your harddisc
 EAPI=7
 HOMEPAGE=http://www.lallafa.de/bp/cpvts.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread
 SLOT=0
 SRC_URI=http://www.lallafa.de/bp/files/cpvts-1.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=08617a84b8a9d86f957babe2d10cee3c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=b12466649a1ec6deeb3cc13cc331e61a
diff --git a/metadata/md5-cache/media-video/dvdauthor-0.7.1-r1 b/metadata/md5-cache/media-video/dvdauthor-0.7.1-r1
index 2d90e69c5572..1ec39d243601 100644
--- a/metadata/md5-cache/media-video/dvdauthor-0.7.1-r1
+++ b/metadata/md5-cache/media-video/dvdauthor-0.7.1-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-
 DESCRIPTION=Tools for generating DVD files to be played on standalone DVD players
 EAPI=6
 HOMEPAGE=http://dvdauthor.sourceforge.net/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=graphicsmagick +imagemagick
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media
 REQUIRED_USE=^^ ( graphicsmagick imagemagick )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdauthor/dvdauthor-0.7.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=f10739a52d2e9803baaa8a67c615164e
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=4c1cac48e8e557493523bbdd1e54ff3c
diff --git a/metadata/md5-cache/media-video/dvdauthor-0.7.2-r2 b/metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
index 3d174e99ee9d..ac3ed367a3c4 100644
--- a/metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
+++ b/metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-
 DESCRIPTION=Tools for generating DVD files to be played on standalone DVD players
 EAPI=6
 HOMEPAGE=http://dvdauthor.sourceforge.net/
-INHERIT=autotools eutils flag-o-matic toolchain-funcs
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=graphicsmagick +imagemagick
 KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( graphicsmagick imagemagick )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdauthor/dvdauthor-0.7.2.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=65a32c25588ecf9d2f0eea612f808ced
+_md5_=14a3e97a53c77df0048447c09b4d218b
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2.4 b/metadata/md5-cache/media-video/ffmpeg-4.2.4
index 6a0479be7a1f..0c12f7b417ab 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.2.4
+++ b/metadata/md5-cache/media-video/ffmpeg-4.2.4
@@ -4,7 +4,7 @@ DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes libavcodec
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
-INHERIT=eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zli
 RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.4.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-altivec.patch.gz https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-gcc.patch.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=8e73fd9fcb3a2ff4dcb4b579be52783e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=45f729a8aa4fa0a68878e4d3257d8155
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.3.1 b/metadata/md5-cache/media-video/ffmpeg-4.3.1
index 039ab0463405..262dc4c18389 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.3.1
+++ b/metadata/md5-cache/media-video/ffmpeg-4.3.1
@@ -4,7 +4,7 @@ DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes libavcodec
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
-INHERIT=eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zli
 RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=39437c45c0155d4c29e60ff72d227772
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=e65532c1a7612fca58c6b6cab75e1e97
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.3.2 b/metadata/md5-cache/media-video/ffmpeg-4.3.2
index 743e555a7f75..97739a257315 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.3.2
+++ b/metadata/md5-cache/media-video/ffmpeg-4.3.2
@@ -4,7 +4,7 @@ DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes libavcodec
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
-INHERIT=eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs
 IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zli
 RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=571542d3e2eecd08f9d2bff2117e05c1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=2f9cbc16f4b1efb9bdad626b697295e2
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.4 b/metadata/md5-cache/media-video/ffmpeg-4.4
index 13395ceb3519..34a3a92c4403 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.4
+++ b/metadata/md5-cache/media-video/ffmpeg-4.4
@@ -4,7 +4,7 @@ DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes libavcodec
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
-INHERIT=eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs
 IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zli
 RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=b39f81ad3805188c671de9540ad04997
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=4ccc355ccac301ff92d64de44605839a
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index 8b6918d4c60c..bb7cb5f826ab 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -4,7 +4,7 @@ DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes libavcodec
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
-INHERIT=eutils flag-o-matic multilib multilib-minimal toolchain-funcs git-r3
+INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs git-r3
 IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher 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? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi
 REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=b39f81ad3805188c671de9540ad04997
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=4ccc355ccac301ff92d64de44605839a
diff --git a/metadata/md5-cache/media-video/harvid-0.8.3-r1 b/metadata/md5-cache/media-video/harvid-0.8.3-r1
index 3c9fde727136..b8138c75dc42 100644
--- a/metadata/md5-cache/media-video/harvid-0.8.3-r1
+++ b/metadata/md5-cache/media-video/harvid-0.8.3-r1
@@ -4,10 +4,11 @@ DEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0 virtual/p
 DESCRIPTION=HTTP Ardour Video Daemon
 EAPI=7
 HOMEPAGE=http://x42.github.io/harvid/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0
 SLOT=0
 SRC_URI=https://github.com/x42/harvid/archive/v0.8.3.tar.gz -> harvid-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6740b91744b92b9813ef3d37bbd9385
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=9022111747d91b79694fe8617a3648a1
diff --git a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r2 b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r2
index d7181ad3436c..f88b2874580b 100644
--- a/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r2
+++ b/metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r2
@@ -10,5 +10,4 @@ RDEPEND=virtual/jpeg input-uvc? ( media-libs/libv4l )
 REQUIRED_USE=|| ( input-testpicture input-control input-file input-uvc ) || ( output-file output-udp output-http output-autofocus output-rtsp )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c9c0bbea8851b365d826d9baae22217
+_md5_=6a60afc5ca4e2a61aeba8d74b6e84e67
diff --git a/metadata/md5-cache/media-video/noad-0.8.6-r5 b/metadata/md5-cache/media-video/noad-0.8.6-r5
index 76214d705633..5e0feb2d2103 100644
--- a/metadata/md5-cache/media-video/noad-0.8.6-r5
+++ b/metadata/md5-cache/media-video/noad-0.8.6-r5
@@ -4,7 +4,7 @@ DEPEND=libmpeg2? ( media-libs/libmpeg2:= ) ffmpeg? ( media-video/ffmpeg ) imagem
 DESCRIPTION=Mark commercial breaks in VDR recordings
 EAPI=7
 HOMEPAGE=http://noad.net23.net/
-INHERIT=autotools eutils toolchain-funcs
+INHERIT=autotools toolchain-funcs
 IUSE=+ffmpeg imagemagick libmpeg2
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=libmpeg2? ( media-libs/libmpeg2:= ) ffmpeg? ( media-video/ffmpeg ) image
 REQUIRED_USE=|| ( ffmpeg libmpeg2 )
 SLOT=0
 SRC_URI=http://noad.net23.net/noad-0.8.6.tar.bz2 http://vdr.websitec.de/download/noad/noad-0.8.6-ffmpeg3.4.diff.bz2
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=a117fdca82e22a12d82b30145728dd32
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=cc7e5bdbe63c0ca0af8173d826bfd67c
diff --git a/metadata/md5-cache/media-video/sonic-snap-1.7-r1 b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
index e42329e25944..6a671e34e97a 100644
--- a/metadata/md5-cache/media-video/sonic-snap-1.7-r1
+++ b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
@@ -3,12 +3,12 @@ DEPEND=x11-libs/fltk:1 mpeg? ( >=media-libs/libfame-0.9.1 ) sys-libs/zlib x11-li
 DESCRIPTION=Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)
 EAPI=6
 HOMEPAGE=http://www.stolk.org/sonic-snap/
-INHERIT=eutils linux-info multilib toolchain-funcs
+INHERIT=linux-info multilib toolchain-funcs
 IUSE=mpeg kernel_linux
 KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-1
 RDEPEND=x11-libs/fltk:1 mpeg? ( >=media-libs/libfame-0.9.1 ) sys-libs/zlib x11-libs/libXdmcp x11-libs/libXau x11-libs/libXrender x11-libs/libX11 x11-libs/libXext x11-libs/libXft
 SLOT=0
 SRC_URI=http://www.stolk.org/sonic-snap/downloads/sonic-snap-1.7.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=8657c1e2323e7b6b1c656801d04c5868
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=0fcb0953e1e95f1cdfbbba7ec2a09932
diff --git a/metadata/md5-cache/media-video/streamdvd-0.4-r2 b/metadata/md5-cache/media-video/streamdvd-0.4-r2
index e2a50821c58f..0b197a85301a 100644
--- a/metadata/md5-cache/media-video/streamdvd-0.4-r2
+++ b/metadata/md5-cache/media-video/streamdvd-0.4-r2
@@ -3,10 +3,11 @@ DEPEND=app-cdr/cdrtools media-libs/libdvdread media-video/lsdvd X? ( dev-perl/Tk
 DESCRIPTION=fast tool to backup Video DVDs 'on the fly'
 EAPI=7
 HOMEPAGE=http://www.badabum.de/streamdvd.html
+INHERIT=toolchain-funcs
 IUSE=X
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.badabum.de/down/streamdvd-0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2a9d8d1967d184515f4b2ff42c339b7
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=0fd1f86166fa5a9b84d39e86dece4c85
diff --git a/metadata/md5-cache/net-analyzer/cloudshark-1.0.4 b/metadata/md5-cache/net-analyzer/cloudshark-1.0.4
index 14bcc3fe6a32..7369a5460910 100644
--- a/metadata/md5-cache/net-analyzer/cloudshark-1.0.4
+++ b/metadata/md5-cache/net-analyzer/cloudshark-1.0.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Easily upload your wireshark captures to CloudShark
 EAPI=5
 HOMEPAGE=https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin
-INHERIT=eutils multilib
+INHERIT=epatch multilib
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 PDEPEND=net-analyzer/wireshark:=[lua] net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/cloudshark/wireshark-plugin/archive/1.0.4.tar.gz -> cloudshark-1.0.4.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
-_md5_=521471837780ac73ab7b473a47b14f95
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b458797dc545e9d5336262c546c56b70
diff --git a/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1 b/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
index 09e1f77bd139..b98a2d96115a 100644
--- a/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
+++ b/metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.25.10:2 gnome-base/libgtop:2= x11-libs/cairo x11-libs/g
 DESCRIPTION=Graphical front-ends to various networking command-line
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-nettool/
-INHERIT=eutils gnome2
+INHERIT=gnome2
 IUSE=debug debug
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.25.10:2 gnome-base/libgtop:2= x11-libs/cairo x11-libs/
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-nettool/3.8/gnome-nettool-3.8.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	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=36ba1670bf0f31416c7ae5fce388133f
+_md5_=51d6b43dbed7f1609f052f814cb43933
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-20.8.1 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-20.8.1
index d5aed8c4a879..51e9cea240b2 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-20.8.1
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-20.8.1
@@ -4,7 +4,7 @@ DEPEND=acct-group/gvm acct-user/gvm dev-libs/libgcrypt:0= dev-libs/libxml2 dev-l
 DESCRIPTION=Greenbone Security Assistant
 EAPI=7
 HOMEPAGE=https://www.greenbone.net/en/ https://github.com/greenbone/gsa
-INHERIT=cmake flag-o-matic systemd toolchain-funcs
+INHERIT=cmake systemd toolchain-funcs
 IUSE=extras
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -12,4 +12,4 @@ RDEPEND=acct-group/gvm acct-user/gvm dev-libs/libgcrypt:0= dev-libs/libxml2 dev-
 SLOT=0
 SRC_URI=https://github.com/greenbone/gsa/archive/v20.8.1.tar.gz -> greenbone-security-assistant-20.8.1.tar.gz https://github.com/greenbone/gsa/releases/download/v20.8.1/gsa-node-modules-20.8.1.tar.gz -> greenbone-security-assistant-20.8.1-node_modules.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=310b06c21b2b3b597c8cb369846a6c21
+_md5_=2f42d7445b7566046c98630a7d2872df
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
index 60dc6653dde8..1c07f3e2d6d9 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libgcrypt:0= dev-libs/libxml2 dev-libs/libxslt >=net-analyzer/gv
 DESCRIPTION=Greenbone Security Assistant
 EAPI=7
 HOMEPAGE=https://www.greenbone.net/en/
-INHERIT=cmake flag-o-matic systemd toolchain-funcs
+INHERIT=cmake systemd toolchain-funcs
 IUSE=extras
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libgcrypt:0= dev-libs/libxml2 dev-libs/libxslt >=net-analyzer/g
 SLOT=0
 SRC_URI=https://github.com/greenbone/gsa/archive/v9.0.1.tar.gz -> greenbone-security-assistant-9.0.1.tar.gz https://github.com/greenbone/gsa/releases/download/v9.0.1/gsa-node-modules-9.0.1.tar.gz -> greenbone-security-assistant-9.0.1-node_modules.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=0225223b1065110508b1a87dec176b12
+_md5_=206c5d58de1c28a31909ebda7ac37ad9
diff --git a/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1 b/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1
index 129efeaa3ffb..d0f87741357a 100644
--- a/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1
+++ b/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1
@@ -4,7 +4,7 @@ DEPEND=acct-user/gvm app-crypt/gpgme:= dev-libs/glib dev-libs/hiredis dev-libs/l
 DESCRIPTION=Greenbone vulnerability management libraries, previously named openvas-libraries
 EAPI=7
 HOMEPAGE=https://www.greenbone.net/en/
-INHERIT=cmake flag-o-matic toolchain-funcs
+INHERIT=cmake toolchain-funcs
 IUSE=extras ldap test radius
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-libs/archive/v11.0.1.tar.gz -> gvm-libs-11.0.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=54756ed4c294b27114f59702d0e28c5a
+_md5_=71f619bd9a6a169b8ccff8b5453e9fa5
diff --git a/metadata/md5-cache/net-analyzer/gvm-libs-20.8.1 b/metadata/md5-cache/net-analyzer/gvm-libs-20.8.1
index 02b4b3e7328f..ac37f27864d1 100644
--- a/metadata/md5-cache/net-analyzer/gvm-libs-20.8.1
+++ b/metadata/md5-cache/net-analyzer/gvm-libs-20.8.1
@@ -4,7 +4,7 @@ DEPEND=acct-group/gvm acct-user/gvm app-crypt/gpgme:= dev-libs/glib dev-libs/hir
 DESCRIPTION=Greenbone vulnerability management libraries, previously named openvas-libraries
 EAPI=7
 HOMEPAGE=https://www.greenbone.net/en/ https://github.com/greenbone/gvm-libs/
-INHERIT=cmake flag-o-matic toolchain-funcs
+INHERIT=cmake toolchain-funcs
 IUSE=extras ldap test radius
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-libs/archive/v20.8.1.tar.gz -> gvm-libs-20.8.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=4bf25257de89e0e1c11a2a0705ee0a0d
+_md5_=bc11d67e5534bc70dfc8a84e7cdbcce0
diff --git a/metadata/md5-cache/net-analyzer/gvmd-20.8.1 b/metadata/md5-cache/net-analyzer/gvmd-20.8.1
index f09154f8f413..8f7d9fd1e075 100644
--- a/metadata/md5-cache/net-analyzer/gvmd-20.8.1
+++ b/metadata/md5-cache/net-analyzer/gvmd-20.8.1
@@ -4,7 +4,7 @@ DEPEND=acct-group/gvm acct-user/gvm dev-db/postgresql:*[uuid] dev-libs/libgcrypt
 DESCRIPTION=Greenbone vulnerability manager, previously named openvas-manager
 EAPI=7
 HOMEPAGE=https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/
-INHERIT=cmake flag-o-matic systemd toolchain-funcs
+INHERIT=cmake systemd toolchain-funcs
 IUSE=extras test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvmd/archive/v20.8.1.tar.gz -> gvmd-20.8.1.tar.gz https://github.com/j-licht/gvmd_report_formats/archive/v0.1.tar.gz -> gvm-report-formats-0.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=60e45faf1c335444a697c63184c4ca5f
+_md5_=8be47e79ceda9ca1d34a28aa83bb8489
diff --git a/metadata/md5-cache/net-analyzer/gvmd-9.0.1 b/metadata/md5-cache/net-analyzer/gvmd-9.0.1
index 370d49ae3c84..12a7c5c4654f 100644
--- a/metadata/md5-cache/net-analyzer/gvmd-9.0.1
+++ b/metadata/md5-cache/net-analyzer/gvmd-9.0.1
@@ -4,7 +4,7 @@ DEPEND=dev-db/postgresql:*[uuid] dev-libs/libgcrypt:0= dev-libs/libical >=net-an
 DESCRIPTION=Greenbone vulnerability manager, previously named openvas-manager
 EAPI=7
 HOMEPAGE=https://www.greenbone.net/en/
-INHERIT=cmake flag-o-matic systemd toolchain-funcs
+INHERIT=cmake systemd toolchain-funcs
 IUSE=extras test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvmd/archive/v9.0.1.tar.gz -> gvmd-9.0.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=5c6bfd687e56946d88fcb367194cc264
+_md5_=ff1709b4fdf202fb7045e27d43997fe0
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.17 b/metadata/md5-cache/net-analyzer/snort-2.9.17
index 895770332c70..415bc24fe096 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.17
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.17
@@ -4,7 +4,7 @@ DEPEND=acct-user/snort acct-group/snort dev-libs/libdnet >=dev-libs/libpcre-8.33
 DESCRIPTION=The de facto standard for intrusion detection/prevention
 EAPI=7
 HOMEPAGE=https://www.snort.org
-INHERIT=autotools lua-single systemd tmpfiles multilib
+INHERIT=autotools lua-single systemd tmpfiles
 IUSE=+active-response control-socket debug file-inspect +flexresp3 +gre high-availability inline-init-failopen large-pcap-64bit +libtirpc linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react reload-error-restart selinux shared-rep side-channel sourcefire +threads +lua_single_target_luajit
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ REQUIRED_USE=!kernel_linux? ( !shared-rep ) open-appid? ( ^^ ( lua_single_target
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.17.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=a51248d7a11f59014f1a664e92f6cab0
+_md5_=d910ef62929857a1af94a26121034254
diff --git a/metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2 b/metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2
index fddabcff45a0..f24f93bf0df1 100644
--- a/metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2
+++ b/metadata/md5-cache/net-dialup/cistronradius-1.6.8-r2
@@ -3,11 +3,11 @@ DEPEND=!net-dialup/freeradius !net-dialup/gnuradius
 DESCRIPTION=Authentication and accounting server for terminal servers using RADIUS
 EAPI=5
 HOMEPAGE=http://www.radius.cistron.nl/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=-* x86
 LICENSE=GPL-2
 RDEPEND=!net-dialup/freeradius !net-dialup/gnuradius
 SLOT=0
 SRC_URI=ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-1.6.8.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
-_md5_=4ed5310b3d262430b3d968488e9bc169
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3e006f3276c3d7ce3ff549ba25a8f9e8
diff --git a/metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1 b/metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1
index b4b04dd585d9..48996a504a98 100644
--- a/metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1
+++ b/metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=An extended getty for the framebuffer console
 EAPI=5
 HOMEPAGE=http://projects.meuh.org/fbgetty/
-INHERIT=eutils
+INHERIT=epatch
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://projects.meuh.org/fbgetty/downloads/fbgetty-0.1.698.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
-_md5_=f1cf65daaabba399207d2936a5e37f56
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=73c5e69d4db0e8b0d7df01972f44ae6d
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
index 1dbdbcadc86a..56cff3b2f875 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -3,12 +3,12 @@ DEPEND=virtual/yacc >=app-portage/elt-patches-20170815
 DESCRIPTION=Tools for ATM
 EAPI=5
 HOMEPAGE=http://linux-atm.sourceforge.net/
-INHERIT=eutils flag-o-matic libtool linux-info ltprune
+INHERIT=epatch flag-o-matic libtool linux-info ltprune
 IUSE=static-libs kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=502ebe59d0f601de24d37931550d98e2
+_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	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=98f800f5471344483016d424743e3c8e
diff --git a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3 b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
index 0447bc8b9d3f..6dc1121bfb6c 100644
--- a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
+++ b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
@@ -3,11 +3,11 @@ DEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-
 DESCRIPTION=Dialup alphapaging software
 EAPI=6
 HOMEPAGE=https://www.sendpage.org/
-INHERIT=perl-module eutils user
+INHERIT=perl-module user
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-1.44 >=virtual/perl-libnet-1.11 >=dev-perl/Net-SNPP-1.13 dev-perl/DBI dev-lang/perl:=
 SLOT=0
 SRC_URI=https://www.sendpage.org/download/sendpage-1.001.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=34d2f3bbedaca7f7bdbc5974dfb0fafe
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=aaadc245869318791fd8d879bf87b19e
diff --git a/metadata/md5-cache/net-dialup/sercd-3.0.0-r2 b/metadata/md5-cache/net-dialup/sercd-3.0.0-r2
index 1e9a96e525a9..f7568c6c84ad 100644
--- a/metadata/md5-cache/net-dialup/sercd-3.0.0-r2
+++ b/metadata/md5-cache/net-dialup/sercd-3.0.0-r2
@@ -2,12 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=RFC2217-compliant serial port redirector
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/sercd
-INHERIT=eutils
 IUSE=xinetd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=xinetd? ( virtual/inetd )
 SLOT=0
 SRC_URI=mirror://sourceforge/sercd/sercd-3.0.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
-_md5_=5f02f191cff265b41564fc9a963fd2ca
+_md5_=0b11f04b92d926476884736678c80ee1
diff --git a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3 b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
index e8a8e78c048b..7cc31b75f0c4 100644
--- a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
+++ b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Firmware and configuration instructions for Alcatel SpeedTouch USB modems
 EAPI=6
 HOMEPAGE=http://www.speedtouch.com/
-INHERIT=eutils linux-info
+INHERIT=linux-info
 IUSE=kernel_linux
 KEYWORDS=~amd64 x86
 LICENSE=SpeedTouch-USB-Firmware
 RDEPEND=net-dialup/ppp
 SLOT=0
 SRC_URI=http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_3012.zip
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=736bb8b3e82e008522a5c8bea5133d9f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=e40a517e19ffbd0f7f259dcc8336591a
diff --git a/metadata/md5-cache/net-dialup/xc-4.3.2-r4 b/metadata/md5-cache/net-dialup/xc-4.3.2-r4
index 0c14fef7c793..394af74365ee 100644
--- a/metadata/md5-cache/net-dialup/xc-4.3.2-r4
+++ b/metadata/md5-cache/net-dialup/xc-4.3.2-r4
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig
 DESCRIPTION=Modem dialout & serial terminal program
 EAPI=5
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs
+INHERIT=epatch flag-o-matic multilib toolchain-funcs
 KEYWORDS=amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=xc-radley
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/xc-4.3.2.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=c278838b44e72f79bb9fc16685e2771b
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=43904005c27d88abb7001402582cd4ff
diff --git a/metadata/md5-cache/net-dns/c-ares-1.17.1 b/metadata/md5-cache/net-dns/c-ares-1.17.1
index c22e0ef1b4d8..ec81bfd91147 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.17.1
+++ b/metadata/md5-cache/net-dns/c-ares-1.17.1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=C library that resolves names asynchronously
 EAPI=7
 HOMEPAGE=https://c-ares.haxx.se/
-INHERIT=autotools eutils multilib-minimal
+INHERIT=autotools 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 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris
 LICENSE=MIT
 SLOT=0/2
 SRC_URI=https://c-ares.haxx.se/download/c-ares-1.17.1.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=501fa27ba461561b01984f75e10f5021
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=29f841828e716ff23da9f110f3d6d723
diff --git a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1 b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
index 6496f6dab11d..1e3418b97a6f 100644
--- a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
+++ b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Fingerprinting DNS servers
 EAPI=5
 HOMEPAGE=https://github.com/kirei/fpdns/
-INHERIT=eutils perl-module
+INHERIT=epatch perl-module
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-perl/Net-DNS-0.74 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/kirei/fpdns/archive/20130404.tar.gz -> fpdns-0.10.0_pre20130404.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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=c6ca7dbadc32c65ad49d8baddf6be294
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=56cf40b04e9bc70a2d50fed925f69a64
diff --git a/metadata/md5-cache/net-dns/idnkit-1.0-r2 b/metadata/md5-cache/net-dns/idnkit-1.0-r2
index 1418a0ba1cab..a00f023f0d82 100644
--- a/metadata/md5-cache/net-dns/idnkit-1.0-r2
+++ b/metadata/md5-cache/net-dns/idnkit-1.0-r2
@@ -3,11 +3,11 @@ DEPEND=virtual/libiconv sys-devel/gnuconfig >=app-portage/elt-patches-20170815 |
 DESCRIPTION=Toolkit for Internationalized Domain Names (IDN)
 EAPI=5
 HOMEPAGE=https://www.nic.ad.jp/ja/idn/idnkit/download/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=JNIC
 SLOT=0
 SRC_URI=https://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-1.0-src.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_=1c9e5535a6d5bdc5b48be9a220ef77df
+_md5_=4460d1856887888f2364a5b6e04b9406
diff --git a/metadata/md5-cache/net-dns/idnkit-2.3 b/metadata/md5-cache/net-dns/idnkit-2.3
index e0afaae93400..fc15d7ba0636 100644
--- a/metadata/md5-cache/net-dns/idnkit-2.3
+++ b/metadata/md5-cache/net-dns/idnkit-2.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://jprs.co.jp/idn/idnkit-2.3.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
-_md5_=2e9d037420db8da99b5b016be6be599e
+_md5_=bf34e3159035354993f021b39986f714
diff --git a/metadata/md5-cache/net-dns/mydns-1.2.8.31-r1 b/metadata/md5-cache/net-dns/mydns-1.2.8.31-r1
index 755d12270433..3bc7bf510eb8 100644
--- a/metadata/md5-cache/net-dns/mydns-1.2.8.31-r1
+++ b/metadata/md5-cache/net-dns/mydns-1.2.8.31-r1
@@ -3,7 +3,7 @@ DEPEND=mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/post
 DESCRIPTION=A DNS-Server which gets its data from a MySQL-/PostgreSQL-database
 EAPI=5
 HOMEPAGE=http://www.mydns.pl/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
 IUSE=alias debug nls mysql postgres ssl static status
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( mysql postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/mydns-ng/mydns-1.2.8.31.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_=3368a5033c36224359c681dcaed562fd
+_md5_=1e26a85a597d8cbcc2f9b15c52cf98df
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1 b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
index 37748f1ec530..40b6a58eefa5 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( vi
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=5
 HOMEPAGE=https://www.opendnssec.org/
-INHERIT=autotools eutils multilib user
+INHERIT=autotools epatch multilib user
 IUSE=debug doc +mysql +signer sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.opendnssec.org/files/source/opendnssec-1.4.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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=c9a1b014327de12b0fbcef3a4b307401
+_md5_=e10df685539aae778118d53b93a16e14
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
index 83de38e3989e..9d13be827667 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( vi
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=5
 HOMEPAGE=https://www.opendnssec.org/
-INHERIT=autotools eutils multilib user
+INHERIT=autotools epatch multilib user
 IUSE=debug doc +mysql readline +signer sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.opendnssec.org/files/source/opendnssec-2.0.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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=25f674035c060ea9da61416ede107617
+_md5_=faca7e6b541212ef01e22029a40282d1
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2 b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
index ce943c538087..995468a06860 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
@@ -4,7 +4,7 @@ DEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld ) gdbm
 DESCRIPTION=Single Packet Authorization and Port Knocking application
 EAPI=7
 HOMEPAGE=https://www.cipherdyne.org/fwknop/
-INHERIT=autotools eutils linux-info readme.gentoo-r1 systemd tmpfiles
+INHERIT=autotools linux-info readme.gentoo-r1 systemd tmpfiles
 IUSE=+client extras firewalld gdbm gpg +iptables nfqueue +server static-libs udp-server kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -12,5 +12,5 @@ RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld ) gdb
 REQUIRED_USE=nfqueue? ( server ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
 SLOT=0
 SRC_URI=https://www.cipherdyne.org/fwknop/download/fwknop-2.6.10.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=82f2b77f7ebf0f6ae7e86dd91af14d50
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=64e6a24c11b11030c67a3f9e4d47249c
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22-r3 b/metadata/md5-cache/net-firewall/nufw-2.2.22-r3
index 083508cf39f0..7a4167fdf0c5 100644
--- a/metadata/md5-cache/net-firewall/nufw-2.2.22-r3
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.22-r3
@@ -3,7 +3,7 @@ DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy n
 DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
 EAPI=6
 HOMEPAGE=http://www.nufw.org/
-INHERIT=autotools eutils flag-o-matic ltprune multilib pam ssl-cert
+INHERIT=autotools flag-o-matic ltprune multilib pam ssl-cert
 IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
 _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	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	ssl-cert	a9ab3ee655f5ee43246ff3999cfedfe6
-_md5_=a1b80dc58c31fc19c0a158d7b742e149
+_md5_=f7b861333324e8f946781315f6ba95bb
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36 b/metadata/md5-cache/net-firewall/ufw-0.36
index 2fdf977acdcf..b4c71a025970 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.36
+++ b/metadata/md5-cache/net-firewall/ufw-0.36
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DESCRIPTION=A program used to manage a netfilter firewall
 EAPI=7
 HOMEPAGE=https://launchpad.net/ufw
-INHERIT=bash-completion-r1 distutils-r1 eutils linux-info systemd
+INHERIT=bash-completion-r1 distutils-r1 linux-info systemd
 IUSE=examples ipv6 python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=bddb794d070f69d122382020c29f7c4a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=358ef7c029cb1a2b598382e2c3cec3a4
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.13 b/metadata/md5-cache/net-firewall/xtables-addons-3.13
index 7537733c84b8..6dabde4502f1 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.13
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.13
@@ -3,12 +3,12 @@ DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources modules? ( kernel_lin
 DESCRIPTION=iptables extensions not yet accepted in the main kernel
 EAPI=7
 HOMEPAGE=https://inai.de/projects/xtables-addons/
-INHERIT=eutils linux-info linux-mod multilib toolchain-funcs
+INHERIT=linux-info linux-mod multilib toolchain-funcs
 IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux dist-kernel +modules
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8
-_md5_=d468c636a99882f716e61fda73c95195
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-mod	2356a95549dd8cb503f063d05e88c0c8
+_md5_=bfc52e2192755aacf546455ca8e360c9
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.18 b/metadata/md5-cache/net-firewall/xtables-addons-3.18
index eab08100362c..aea9760960c6 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.18
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.18
@@ -3,12 +3,12 @@ DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources modules? ( kernel_lin
 DESCRIPTION=iptables extensions not yet accepted in the main kernel
 EAPI=7
 HOMEPAGE=https://inai.de/projects/xtables-addons/
-INHERIT=eutils linux-info linux-mod multilib toolchain-funcs
+INHERIT=linux-info linux-mod multilib toolchain-funcs
 IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_proto xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux kernel_linux kernel_linux dist-kernel +modules
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8
-_md5_=60c056c4bad4e1334be34ef0c74b9bdf
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-mod	2356a95549dd8cb503f063d05e88c0c8
+_md5_=ed99e5010d70e6e5446bbd39e13b3919
diff --git a/metadata/md5-cache/net-ftp/frox-0.7.18-r6 b/metadata/md5-cache/net-ftp/frox-0.7.18-r6
index fb004389d08d..6a26c365e876 100644
--- a/metadata/md5-cache/net-ftp/frox-0.7.18-r6
+++ b/metadata/md5-cache/net-ftp/frox-0.7.18-r6
@@ -3,7 +3,7 @@ DEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( !libressl? ( dev-libs/open
 DESCRIPTION=A transparent ftp proxy
 EAPI=6
 HOMEPAGE=http://frox.sourceforge.net/
-INHERIT=autotools eutils user
+INHERIT=autotools user
 IUSE=clamav libressl ssl transparent
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( !libressl? ( dev-libs/ope
 SLOT=0
 SRC_URI=http://frox.sourceforge.net/download/frox-0.7.18.tar.bz2
 _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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=4f7406b5c805527dca9ce7913ddd3c0d
+_md5_=6ef9181ef899601bba32ef198a326662
diff --git a/metadata/md5-cache/net-ftp/yafc-1.3.7 b/metadata/md5-cache/net-ftp/yafc-1.3.7
index 2dbed49918a3..771d44a4d929 100644
--- a/metadata/md5-cache/net-ftp/yafc-1.3.7
+++ b/metadata/md5-cache/net-ftp/yafc-1.3.7
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:* dev-libs/libbsd !libressl? ( dev-libs/openssl:0= ) lib
 DESCRIPTION=Console ftp client with a lot of nifty features
 EAPI=5
 HOMEPAGE=http://www.yafc-ftp.com/
-INHERIT=bash-completion-r1 eutils
+INHERIT=bash-completion-r1 epatch
 IUSE=ipv6 libressl kerberos readline socks5 ssh
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:* dev-libs/libbsd !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
 SLOT=0
 SRC_URI=http://www.yafc-ftp.com/downloads/yafc-1.3.7.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=be72ed31734b56d762ff15256e5d7762
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=e4fb85d15c2a66c52cbbefe9afdebd79
diff --git a/metadata/md5-cache/net-im/coturn-4.5.2 b/metadata/md5-cache/net-im/coturn-4.5.2
index fc706006e457..b7742fc3da67 100644
--- a/metadata/md5-cache/net-im/coturn-4.5.2
+++ b/metadata/md5-cache/net-im/coturn-4.5.2
@@ -4,12 +4,12 @@ DEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,li
 DESCRIPTION=coturn TURN server project
 EAPI=7
 HOMEPAGE=https://github.com/coturn/coturn
-INHERIT=eutils systemd tmpfiles
+INHERIT=systemd tmpfiles
 IUSE=mongodb mysql postgres redis sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/coturn/coturn/archive/4.5.2.tar.gz -> coturn-4.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=348d48ee60f36d9eec76f27c0d6fd307
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=167b3cbc5748e3236e950af7033dcd93
diff --git a/metadata/md5-cache/net-im/coturn-9999 b/metadata/md5-cache/net-im/coturn-9999
index 5907150b8603..7e066d8b78da 100644
--- a/metadata/md5-cache/net-im/coturn-9999
+++ b/metadata/md5-cache/net-im/coturn-9999
@@ -4,11 +4,11 @@ DEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,li
 DESCRIPTION=coturn TURN server project
 EAPI=7
 HOMEPAGE=https://github.com/coturn/coturn
-INHERIT=eutils systemd tmpfiles git-r3
+INHERIT=systemd tmpfiles git-r3
 IUSE=mongodb mysql postgres redis sqlite
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=acct-group/turnserver acct-user/turnserver || ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=348d48ee60f36d9eec76f27c0d6fd307
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=167b3cbc5748e3236e950af7033dcd93
diff --git a/metadata/md5-cache/net-irc/onis-0.8.2-r1 b/metadata/md5-cache/net-irc/onis-0.8.2-r1
index b205b833563c..f4cd6dc34982 100644
--- a/metadata/md5-cache/net-irc/onis-0.8.2-r1
+++ b/metadata/md5-cache/net-irc/onis-0.8.2-r1
@@ -3,11 +3,9 @@ DEPEND=dev-lang/perl >=sys-apps/sed-4
 DESCRIPTION=onis not irc stats
 EAPI=6
 HOMEPAGE=http://verplant.org/onis/
-INHERIT=eutils
 KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://verplant.org/onis/onis-0.8.2.tar.bz2
-_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
-_md5_=e548808d5e0397ab679283c1cb99d651
+_md5_=f1d13b4a0d7a35c71bec826a945a97bf
diff --git a/metadata/md5-cache/net-libs/NativeThread-0_pre20190914 b/metadata/md5-cache/net-libs/NativeThread-0_pre20190914
index cf9289d679fb..aa157c0a1da5 100644
--- a/metadata/md5-cache/net-libs/NativeThread-0_pre20190914
+++ b/metadata/md5-cache/net-libs/NativeThread-0_pre20190914
@@ -3,12 +3,12 @@ DEPEND=>=net-p2p/freenet-0.7 >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=NativeThread for priorities on linux for freenet
 EAPI=6
 HOMEPAGE=http://www.freenetproject.org/
-INHERIT=eutils flag-o-matic java-pkg-2 multilib toolchain-funcs
+INHERIT=flag-o-matic java-pkg-2 toolchain-funcs
 IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/NativeThread-0_pre20190914.tar.bz2
-_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	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
-_md5_=4414186d104905c144986efce67a23b0
+_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	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
+_md5_=fea8f3ee089808d890256d04c78bf4d5
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.5-r100 b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
index 4af616e6c80b..a188eb030453 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.5-r100
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
@@ -3,7 +3,7 @@ DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
 EAPI=7
 HOMEPAGE=http://axtls.sourceforge.net/
-INHERIT=lua-single multilib multilib-minimal savedconfig toolchain-funcs user
+INHERIT=lua-single multilib-minimal savedconfig toolchain-funcs user
 IUSE=httpd cgi-lua cgi-php static static-libs doc lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 savedconfig
 KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=BSD GPL-2
@@ -12,4 +12,4 @@ REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lu
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=a982f6846bb7ceb504a7191cb38d72f4
+_md5_=d686979e7009e47670e8af8c8e80190b
diff --git a/metadata/md5-cache/net-libs/c-client-2007f-r6 b/metadata/md5-cache/net-libs/c-client-2007f-r6
index d4eb8ab2b755..f185263bf03d 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f-r6
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r6
@@ -3,7 +3,7 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=UW IMAP c-client library
 EAPI=6
 HOMEPAGE=http://www.washington.edu/imap/
-INHERIT=flag-o-matic libtool toolchain-funcs multilib
+INHERIT=flag-o-matic libtool toolchain-funcs
 IUSE=doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z chappa? ( mirror://gentoo/c-client-2007f-chappa-115-all.patch.gz )
 _eclasses_=toolchain-funcs	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	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96
-_md5_=631110ae80aee6dc3f8925d2a0b3244f
+_md5_=a1bdee4adb8b369942f19465e5bce460
diff --git a/metadata/md5-cache/net-libs/gnet-2.0.8-r3 b/metadata/md5-cache/net-libs/gnet-2.0.8-r3
index a7d022c7719b..cad32ce73b8c 100644
--- a/metadata/md5-cache/net-libs/gnet-2.0.8-r3
+++ b/metadata/md5-cache/net-libs/gnet-2.0.8-r3
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.6:2 >=dev-libs/check-0.9.11 >=dev-util/gtk-doc-am-1.2 v
 DESCRIPTION=A simple network library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GNetLibrary
-INHERIT=autotools eutils gnome2
+INHERIT=autotools epatch gnome2
 IUSE=test debug
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnet/2.0/gnet-2.0.8.tar.bz2
 _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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=625adf1b29cee469859337c8f1adb2b9
+_md5_=e6a1cf846f52210dcea4d104f9bbe3d0
diff --git a/metadata/md5-cache/net-libs/gsnmp-0.3.0 b/metadata/md5-cache/net-libs/gsnmp-0.3.0
index 4f47afe8f08c..7165c6eb82e1 100644
--- a/metadata/md5-cache/net-libs/gsnmp-0.3.0
+++ b/metadata/md5-cache/net-libs/gsnmp-0.3.0
@@ -3,7 +3,7 @@ DEPEND=dev-libs/glib:2 net-libs/gnet sys-devel/gnuconfig >=app-portage/elt-patch
 DESCRIPTION=An SNMP library based on glib and gnet
 EAPI=5
 HOMEPAGE=https://github.com/schoenw/gsnmp
-INHERIT=autotools eutils ltprune
+INHERIT=autotools epatch ltprune
 IUSE=static-libs
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2 net-libs/gnet
 SLOT=0
 SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/gsnmp/gsnmp-0.3.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
-_md5_=12b7d2a9ae1daba713caa2c918d717fa
+_md5_=28b74b2f73f650bf461e8656fd1228e0
diff --git a/metadata/md5-cache/net-libs/ldns-1.7.1-r1 b/metadata/md5-cache/net-libs/ldns-1.7.1-r1
index f84c4898d288..c2ad8027295c 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.1-r1
+++ b/metadata/md5-cache/net-libs/ldns-1.7.1-r1
@@ -3,7 +3,7 @@ DEPEND=python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lan
 DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-INHERIT=eutils ltprune multilib-minimal python-single-r1
+INHERIT=epatch ltprune multilib-minimal python-single-r1
 IUSE=+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=test
 SLOT=0/3
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=7d98807cc42c779724f2f8dcad303368
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
+_md5_=5795f4821cf00af740e1c56b837128a7
diff --git a/metadata/md5-cache/net-libs/ldns-1.7.1-r2 b/metadata/md5-cache/net-libs/ldns-1.7.1-r2
index 8922934e1467..f3b9ecbe8940 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.1-r2
+++ b/metadata/md5-cache/net-libs/ldns-1.7.1-r2
@@ -3,7 +3,7 @@ DEPEND=python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lan
 DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-INHERIT=eutils multilib-minimal python-single-r1
+INHERIT=epatch multilib-minimal python-single-r1
 IUSE=+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=test
 SLOT=0/3
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=34c31ef8a4b65651ecf21f0ebfcb9f4c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
+_md5_=440ecab10b319ab71b6a2b8d6e7dab0c
diff --git a/metadata/md5-cache/net-libs/libbtbb-2018.08.1 b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
index 85454e9108e6..6f27307eea17 100644
--- a/metadata/md5-cache/net-libs/libbtbb-2018.08.1
+++ b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
@@ -3,12 +3,12 @@ DEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plug
 DESCRIPTION=A library to decode Bluetooth baseband packets
 EAPI=6
 HOMEPAGE=http://libbtbb.sourceforge.net/
-INHERIT=multilib cmake-utils
+INHERIT=cmake-utils
 IUSE=static-libs wireshark-plugins
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
 SLOT=0/2018.08.1
 SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2018-08-R1.tar.gz -> libbtbb-2018-08-R1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=b0dc33f3118632a4cee43ea674665c29
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
+_md5_=53fc337fd4c6205ca8a24fa479133198
diff --git a/metadata/md5-cache/net-libs/libbtbb-2018.12.1 b/metadata/md5-cache/net-libs/libbtbb-2018.12.1
index 1bc47771efa4..4b1ebb981edd 100644
--- a/metadata/md5-cache/net-libs/libbtbb-2018.12.1
+++ b/metadata/md5-cache/net-libs/libbtbb-2018.12.1
@@ -3,12 +3,12 @@ DEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plug
 DESCRIPTION=A library to decode Bluetooth baseband packets
 EAPI=6
 HOMEPAGE=http://libbtbb.sourceforge.net/
-INHERIT=multilib cmake-utils
+INHERIT=cmake-utils
 IUSE=static-libs wireshark-plugins
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
 RDEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
 SLOT=0/2018.12.1
 SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2018-12-R1.tar.gz -> libbtbb-2018-12-R1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=685cc845084375741f7c0610c7886dee
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
+_md5_=741f29efc404ab54c271d2fb1aac51f7
diff --git a/metadata/md5-cache/net-libs/libbtbb-2020.12.1 b/metadata/md5-cache/net-libs/libbtbb-2020.12.1
index ec63a1225d30..a7e3a242f0f1 100644
--- a/metadata/md5-cache/net-libs/libbtbb-2020.12.1
+++ b/metadata/md5-cache/net-libs/libbtbb-2020.12.1
@@ -4,12 +4,12 @@ DEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plug
 DESCRIPTION=A library to decode Bluetooth baseband packets
 EAPI=7
 HOMEPAGE=http://libbtbb.sourceforge.net/
-INHERIT=multilib cmake
+INHERIT=cmake
 IUSE=static-libs wireshark-plugins
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
 SLOT=0/2020.12.1
 SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2020-12-R1.tar.gz -> libbtbb-2020-12-R1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=1786ea799bbaa55f1a8852a51c8065e0
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_md5_=be0cfbc8abe4b6a35d87244cc4011b92
diff --git a/metadata/md5-cache/net-libs/libbtbb-9999 b/metadata/md5-cache/net-libs/libbtbb-9999
index 93efbd4a72c1..43988fd1c5b9 100644
--- a/metadata/md5-cache/net-libs/libbtbb-9999
+++ b/metadata/md5-cache/net-libs/libbtbb-9999
@@ -4,11 +4,11 @@ DEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plug
 DESCRIPTION=A library to decode Bluetooth baseband packets
 EAPI=7
 HOMEPAGE=http://libbtbb.sourceforge.net/
-INHERIT=multilib cmake git-r3
+INHERIT=cmake git-r3
 IUSE=static-libs wireshark-plugins
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
 SLOT=0/9999
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=1786ea799bbaa55f1a8852a51c8065e0
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=be0cfbc8abe4b6a35d87244cc4011b92
diff --git a/metadata/md5-cache/net-libs/libgrss-0.5.0-r1 b/metadata/md5-cache/net-libs/libgrss-0.5.0-r1
index 3bd5ef6a4f55..a87bfd3a7cf7 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.5.0-r1
+++ b/metadata/md5-cache/net-libs/libgrss-0.5.0-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libsoup-2.
 DESCRIPTION=LibGRSS is a library for easy management of RSS/Atom/Pie feeds
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgrss
-INHERIT=autotools eutils gnome2
+INHERIT=autotools epatch gnome2
 IUSE=debug
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-3
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libsoup-2
 SLOT=0.5
 SRC_URI=http://gtk.mplat.es/libgrss/tarballs/libgrss-0.5.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=252afc909c9e9d4f5fb02fc5bc30a6f3
+_md5_=e376f48bb0fb1dcc17d64e0e8ed5c9bf
diff --git a/metadata/md5-cache/net-libs/libmbim-1.24.4 b/metadata/md5-cache/net-libs/libmbim-1.24.4
index 4180dc4f6467..b99b4113fd77 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.24.4
+++ b/metadata/md5-cache/net-libs/libmbim-1.24.4
@@ -4,12 +4,10 @@ DEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
 DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper library
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim
-INHERIT=multilib
 IUSE=udev
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.24.4.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3ab9fd3e45f0db18d383c589964062eb
+_md5_=79c3c35bf78a8bd2abf67a74a404f28a
diff --git a/metadata/md5-cache/net-libs/libmbim-1.24.6 b/metadata/md5-cache/net-libs/libmbim-1.24.6
index 7a7903ffc2b4..91489a81a8a6 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.24.6
+++ b/metadata/md5-cache/net-libs/libmbim-1.24.6
@@ -4,12 +4,10 @@ DEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
 DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper library
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim
-INHERIT=multilib
 IUSE=udev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.24.6.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=430f59c49e0919df1c423e0dc43f6da7
+_md5_=4068871f65ff08e3ffb2ee1958ba38a2
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.4 b/metadata/md5-cache/net-libs/libmnl-1.0.4
index 719f931a612b..01840d08b38c 100644
--- a/metadata/md5-cache/net-libs/libmnl-1.0.4
+++ b/metadata/md5-cache/net-libs/libmnl-1.0.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Minimalistic netlink library
 EAPI=7
 HOMEPAGE=https://netfilter.org/projects/libmnl/
-INHERIT=toolchain-funcs usr-ldscript
+INHERIT=usr-ldscript
 IUSE=examples static-libs split-usr
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux
 LICENSE=LGPL-2.1
 SLOT=0/0.2.0
 SRC_URI=https://www.netfilter.org/projects/libmnl/files/libmnl-1.0.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=f1845f0ff6288fd7705510ebe2cbda21
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=1026782a9b5cf20464063417ee657464
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
index 2e03ba2df3da..f9c9e168920d 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
@@ -3,12 +3,12 @@ DEPEND=net-libs/libmnl virtual/pkgconfig
 DESCRIPTION=library providing interface to extended accounting infrastructure
 EAPI=6
 HOMEPAGE=https://netfilter.org/projects/libnetfilter_acct/
-INHERIT=eutils linux-info ltprune multilib
+INHERIT=linux-info ltprune multilib
 IUSE=examples kernel_linux
 KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=53a8d41e72a812846e79d5f79a18521c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=422105e330a8574491118df6b543aa1b
diff --git a/metadata/md5-cache/net-libs/libnice-0.1.13 b/metadata/md5-cache/net-libs/libnice-0.1.13
index 21840c4dc850..1442e7af01e7 100644
--- a/metadata/md5-cache/net-libs/libnice-0.1.13
+++ b/metadata/md5-cache/net-libs/libnice-0.1.13
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=An implementation of the Interactice Connectivity Establishment standard (ICE)
 EAPI=5
 HOMEPAGE=https://nice.freedesktop.org/wiki/
-INHERIT=autotools eutils ltprune multilib-minimal xdg-utils
+INHERIT=autotools eutils epatch ltprune multilib-minimal xdg-utils
 IUSE=+introspection +upnp 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 ~ppc-macos
 LICENSE=|| ( MPL-1.1 LGPL-2.1 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nice.freedesktop.org/releases/libnice-0.1.13.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5a6e0c2b5fcfc4bcb8ba9545909be53
+_md5_=4b026ed34e13cc5a3565124152247c11
diff --git a/metadata/md5-cache/net-libs/libosmo-dsp-0.4.0 b/metadata/md5-cache/net-libs/libosmo-dsp-0.4.0
index 61281f76b33a..70aceeffb658 100644
--- a/metadata/md5-cache/net-libs/libosmo-dsp-0.4.0
+++ b/metadata/md5-cache/net-libs/libosmo-dsp-0.4.0
@@ -1,10 +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
+BDEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=sci-libs/fftw:3.0 doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEPEND=sci-libs/fftw:3.0
 DESCRIPTION=A library with SDR DSP primitives
 EAPI=7
 HOMEPAGE=http://git.osmocom.org/libosmo-dsp/
-INHERIT=autotools multilib
+INHERIT=autotools
 IUSE=doc static-libs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=sci-libs/fftw:3.0
 SLOT=0/0.4.0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/libosmo-dsp-0.4.0.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=fe6ca3e2a1b38af500210b3a0aaf0c3d
+_md5_=6a041f03d4f4cb8de50ba44198dc9a6c
diff --git a/metadata/md5-cache/net-libs/libosmo-dsp-9999 b/metadata/md5-cache/net-libs/libosmo-dsp-9999
index ce929b48dcf7..3a3e78f00ae3 100644
--- a/metadata/md5-cache/net-libs/libosmo-dsp-9999
+++ b/metadata/md5-cache/net-libs/libosmo-dsp-9999
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=sci-libs/fftw:3.0 doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEPEND=sci-libs/fftw:3.0
 DESCRIPTION=A library with SDR DSP primitives
 EAPI=7
 HOMEPAGE=http://git.osmocom.org/libosmo-dsp/
-INHERIT=autotools multilib git-r3
+INHERIT=autotools git-r3
 IUSE=doc static-libs
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sci-libs/fftw:3.0
 SLOT=0/9999
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=4f1defb608d53f86e57bd0e8d4eda8da
+_md5_=6c2b0467fb57cae4e677e3b6afcd36d8
diff --git a/metadata/md5-cache/net-libs/libqmi-1.26.6 b/metadata/md5-cache/net-libs/libqmi-1.26.6
index c02fb30add37..ed889a396bfb 100644
--- a/metadata/md5-cache/net-libs/libqmi-1.26.6
+++ b/metadata/md5-cache/net-libs/libqmi-1.26.6
@@ -4,12 +4,10 @@ DEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0
 DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
-INHERIT=multilib
 IUSE=doc +mbim
 KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
 SLOT=0/5.7
 SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.26.6.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d0f27ce7d9be57c6c8ffc2f2541a26d4
+_md5_=b83fb435ec8bfe0b481e90640bf55119
diff --git a/metadata/md5-cache/net-libs/libqmi-1.28.2 b/metadata/md5-cache/net-libs/libqmi-1.28.2
index 7f4ea26a5ae2..da5055d014b3 100644
--- a/metadata/md5-cache/net-libs/libqmi-1.28.2
+++ b/metadata/md5-cache/net-libs/libqmi-1.28.2
@@ -4,12 +4,10 @@ DEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0
 DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
-INHERIT=multilib
 IUSE=gtk-doc +mbim
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
 SLOT=0/5.7
 SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.28.2.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=64a2afc489f28aa8c7759e104fa544b6
+_md5_=b0589a39ba1dd543b3c94e0115a0fed4
diff --git a/metadata/md5-cache/net-libs/libqmi-9999 b/metadata/md5-cache/net-libs/libqmi-9999
index cdc2c50b38a8..0ba58f39eabf 100644
--- a/metadata/md5-cache/net-libs/libqmi-9999
+++ b/metadata/md5-cache/net-libs/libqmi-9999
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0
 DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
-INHERIT=multilib git-r3 autotools
+INHERIT=git-r3 autotools
 IUSE=doc +mbim
 LICENSE=LGPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
 SLOT=0/5.7
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=d88d5704d336b6175a18a7c1e97db00e
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=537160f7555d5b5153538e16194a768e
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.8-r1 b/metadata/md5-cache/net-libs/libtorrent-0.13.8-r1
index 5b426a4d47ee..66d0b2e4a130 100644
--- a/metadata/md5-cache/net-libs/libtorrent-0.13.8-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-0.13.8-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=configure install
-DEPEND=dev-util/cppunit:= sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-util/cppunit:= sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/pkgconfig
 DESCRIPTION=BitTorrent library written in C++ for *nix
 EAPI=6
 HOMEPAGE=https://rakshasa.github.io/rtorrent/
-INHERIT=autotools toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=debug libressl ssl test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-util/cppunit:= sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/libtorrent-0.13.8.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_=1592e32855e4b27580c374fe8086128b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=50625b494922f38ac95ef0aee80f20a2
diff --git a/metadata/md5-cache/net-libs/liquid-dsp-1.3.2 b/metadata/md5-cache/net-libs/liquid-dsp-1.3.2
index 20214901ec06..dd4e72167f21 100644
--- a/metadata/md5-cache/net-libs/liquid-dsp-1.3.2
+++ b/metadata/md5-cache/net-libs/liquid-dsp-1.3.2
@@ -4,7 +4,7 @@ DEPEND=sci-libs/fftw:3.0=
 DESCRIPTION=digital signal processing library for software-defined radios
 EAPI=7
 HOMEPAGE=https://liquidsdr.org
-INHERIT=autotools multilib
+INHERIT=autotools
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/jgaeddert/liquid-dsp/archive/v1.3.2.tar.gz -> liquid-dsp-1.3.2.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=4bb4b1517925630d56efe789103b0ece
+_md5_=8d3ce5b2339de0bc0de7d60b12a11433
diff --git a/metadata/md5-cache/net-libs/liquid-dsp-9999 b/metadata/md5-cache/net-libs/liquid-dsp-9999
index b46351c930a6..430191b77919 100644
--- a/metadata/md5-cache/net-libs/liquid-dsp-9999
+++ b/metadata/md5-cache/net-libs/liquid-dsp-9999
@@ -4,11 +4,11 @@ DEPEND=sci-libs/fftw:3.0=
 DESCRIPTION=digital signal processing library for software-defined radios
 EAPI=7
 HOMEPAGE=https://liquidsdr.org
-INHERIT=autotools multilib git-r3
+INHERIT=autotools git-r3
 IUSE=static-libs
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=4bb4b1517925630d56efe789103b0ece
+_md5_=8d3ce5b2339de0bc0de7d60b12a11433
diff --git a/metadata/md5-cache/net-libs/nDPI-9999 b/metadata/md5-cache/net-libs/nDPI-9999
index bf5f02f374d6..69fec8a2a8fd 100644
--- a/metadata/md5-cache/net-libs/nDPI-9999
+++ b/metadata/md5-cache/net-libs/nDPI-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/json-c:= net-libs/libpcap
 DESCRIPTION=Open Source Deep Packet Inspection Software Toolkit
 EAPI=7
 HOMEPAGE=https://www.ntop.org/
-INHERIT=autotools git-r3 multilib
+INHERIT=autotools git-r3
 IUSE=static-libs
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/json-c:= net-libs/libpcap
 SLOT=0
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=8506ceaffe431bb040221508d77348c0
+_md5_=8400fd3e0eb324d6cd2a1abe0c19afe6
diff --git a/metadata/md5-cache/net-libs/nghttp3-0_pre20190912 b/metadata/md5-cache/net-libs/nghttp3-0_pre20190912
index d35e275e994a..4fa582b9d959 100644
--- a/metadata/md5-cache/net-libs/nghttp3-0_pre20190912
+++ b/metadata/md5-cache/net-libs/nghttp3-0_pre20190912
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/nghttp3/archive/51379a041174ad953dc6ad437712f3b279f81919.tar.gz -> nghttp3-0_pre20190912.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999
-_md5_=1cca8553e5e9280067eac44a84edfe14
+_md5_=07e8e1340257e79b6d83cf5a199fcdd2
diff --git a/metadata/md5-cache/net-libs/nghttp3-9999 b/metadata/md5-cache/net-libs/nghttp3-9999
index ac9554cef26e..37e7f841329f 100644
--- a/metadata/md5-cache/net-libs/nghttp3-9999
+++ b/metadata/md5-cache/net-libs/nghttp3-9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=HTTP/3 library written in C
 EAPI=7
 HOMEPAGE=https://github.com/ngtcp2/nghttp3/
-INHERIT=cmake-multilib autotools git-r3
+INHERIT=cmake-multilib git-r3
 IUSE=test 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=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=ed146449eea90a54915722a1a7b16ec1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=7a214e8d46f8232701deebb73de181ce
diff --git a/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912 b/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
index d07bab447c5e..a44d7cfb0f3e 100644
--- a/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
+++ b/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/ngtcp2/archive/5122d9e5e1e91c718ebc3933252ee42522c6e942.tar.gz -> ngtcp2-0_pre20190912.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999
-_md5_=d34c8a03e4902ac0dcd11621354d2ad9
+_md5_=29b6c539707f46378af2d1c3e17a81f7
diff --git a/metadata/md5-cache/net-libs/ngtcp2-9999 b/metadata/md5-cache/net-libs/ngtcp2-9999
index 473d36d1541d..fa1c1ec156ac 100644
--- a/metadata/md5-cache/net-libs/ngtcp2-9999
+++ b/metadata/md5-cache/net-libs/ngtcp2-9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=ssl? ( >=dev-libs/openssl-1.1.1:0= ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Implementation of the IETF QUIC Protocol
 EAPI=7
 HOMEPAGE=https://github.com/ngtcp2/ngtcp2/
-INHERIT=cmake-multilib autotools git-r3
+INHERIT=cmake-multilib git-r3
 IUSE=ssl test 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=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=349d189775857247a8ace8c2a2230d74
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=e3487debb697d0b1ad649b574a7a0ac0
diff --git a/metadata/md5-cache/net-libs/ortp-0.23.0-r1 b/metadata/md5-cache/net-libs/ortp-0.23.0-r1
index ea402d21d8a8..1f400e76e2e7 100644
--- a/metadata/md5-cache/net-libs/ortp-0.23.0-r1
+++ b/metadata/md5-cache/net-libs/ortp-0.23.0-r1
@@ -3,12 +3,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:=
 DESCRIPTION=Open Real-time Transport Protocol (RTP, RFC3550) stack
 EAPI=6
 HOMEPAGE=http://www.linphone.org/
-INHERIT=eutils ltprune
+INHERIT=ltprune
 IUSE=debug doc examples ipv6 libressl minimal ntp-timestamp ssl srtp
 KEYWORDS=~alpha amd64 arm64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) srtp? ( net-libs/libsrtp:0= )
 SLOT=0/9
 SRC_URI=mirror://nongnu/linphone/ortp/sources/ortp-0.23.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
-_md5_=706c625b4a3c5541ca461f30b4c34077
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=48dad3bedc0e5150b8efe4cb843e97f4
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1
index b38cef6e26b6..d67e7b8589ee 100644
--- a/metadata/md5-cache/net-libs/rest-0.8.1
+++ b/metadata/md5-cache/net-libs/rest-0.8.1
@@ -3,7 +3,7 @@ DEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[abi_x86_32(-)?,abi_x86_64
 DESCRIPTION=Helper library for RESTful services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Librest
-INHERIT=eutils gnome2 multilib-minimal virtualx
+INHERIT=gnome2 multilib-minimal virtualx
 IUSE=+introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.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	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=b634118ad1d46a12e0cdcec60f94ec78
+_md5_=9d496c589d62f64e4cbb1fab87e27f73
diff --git a/metadata/md5-cache/net-mail/asmail-2.1-r1 b/metadata/md5-cache/net-mail/asmail-2.1-r1
index c30a05606911..9154fbc47645 100644
--- a/metadata/md5-cache/net-mail/asmail-2.1-r1
+++ b/metadata/md5-cache/net-mail/asmail-2.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) x11-libs/libXext x11-libs/libX11 x11-libs/libXpm x11-libs/libICE x11-libs/libSM jpeg? ( virtual/jpeg:= ) x11-base/xorg-proto
-DESCRIPTION=a small mail monitor similar to xbiff
+DESCRIPTION=A small mail monitor similar to xbiff
 EAPI=5
 HOMEPAGE=http://www.tigr.net
-INHERIT=toolchain-funcs eutils
+INHERIT=epatch toolchain-funcs
 IUSE=jpeg libressl
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) x11-libs/libXext x11-libs/libX11 x11-libs/libXpm x11-libs/libICE x11-libs/libSM jpeg? ( virtual/jpeg:= )
 SLOT=0
 SRC_URI=http://www.tigr.net/afterstep/download/asmail/asmail-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
-_md5_=0e2fa1b281a3bc7da8b1e3711df82c42
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=12162efcbc5044417a17871d701cf5c6
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r4 b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
index c84cbbbc6671..90b298422b88 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r4
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
@@ -3,12 +3,12 @@ DEPEND=acct-group/nofiles acct-group/qmail
 DESCRIPTION=reads sendmail's .forward files under qmail
 EAPI=7
 HOMEPAGE=http://cr.yp.to/dot-forward.html
-INHERIT=eutils fixheadtails qmail
+INHERIT=fixheadtails qmail
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 RDEPEND=acct-group/nofiles acct-group/qmail
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	qmail	b35b6b912311fb36e8fff96eaeb6bcf7
-_md5_=67c42444f3f0ed691280c8bad49b7df4
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	qmail	b35b6b912311fb36e8fff96eaeb6bcf7
+_md5_=39e8e03e8a7bacfe198b72bd4ff2c576
diff --git a/metadata/md5-cache/net-mail/qlogtools-3.1-r1 b/metadata/md5-cache/net-mail/qlogtools-3.1-r1
index cc4f0965528a..d230b38f22e2 100644
--- a/metadata/md5-cache/net-mail/qlogtools-3.1-r1
+++ b/metadata/md5-cache/net-mail/qlogtools-3.1-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install postinst
 DESCRIPTION=Qmail Log processing tools
 EAPI=7
 HOMEPAGE=http://untroubled.org/qlogtools/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!app-text/multitail
 SLOT=0
 SRC_URI=http://untroubled.org/qlogtools/archive/qlogtools-3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ec67d514ff35cfed991fc9b31637063
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e7d3b2b91fd1c1e1ae6efa04a6d7a5cb
diff --git a/metadata/md5-cache/net-misc/adjtimex-1.29-r2 b/metadata/md5-cache/net-misc/adjtimex-1.29-r2
index 587f6f00f0d1..f28090fb3c28 100644
--- a/metadata/md5-cache/net-misc/adjtimex-1.29-r2
+++ b/metadata/md5-cache/net-misc/adjtimex-1.29-r2
@@ -1,12 +1,11 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=sys-apps/sed
-DESCRIPTION=display or set the kernel time variables
+DESCRIPTION=Display or set the kernel time variables
 EAPI=7
 HOMEPAGE=https://www.ibiblio.org/pub/Linux/system/admin/time/adjtimex.lsm https://github.com/rogers0/adjtimex
-INHERIT=eutils fixheadtails toolchain-funcs
+INHERIT=fixheadtails toolchain-funcs
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/adjtimex/adjtimex_1.29-10.debian.tar.xz mirror://debian/pool/main/a/adjtimex/adjtimex_1.29.orig.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=c86c5c6b00927290af2cea656ab172b7
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=2708acc24e0a60c7eb293eef58862b85
diff --git a/metadata/md5-cache/net-misc/asterisk-g729-13.0.3.1.9 b/metadata/md5-cache/net-misc/asterisk-g729-13.0.3.1.9
index 447a7693ee84..f7b761871a89 100644
--- a/metadata/md5-cache/net-misc/asterisk-g729-13.0.3.1.9
+++ b/metadata/md5-cache/net-misc/asterisk-g729-13.0.3.1.9
@@ -8,5 +8,4 @@ RDEPEND==net-misc/asterisk-13*
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://downloads.digium.com/pub/telephony/codec_g729/asterisk-13.0/x86-32/codec_g729a-13.0_3.1.9-x86_32.tar.gz https://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 https://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 ) amd64? ( https://downloads.digium.com/pub/telephony/codec_g729/asterisk-13.0/x86-64/codec_g729a-13.0_3.1.9-x86_64.tar.gz https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7fe4269782259902316f5de54a2b0fde
+_md5_=4d4e27ce512df6d530494084d8b59c59
diff --git a/metadata/md5-cache/net-misc/axel-2.17.10 b/metadata/md5-cache/net-misc/axel-2.17.10
index e6ae3128ffd6..049dc8335b75 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.10
+++ b/metadata/md5-cache/net-misc/axel-2.17.10
@@ -1,15 +1,12 @@
-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 postinst
 DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( sys-devel/gettext )
 DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
-INHERIT=autotools
 IUSE=debug libressl nls ssl
 KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.10/axel-2.17.10.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=5ab81de6484a550047a3af789987cc75
+_md5_=e5fc9f036eacdc80a56644390122976c
diff --git a/metadata/md5-cache/net-misc/axel-2.17.8 b/metadata/md5-cache/net-misc/axel-2.17.8
index cab4815f002b..8f221048efe6 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.8
+++ b/metadata/md5-cache/net-misc/axel-2.17.8
@@ -1,15 +1,12 @@
-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 postinst
 DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( sys-devel/gettext )
 DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
-INHERIT=autotools
 IUSE=debug libressl nls ssl
 KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.8/axel-2.17.8.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=6967dd44b71dd475dbe2266a9bb4076e
+_md5_=e5fc9f036eacdc80a56644390122976c
diff --git a/metadata/md5-cache/net-misc/axel-2.17.9 b/metadata/md5-cache/net-misc/axel-2.17.9
index 0b8c44f2a234..d2324ed9beab 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.9
+++ b/metadata/md5-cache/net-misc/axel-2.17.9
@@ -1,15 +1,12 @@
-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 postinst
 DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( sys-devel/gettext )
 DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
-INHERIT=autotools
 IUSE=debug libressl nls ssl
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.9/axel-2.17.9.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f5c212fc20084956caf9bf165529c56c
+_md5_=ee73631892da23223d18126e52f8c97a
diff --git a/metadata/md5-cache/net-misc/bfgminer-5.5.0 b/metadata/md5-cache/net-misc/bfgminer-5.5.0
index 80ea07deea7e..fbf9b64cfed8 100644
--- a/metadata/md5-cache/net-misc/bfgminer-5.5.0
+++ b/metadata/md5-cache/net-misc/bfgminer-5.5.0
@@ -3,7 +3,6 @@ DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansso
 DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
 EAPI=6
 HOMEPAGE=https://bitcointalk.org/?topic=168174
-INHERIT=eutils
 IUSE=adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-3
@@ -11,5 +10,4 @@ RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/janss
 REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) alchemist? ( scrypt ) avalon? ( sha256d ) avalonmm? ( sha256d ) bitmain? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm-sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( bitfury sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
 SLOT=0
 SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/5.5.0/bfgminer-5.5.0.txz -> bfgminer-5.5.0.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
-_md5_=dccd50200b901c6d8940817f1d65daec
+_md5_=3f05a62a1ca71fe97406cff6e861bb8a
diff --git a/metadata/md5-cache/net-misc/bgpq3-0.1.33 b/metadata/md5-cache/net-misc/bgpq3-0.1.33
index fdbc6ead2ee8..b09e4d5894d4 100644
--- a/metadata/md5-cache/net-misc/bgpq3-0.1.33
+++ b/metadata/md5-cache/net-misc/bgpq3-0.1.33
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Generate access-lists for Cisco/Juniper routers, successor of bgpq
 EAPI=6
 HOMEPAGE=https://github.com/snar/bgpq3/
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/snar/bgpq3/archive/v0.1.33.tar.gz -> bgpq3-0.1.33.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_=c6e78f896c969f95b12a89d4f8c79a06
+_md5_=058b7914e21a016725549e01361d19f0
diff --git a/metadata/md5-cache/net-misc/bgpq3-0.1.35 b/metadata/md5-cache/net-misc/bgpq3-0.1.35
index db33340a3010..59c9280ea725 100644
--- a/metadata/md5-cache/net-misc/bgpq3-0.1.35
+++ b/metadata/md5-cache/net-misc/bgpq3-0.1.35
@@ -3,10 +3,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Generate access-lists for Cisco/Juniper routers, successor of bgpq
 EAPI=7
 HOMEPAGE=https://github.com/snar/bgpq3/
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/snar/bgpq3/archive/v0.1.35.tar.gz -> bgpq3-0.1.35.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=74f7a5aab4364882ae21e5e91fa41d01
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=82f194884c3afe6fe6c04ee2b55be834
diff --git a/metadata/md5-cache/net-misc/cfengine-3.6.2 b/metadata/md5-cache/net-misc/cfengine-3.6.2
index a576f52e890e..c343bad32161 100644
--- a/metadata/md5-cache/net-misc/cfengine-3.6.2
+++ b/metadata/md5-cache/net-misc/cfengine-3.6.2
@@ -3,7 +3,7 @@ DEPEND=acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgres
 DESCRIPTION=An automated suite of programs for configuring and maintaining Unix-like computers
 EAPI=5
 HOMEPAGE=http://www.cfengine.org/
-INHERIT=eutils autotools flag-o-matic
+INHERIT=autotools epatch
 IUSE=acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,6 +11,6 @@ PDEPEND=vim-syntax? ( app-vim/cfengine-syntax )
 RDEPEND=acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) selinux? ( sys-libs/libselinux ) tokyocabinet? ( dev-db/tokyocabinet ) qdbm? ( dev-db/qdbm ) libvirt? ( app-emulation/libvirt ) xml? ( dev-libs/libxml2:2 ) dev-libs/openssl dev-libs/libpcre net-libs/libnsl
 REQUIRED_USE=^^ ( qdbm tokyocabinet )
 SLOT=3
-SRC_URI=http://cfengine.package-repos.s3.amazonaws.com/tarballs/cfengine-3.6.2.tar.gz -> cfengine-3.6.2.tar.gz masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-3.6.2.tar.gz -> cfengine-masterfiles-3.6.2.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=350c9d0dc3f19eff5bf7192830b2a57e
+SRC_URI=http://cfengine.package-repos.s3.amazonaws.com/tarballs/cfengine-3.6.2.tar.gz masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-3.6.2.tar.gz -> cfengine-masterfiles-3.6.2.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_=5dc06845f9c60d4d24c2e314b08d763d
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.03.03 b/metadata/md5-cache/net-misc/clusterssh-4.03.03
index 2f74d0864cdd..09d362dde0c9 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.03.03
+++ b/metadata/md5-cache/net-misc/clusterssh-4.03.03
@@ -3,7 +3,7 @@ DEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Tes
 DESCRIPTION=Concurrent Multi-Server Terminal Access
 EAPI=5
 HOMEPAGE=https://github.com/duncs/clusterssh
-INHERIT=eutils perl-module versionator
+INHERIT=perl-module
 IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Te
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.01_05.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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=87d6e1e9b0e68258ecaa302c8da55906
+_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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=bd2f858b35e5b4679a137b3870121cd0
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.30.600 b/metadata/md5-cache/net-misc/clusterssh-4.30.600
index 124e59efdf2d..1baa9fb6d21a 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.30.600
+++ b/metadata/md5-cache/net-misc/clusterssh-4.30.600
@@ -3,7 +3,7 @@ DEPEND=dev-perl/Config-Simple dev-perl/Exception-Class dev-perl/Tk dev-perl/Read
 DESCRIPTION=Concurrent Multi-Server Terminal Access
 EAPI=5
 HOMEPAGE=https://github.com/duncs/clusterssh
-INHERIT=eutils perl-module
+INHERIT=perl-module
 IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.03_06.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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=ecec2ec5d220c26856d100fc90f12ca0
+_md5_=766e92d0f523cd048124e812ff479c5d
diff --git a/metadata/md5-cache/net-misc/curl-7.74.0-r2 b/metadata/md5-cache/net-misc/curl-7.74.0-r2
index d071a9fa5994..4e824f3922c9 100644
--- a/metadata/md5-cache/net-misc/curl-7.74.0-r2
+++ b/metadata/md5-cache/net-misc/curl-7.74.0-r2
@@ -4,7 +4,7 @@ DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
-INHERIT=autotools eutils prefix multilib-minimal
+INHERIT=autotools prefix multilib-minimal
 IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
@@ -13,5 +13,5 @@ REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.74.0.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=d189ae3d8866aa41adbb11bb4cd207ed
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=e391f8dd89078c0f67767d1c1bb5556a
diff --git a/metadata/md5-cache/net-misc/curl-7.74.0-r4 b/metadata/md5-cache/net-misc/curl-7.74.0-r4
index c9e5824114eb..a7da1e5701f3 100644
--- a/metadata/md5-cache/net-misc/curl-7.74.0-r4
+++ b/metadata/md5-cache/net-misc/curl-7.74.0-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.74.0.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=e6b6e15df00cf191bdfe8a2259516632
+_md5_=e8bf64afb0c8c0bbc90c038d661c87a9
diff --git a/metadata/md5-cache/net-misc/curl-7.75.0 b/metadata/md5-cache/net-misc/curl-7.75.0
index 1f71fdc2b315..7a2a03b0705c 100644
--- a/metadata/md5-cache/net-misc/curl-7.75.0
+++ b/metadata/md5-cache/net-misc/curl-7.75.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.75.0.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=d85b182a780844120df3ad10f532d9ad
+_md5_=b31f6192126aaef419eb376f78a39c0d
diff --git a/metadata/md5-cache/net-misc/curl-7.76.0 b/metadata/md5-cache/net-misc/curl-7.76.0
index 72ec6067ee24..1f989fbeeb57 100644
--- a/metadata/md5-cache/net-misc/curl-7.76.0
+++ b/metadata/md5-cache/net-misc/curl-7.76.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.76.0.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=697be1fe58396f7767f11044659ea5ab
+_md5_=c580d4178120c13a11a53c9b086b77bc
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.3.0 b/metadata/md5-cache/net-misc/geoipupdate-4.3.0
index 285fc77b6b75..43e5541d70d2 100644
--- a/metadata/md5-cache/net-misc/geoipupdate-4.3.0
+++ b/metadata/md5-cache/net-misc/geoipupdate-4.3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
 EAPI=7
 HOMEPAGE=https://github.com/maxmind/geoipupdate
+INHERIT=go-module
 KEYWORDS=amd64 arm ppc64 x86
 LICENSE=ISC BSD BSD-2 MIT Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.3.0.tar.gz -> geoipupdate-4.3.0.tar.gz mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/maxmind/geoipupdate/@v/v4.0.2+incompatible.zip -> github.com%2Fmaxmind%2Fgeoipupdate%2F@v%2Fv4.0.2+incompatible.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	go-module	92660621959e7fab813173772987588b	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e61093fb562db6871bfcf7f5aa00d27
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=c9c6bd4c0f60668bde68fa9857e91394
diff --git a/metadata/md5-cache/net-misc/gvrpcd-1.3 b/metadata/md5-cache/net-misc/gvrpcd-1.3
index 362eff400373..198d25ecfb41 100644
--- a/metadata/md5-cache/net-misc/gvrpcd-1.3
+++ b/metadata/md5-cache/net-misc/gvrpcd-1.3
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile install prepare setup
+DEFINED_PHASES=compile install setup
 DEPEND=net-libs/libnet:1.1
 DESCRIPTION=A program for announcing VLANs using GVRP
 EAPI=6
 HOMEPAGE=http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/
-INHERIT=eutils linux-info toolchain-funcs
+INHERIT=linux-info toolchain-funcs
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1
 SLOT=0
 SRC_URI=http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/gvrpcd-1.3.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=5796278468f1520930dc03211b8c7778
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=24335f947d51738af10406a20865013d
diff --git a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7 b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
index 78262153d498..06b8b67f9356 100644
--- a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
+++ b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
@@ -3,12 +3,12 @@ DEPEND=sys-apps/iproute2
 DESCRIPTION=Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2
 EAPI=5
 HOMEPAGE=https://www.sourceforge.net/projects/htbinit/
-INHERIT=eutils linux-info
+INHERIT=epatch linux-info
 IUSE=ipv6 esfq kernel_linux
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://sourceforge/htbinit/htb.init-v0.8.5
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=8ab7a25202011054447abb750311b008
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=2fea25ffa21bbfcbf63debda83f5e147
diff --git a/metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1 b/metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1
index e70fb9d0f6fc..c808718c2555 100644
--- a/metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1
+++ b/metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/tiff:= sys-process/procps
 DESCRIPTION=Software modem that uses an IAX channel instead of a traditional phone line
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/iaxmodem/
-INHERIT=eutils toolchain-funcs multilib
+INHERIT=toolchain-funcs multilib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/tiff:= sys-process/procps
 SLOT=0
 SRC_URI=mirror://sourceforge/iaxmodem/iaxmodem-1.3.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
-_md5_=7aed1421d9b88785f461b4d76ca6e9c3
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=df21fb73f277e61d271a2e3102c62797
diff --git a/metadata/md5-cache/net-misc/ices-2.0.2 b/metadata/md5-cache/net-misc/ices-2.0.2
index 59ff05ceef9d..3b8136fe288d 100644
--- a/metadata/md5-cache/net-misc/ices-2.0.2
+++ b/metadata/md5-cache/net-misc/ices-2.0.2
@@ -3,11 +3,11 @@ DEPEND=dev-libs/libxml2 >=media-libs/libshout-2 >=media-libs/libvorbis-1 virtual
 DESCRIPTION=Icecast OGG streaming client, supports on the fly re-encoding
 EAPI=5
 HOMEPAGE=http://www.icecast.org/ices.php
-INHERIT=eutils user
+INHERIT=user
 KEYWORDS=~alpha amd64 ~arm ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=media-libs/libshout-2 >=media-libs/libvorbis-1
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ices/ices-2.0.2.tar.bz2
-_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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=2b0117a2c3924d41ade68cbb0135ed1b
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=d86b6ebe46103cdb7410d0390d61b041
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.0.1 b/metadata/md5-cache/net-misc/kafka-bin-2.0.1
index 81042993977f..12c813a70ae9 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.0.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.0.1
@@ -3,7 +3,7 @@ DEPEND=virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=http://kafka.apache.org/
-INHERIT=eutils user
+INHERIT=user
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.0.1/kafka_2.12-2.0.1.tgz
-_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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=99ede0339b6a3cd0befc8ea54b042ee8
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=8a909d62c1aa132f25c73b5659747478
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.1.1 b/metadata/md5-cache/net-misc/kafka-bin-2.1.1
index 1ea20e5708dc..593428710928 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.1.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.1.1
@@ -3,7 +3,7 @@ DEPEND=virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=http://kafka.apache.org/
-INHERIT=eutils user
+INHERIT=user
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.1.1/kafka_2.12-2.1.1.tgz
-_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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=99ede0339b6a3cd0befc8ea54b042ee8
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=8a909d62c1aa132f25c73b5659747478
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.2.1 b/metadata/md5-cache/net-misc/kafka-bin-2.2.1
index c709e12be699..968fc4e399e3 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.2.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.2.1
@@ -3,7 +3,7 @@ DEPEND=virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=http://kafka.apache.org/
-INHERIT=eutils user
+INHERIT=user
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.2.1/kafka_2.12-2.2.1.tgz
-_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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=99ede0339b6a3cd0befc8ea54b042ee8
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=8a909d62c1aa132f25c73b5659747478
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.3.0 b/metadata/md5-cache/net-misc/kafka-bin-2.3.0
index 304d9caf16e8..30d6a2173120 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.3.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.3.0
@@ -3,7 +3,7 @@ DEPEND=virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=http://kafka.apache.org/
-INHERIT=eutils user
+INHERIT=user
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.3.0/kafka_2.12-2.3.0.tgz
-_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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=99ede0339b6a3cd0befc8ea54b042ee8
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=8a909d62c1aa132f25c73b5659747478
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.4.0 b/metadata/md5-cache/net-misc/kafka-bin-2.4.0
index a82422514317..d1daaac01ff4 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.4.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.4.0
@@ -3,7 +3,6 @@ DEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=https://kafka.apache.org/
-INHERIT=eutils
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +10,4 @@ RDEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.4.0/kafka_2.12-2.4.0.tgz
-_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
-_md5_=4b33eec884ac42038d336ff0d8c2f5ae
+_md5_=7e9ec37fd9a6e00c70fd99a011cd48d9
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.4.1 b/metadata/md5-cache/net-misc/kafka-bin-2.4.1
index 9fc6bbb66364..b2a4f12fa949 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.4.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.4.1
@@ -3,7 +3,6 @@ DEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=https://kafka.apache.org/
-INHERIT=eutils
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +10,4 @@ RDEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.4.1/kafka_2.12-2.4.1.tgz
-_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
-_md5_=3219231a419f32b8f43d5d12cf0cae19
+_md5_=7e9ec37fd9a6e00c70fd99a011cd48d9
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.5.0 b/metadata/md5-cache/net-misc/kafka-bin-2.5.0
index 5cdc84e91ec8..a2b2831b2daa 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.5.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.5.0
@@ -3,7 +3,6 @@ DEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=https://kafka.apache.org/
-INHERIT=eutils
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +10,4 @@ RDEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.5.0/kafka_2.12-2.5.0.tgz
-_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
-_md5_=3219231a419f32b8f43d5d12cf0cae19
+_md5_=7e9ec37fd9a6e00c70fd99a011cd48d9
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.5.1 b/metadata/md5-cache/net-misc/kafka-bin-2.5.1
index 9becc6c56f90..82b19f3cedc4 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.5.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.5.1
@@ -3,7 +3,6 @@ DEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 DESCRIPTION=A high-throughput distributed messaging system
 EAPI=6
 HOMEPAGE=https://kafka.apache.org/
-INHERIT=eutils
 IUSE=internal-zookeeper
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +10,4 @@ RDEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.5.1/kafka_2.12-2.5.1.tgz
-_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
-_md5_=3219231a419f32b8f43d5d12cf0cae19
+_md5_=7e9ec37fd9a6e00c70fd99a011cd48d9
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.6.0 b/metadata/md5-cache/net-misc/kafka-bin-2.6.0
index a9fbdc5f473d..644f1e1bdbf8 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.6.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.6.0
@@ -10,5 +10,4 @@ RDEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.6.0/kafka_2.13-2.6.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b6e3db44d7bbc6d308972babc2159e1b
+_md5_=68928eef73e841e8c74e17764c850a9c
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.6.1 b/metadata/md5-cache/net-misc/kafka-bin-2.6.1
index 28e2682dd29b..6b45d151b1bc 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.6.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.6.1
@@ -10,5 +10,4 @@ RDEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.6.1/kafka_2.13-2.6.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ecd3634755d9c5b4f5afc83027fc30f6
+_md5_=5a540e03efde8732804d25cc11fb4d4a
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.7.0 b/metadata/md5-cache/net-misc/kafka-bin-2.7.0
index 66be2952753d..6bf19213e3e3 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.7.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.7.0
@@ -10,5 +10,4 @@ RDEPEND=acct-group/kafka acct-user/kafka virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.7.0/kafka_2.13-2.7.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ecd3634755d9c5b4f5afc83027fc30f6
+_md5_=5a540e03efde8732804d25cc11fb4d4a
diff --git a/metadata/md5-cache/net-misc/l7-protocols-2009.05.28-r1 b/metadata/md5-cache/net-misc/l7-protocols-2009.05.28-r1
index 95a7894652fc..2dc9fd7a1090 100644
--- a/metadata/md5-cache/net-misc/l7-protocols-2009.05.28-r1
+++ b/metadata/md5-cache/net-misc/l7-protocols-2009.05.28-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Protocol definitions of l7-filter kernel modules
 EAPI=7
 HOMEPAGE=http://l7-filter.sourceforge.net/protocols https://l7-filter.clearos.com/docs/start
-INHERIT=eutils fixheadtails toolchain-funcs
+INHERIT=fixheadtails toolchain-funcs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/l7-filter/l7-protocols-2009-05-28.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=e5be709b7a9838b1e28280fc44555983
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=18afec10687fe7c17cc28065ce818674
diff --git a/metadata/md5-cache/net-misc/lanmap-81-r2 b/metadata/md5-cache/net-misc/lanmap-81-r2
index a612ae1dacc5..1ed7294bc1af 100644
--- a/metadata/md5-cache/net-misc/lanmap-81-r2
+++ b/metadata/md5-cache/net-misc/lanmap-81-r2
@@ -3,11 +3,11 @@ DEPEND=net-libs/libpcap app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-pat
 DESCRIPTION=lanmap sits quietly on a network and builds a picture of what it sees
 EAPI=5
 HOMEPAGE=http://www.parseerror.com/lanmap
-INHERIT=autotools eutils toolchain-funcs
+INHERIT=autotools epatch toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap media-gfx/graphviz
 SLOT=0
 SRC_URI=http://www.parseerror.com/lanmap/rev/lanmap-2006-03-07-rev81.zip
 _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_=6c828cd3c215538e9b480159d92e5bfe
+_md5_=6303955d404ba325f435e056ac347452
diff --git a/metadata/md5-cache/net-misc/megatools-1.10.3 b/metadata/md5-cache/net-misc/megatools-1.10.3
index 9e20c9de5ffc..715f10a9d011 100644
--- a/metadata/md5-cache/net-misc/megatools-1.10.3
+++ b/metadata/md5-cache/net-misc/megatools-1.10.3
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-text/asciidoc virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-misc/curl virtual/pkgconfig app-text/asciidoc
+DEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-libs/glib-networking[ssl] net-misc/curl
 DESCRIPTION=Command line tools and C library for accessing Mega cloud storage
 EAPI=7
 HOMEPAGE=https://megatools.megous.com
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-misc/curl net-libs/glib-networking[ssl]
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-libs/glib-networking[ssl] net-misc/curl
 SLOT=0
 SRC_URI=https://megatools.megous.com/builds/megatools-1.10.3.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=a9847277641332d0dca50de0bedc3275
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=2c7e3a7ea853ccf8e24bf1228bdbe75e
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.9 b/metadata/md5-cache/net-misc/memcached-1.6.9
index 958e964e1599..23b968584f7a 100644
--- a/metadata/md5-cache/net-misc/memcached-1.6.9
+++ b/metadata/md5-cache/net-misc/memcached-1.6.9
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) sec
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=7
 HOMEPAGE=http://memcached.org/
-INHERIT=autotools eutils flag-o-matic systemd
+INHERIT=autotools flag-o-matic systemd
 IUSE=debug sasl seccomp selinux slabs-reassign test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.6.9.tar.gz https://www.memcached.org/files/old/memcached-1.6.9.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=bded2608891bd00946edfbbe15643f05
+_md5_=f4250d35048148601f3692ddf3053bc4
diff --git a/metadata/md5-cache/net-misc/mikutter-4.0.6 b/metadata/md5-cache/net-misc/mikutter-4.0.6
index 307ca5f69b6c..2a3c3edfbde1 100644
--- a/metadata/md5-cache/net-misc/mikutter-4.0.6
+++ b/metadata/md5-cache/net-misc/mikutter-4.0.6
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Simple, powerful and moeful twitter client
 EAPI=7
 HOMEPAGE=https://mikutter.hachune.net/
-INHERIT=eutils desktop ruby-ng
+INHERIT=desktop ruby-ng
 IUSE=+libnotify test ruby_targets_ruby25 ruby_targets_ruby26
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.0.6.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd
-_md5_=ebe1867bf473b7bd154eeb805bc34bb6
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd
+_md5_=8fa2bac2d592f3f40bd2c5082386aa00
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index b7011f191858..043b018ac26d 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Simple, powerful and moeful twitter client
 EAPI=7
 HOMEPAGE=https://mikutter.hachune.net/
-INHERIT=eutils desktop ruby-ng git-r3
+INHERIT=desktop ruby-ng git-r3
 IUSE=+libnotify test ruby_targets_ruby25 ruby_targets_ruby26
 LICENSE=MIT
 PROPERTIES=live
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=ebe1867bf473b7bd154eeb805bc34bb6
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=8fa2bac2d592f3f40bd2c5082386aa00
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2 b/metadata/md5-cache/net-misc/mosh-1.3.2
index a4be6f3698aa..1ed8894a3b1c 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.2
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2
@@ -3,7 +3,7 @@ DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/p
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
-INHERIT=autotools bash-completion-r1 eutils
+INHERIT=autotools bash-completion-r1
 IUSE=+client examples libressl +mosh-hardening +server ufw +utempter
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.2.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	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
-_md5_=c2f540629776de2c6029eb8742295edc
+_md5_=00436b1eebd3d8aaf63f5637054d4248
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index 9b12cb7d46cf..3fa24a072d32 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -3,7 +3,7 @@ DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/p
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
-INHERIT=autotools bash-completion-r1 eutils git-r3
+INHERIT=autotools bash-completion-r1 git-r3
 IUSE=+client examples libressl +mosh-hardening +server ufw +utempter
 LICENSE=GPL-3
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/
 REQUIRED_USE=|| ( client server ) examples? ( client )
 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	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=260b6250b52e5a68cb02e1420a54e75c
+_md5_=2237843ff59c18885f1d95af1e902688
diff --git a/metadata/md5-cache/net-misc/ndisc6-1.0.3 b/metadata/md5-cache/net-misc/ndisc6-1.0.3
index 544e7398e118..a1d95d2ccedc 100644
--- a/metadata/md5-cache/net-misc/ndisc6-1.0.3
+++ b/metadata/md5-cache/net-misc/ndisc6-1.0.3
@@ -8,4 +8,4 @@ KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.remlab.net/files/ndisc6/ndisc6-1.0.3.tar.bz2
-_md5_=9f091111e05d225a00d83b59c6faf210
+_md5_=5f3fa665cd7e946ed6be50b3f471e568
diff --git a/metadata/md5-cache/net-misc/netkit-routed-0.17-r5 b/metadata/md5-cache/net-misc/netkit-routed-0.17-r5
index 63c2b8c78a32..d983da840a98 100644
--- a/metadata/md5-cache/net-misc/netkit-routed-0.17-r5
+++ b/metadata/md5-cache/net-misc/netkit-routed-0.17-r5
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Netkit - routed
 EAPI=5
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~mips ppc sparc x86
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/n/netkit-routed/netkit-routed_0.17.orig.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
-_md5_=22bf39adf40e4a80e2970383134db824
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8fd1deeb9302f5a85ddac1ccfddc71b1
diff --git a/metadata/md5-cache/net-misc/netkit-talk-0.17-r5 b/metadata/md5-cache/net-misc/netkit-talk-0.17-r5
index 9a5ab34d44e3..bf1b3396182a 100644
--- a/metadata/md5-cache/net-misc/netkit-talk-0.17-r5
+++ b/metadata/md5-cache/net-misc/netkit-talk-0.17-r5
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/ncurses-5.2 virtual/pkgconfig
 DESCRIPTION=Netkit - talkd
 EAPI=5
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 IUSE=ipv6
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2 virtual/inetd
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ntalk-0.17.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
-_md5_=9d400482ae07c2a28eb0d118414f4bf0
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a5bcecebd1ce4abf51296f9c93054ada
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.9 b/metadata/md5-cache/net-misc/ntpsec-1.1.9
index ea4aa139095c..9bade4967712 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.9
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.9
@@ -3,7 +3,7 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targ
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=6
 HOMEPAGE=https://www.ntpsec.org/
-INHERIT=flag-o-matic python-r1 waf-utils systemd
+INHERIT=epatch flag-o-matic python-r1 waf-utils systemd
 IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm arm64 ~x86
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) nist? ( rc
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.9.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	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=ba64d5a81e065a727c8c0beaff40f9cf
+_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	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=a898d2ee43c14601bd030f4e5f9deab3
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.0-r1 b/metadata/md5-cache/net-misc/ntpsec-1.2.0-r1
index abbe15b96823..a600b9987aaf 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.0-r1
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.0-r1
@@ -3,7 +3,7 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targ
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=6
 HOMEPAGE=https://www.ntpsec.org/
-INHERIT=distutils-r1 flag-o-matic waf-utils systemd
+INHERIT=epatch distutils-r1 flag-o-matic waf-utils systemd
 IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	waf-utils	941688efbf28e7ea7a106e516fc9bc91	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=4c02a8e85275fd7aa80918773cad4bd4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	waf-utils	941688efbf28e7ea7a106e516fc9bc91	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=7255e2ea18c5848d41d6bdfe470a34c8
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index 50b19b18e8d0..c94a51eed1f9 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -3,12 +3,12 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targ
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=6
 HOMEPAGE=https://www.ntpsec.org/
-INHERIT=flag-o-matic python-r1 waf-utils systemd git-r3
+INHERIT=epatch flag-o-matic python-r1 waf-utils systemd git-r3
 IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests python_targets_python3_7 python_targets_python3_8
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
 PROPERTIES=live
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-libs/libcap dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) nist? ( rclock_local )
 SLOT=0
-_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	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=f1b9550fab3410223f781bec0c7185c6
+_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	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=58257f7dd6a54b3c97f2a676c9cc6643
diff --git a/metadata/md5-cache/net-misc/ofono-1.31 b/metadata/md5-cache/net-misc/ofono-1.31
index 5f3e7218cd05..eedf86aecba1 100644
--- a/metadata/md5-cache/net-misc/ofono-1.31
+++ b/metadata/md5-cache/net-misc/ofono-1.31
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=>=sys-apps/dbus-1.4 >=dev-libs/glib-2.32 net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/bluez-4.99 ) udev? ( virtual/udev ) examples? ( dev-python/dbus-python ) tools? ( virtual/libusb:1 ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.4 >=dev-libs/glib-2.32 net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/bluez-4.99 ) udev? ( virtual/udev ) examples? ( dev-python/dbus-python ) tools? ( virtual/libusb:1 )
 DESCRIPTION=Open Source mobile telephony (GSM/UMTS) daemon
 EAPI=7
 HOMEPAGE=https://01.org/ofono
-INHERIT=eutils multilib systemd
+INHERIT=systemd
 IUSE=+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/dbus-1.4 >=dev-libs/glib-2.32 net-misc/mobile-broadband-provi
 REQUIRED_USE=dundee? ( bluetooth )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/ofono/ofono-1.31.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=0a200937115f53cd22d03082c32c65fd
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=f1545d9c794093218cda99783f3cff35
diff --git a/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1 b/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
index 2620f24576ac..c022c3b9340f 100644
--- a/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
+++ b/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
@@ -4,7 +4,7 @@ DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/li
 DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
 EAPI=7
 HOMEPAGE=https://github.com/indigo-dc/oidc-agent
-INHERIT=flag-o-matic xdg-utils
+INHERIT=xdg-utils
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -12,5 +12,5 @@ RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v3.3.5.tar.gz -> oidc-agent-3.3.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d853e6500d872d75c7918d43d2aebe3
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15a23e0b3a66edbfa844b54c993cad98
diff --git a/metadata/md5-cache/net-misc/oidc-agent-4.0.2 b/metadata/md5-cache/net-misc/oidc-agent-4.0.2
index 41943563b3e3..60a7bbeb8eb8 100644
--- a/metadata/md5-cache/net-misc/oidc-agent-4.0.2
+++ b/metadata/md5-cache/net-misc/oidc-agent-4.0.2
@@ -4,7 +4,7 @@ DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/li
 DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
 EAPI=7
 HOMEPAGE=https://github.com/indigo-dc/oidc-agent
-INHERIT=flag-o-matic xdg-utils
+INHERIT=xdg-utils
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -12,5 +12,5 @@ RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v4.0.2.tar.gz -> oidc-agent-4.0.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a07a52d61eedab53c34113eb19c9052
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40f68258df61ec450393adfd6f22df81
diff --git a/metadata/md5-cache/net-misc/olsrd-0.9.6.1 b/metadata/md5-cache/net-misc/olsrd-0.9.6.1
index bb3d9f45aa61..fc832b3dfe86 100644
--- a/metadata/md5-cache/net-misc/olsrd-0.9.6.1
+++ b/metadata/md5-cache/net-misc/olsrd-0.9.6.1
@@ -3,12 +3,12 @@ DEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/g
 DESCRIPTION=An implementation of the Optimized Link State Routing protocol
 EAPI=6
 HOMEPAGE=http://www.olsr.org/
-INHERIT=eutils multilib toolchain-funcs versionator
+INHERIT=toolchain-funcs versionator
 IUSE=gtk pud
 KEYWORDS=amd64 x86
 LICENSE=BSD LGPL-2.1
 RDEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 SLOT=0
 SRC_URI=http://www.olsr.org/releases/0.9/olsrd-0.9.6.1.tar.bz2
-_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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=39cecf0be12a8afb3c5708632ff1f778
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=d6fd237c7867a3e9c71f6f7ce42173d0
diff --git a/metadata/md5-cache/net-misc/olsrd-0.9.8 b/metadata/md5-cache/net-misc/olsrd-0.9.8
index 44cec72d624b..21e596ef2d7b 100644
--- a/metadata/md5-cache/net-misc/olsrd-0.9.8
+++ b/metadata/md5-cache/net-misc/olsrd-0.9.8
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 DESCRIPTION=An implementation of the Optimized Link State Routing protocol
 EAPI=7
 HOMEPAGE=http://www.olsr.org/
-INHERIT=multilib toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=gtk pud
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD LGPL-2.1
-RDEPEND=virtual/pkgconfig gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 SLOT=0
 SRC_URI=https://github.com/OLSR/olsrd/archive/v0.9.8.tar.gz -> olsrd-0.9.8.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ab330fa6bc6ce2f96446206ee0184750
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=81a70b7dea53280d10527c087415e70d
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.14.1 b/metadata/md5-cache/net-misc/openvswitch-2.14.1
index a94010eb2678..af08e75ae796 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.14.1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.14.1
@@ -1,10 +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 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/ovs-2.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/twisted[conch,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] debug? ( dev-lang/perl ) sys-apps/util-linux[caps] virtual/pkgconfig kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/ovs-2.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/twisted[conch,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] debug? ( dev-lang/perl ) sys-apps/util-linux[caps] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Production quality, multilayer virtual switch
 EAPI=7
 HOMEPAGE=https://www.openvswitch.org
-INHERIT=autotools eutils linux-info linux-mod python-r1 systemd tmpfiles
+INHERIT=autotools linux-info linux-mod python-r1 systemd tmpfiles
 IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux dist-kernel python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0 GPL-2
@@ -12,5 +12,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_7? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.14.1.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=d0dfbfdc253a951fa69611fdb059e221
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=419f6bbe15e36e4212355ac0129dd897
diff --git a/metadata/md5-cache/net-misc/portfwd-0.29-r1 b/metadata/md5-cache/net-misc/portfwd-0.29-r1
index a63169d9eaaa..b6a3b9d1d11b 100644
--- a/metadata/md5-cache/net-misc/portfwd-0.29-r1
+++ b/metadata/md5-cache/net-misc/portfwd-0.29-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Port Forwarding Daemon
 EAPI=6
 HOMEPAGE=http://portfwd.sourceforge.net
-INHERIT=autotools eutils systemd
+INHERIT=autotools systemd
 KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/portfwd/portfwd-0.29.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	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=fc51cc05ff86d3b8f013c25e1b5da48f
+_md5_=760582204306ef1a49295f7dcc963d72
diff --git a/metadata/md5-cache/net-misc/proxychains-4.12-r1 b/metadata/md5-cache/net-misc/proxychains-4.12-r1
index 2a90fc81520e..fe42f599bdea 100644
--- a/metadata/md5-cache/net-misc/proxychains-4.12-r1
+++ b/metadata/md5-cache/net-misc/proxychains-4.12-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=force any tcp connections to flow through a proxy (or proxy chain)
 EAPI=6
 HOMEPAGE=https://github.com/rofl0r/proxychains-ng/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/rofl0r/proxychains-ng/releases/download/v4.12/proxychains-ng-4.12.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=38438cf810409f6a439cdeaea9e7e08c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3bce5f64a6f4cff0eaa1b812174acb8a
diff --git a/metadata/md5-cache/net-misc/ps3mediaserver-1.90.1 b/metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
index a6148d2e8c34..faead945c5dd 100644
--- a/metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
+++ b/metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=DLNA compliant UPNP server for streaming media to Playstation 3
 EAPI=5
 HOMEPAGE=https://github.com/ps3mediaserver/ps3mediaserver
-INHERIT=eutils xdg
+INHERIT=desktop xdg
 IUSE=multiuser +transcode tsmuxer
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6.0 media-libs/libmediainfo media-libs/libzen tsmuxer? ( media-video/tsmuxer ) transcode? ( media-video/mplayer[encode] )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/ps3mediaserver/pms-1.90.1-generic-linux-unix.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=62282952928ea015bf97c50bd3ba88e2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=6735ee46d5ca27677e650b1fb1cb09e5
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4
index 214f7e3645d8..9b8707464214 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4
@@ -4,7 +4,7 @@ DEPEND=acct-group/quagga acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( net
 DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=7
 HOMEPAGE=https://www.quagga.net/
-INHERIT=autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles
+INHERIT=autotools flag-o-matic pam readme.gentoo-r1 systemd tmpfiles
 IUSE=bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test
 KEYWORDS=~alpha amd64 arm ~hppa ppc ~s390 sparc x86
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=ed19d461358b19c20d4f9bba7a371a4b
+_md5_=d3f47dc07ec4d8dbccdca87d72f8a93d
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r1 b/metadata/md5-cache/net-misc/radvd-2.17-r1
index 31e11ffc4628..2b17dcd04dbd 100644
--- a/metadata/md5-cache/net-misc/radvd-2.17-r1
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex virtual/pkgconfig test?
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=6
 HOMEPAGE=http://v6web.litech.org/radvd/
-INHERIT=systemd user eutils readme.gentoo-r1
+INHERIT=systemd user readme.gentoo-r1
 IUSE=kernel_FreeBSD selinux test
 KEYWORDS=amd64 arm ~arm64 ~hppa ppc sparc x86
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=25d6507ac2ee6b1e04761ba44482ab60
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=0cca0d8c387647ea097a4c9168c4fcdd
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r2 b/metadata/md5-cache/net-misc/radvd-2.17-r2
index be868c9221a9..1eac76c39f2a 100644
--- a/metadata/md5-cache/net-misc/radvd-2.17-r2
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r2
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex virtual/pkgconfig test?
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=6
 HOMEPAGE=http://v6web.litech.org/radvd/
-INHERIT=systemd user eutils readme.gentoo-r1
+INHERIT=systemd user readme.gentoo-r1
 IUSE=kernel_FreeBSD selinux test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=ba33cd42e6ef4c221b41d86b16e7088e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=c805ecf61c7d74ee2be0fae59c5887a0
diff --git a/metadata/md5-cache/net-misc/radvd-2.18 b/metadata/md5-cache/net-misc/radvd-2.18
index 4d457fcd6650..1e7285b8a1ed 100644
--- a/metadata/md5-cache/net-misc/radvd-2.18
+++ b/metadata/md5-cache/net-misc/radvd-2.18
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex virtual/pkgconfig test?
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=6
 HOMEPAGE=http://v6web.litech.org/radvd/
-INHERIT=systemd user eutils readme.gentoo-r1
+INHERIT=systemd user readme.gentoo-r1
 IUSE=kernel_FreeBSD selinux test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 sparc x86
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.18.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=2072d734bd1c225663280e76e3e9615e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=93db8469217ee565f23d0ca57323bc1f
diff --git a/metadata/md5-cache/net-misc/radvd-2.18-r1 b/metadata/md5-cache/net-misc/radvd-2.18-r1
index 0459f7242584..7e27f3a470b7 100644
--- a/metadata/md5-cache/net-misc/radvd-2.18-r1
+++ b/metadata/md5-cache/net-misc/radvd-2.18-r1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex virtual/pkgconfig test?
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=6
 HOMEPAGE=http://v6web.litech.org/radvd/
-INHERIT=systemd user eutils readme.gentoo-r1 toolchain-funcs
+INHERIT=systemd user readme.gentoo-r1 toolchain-funcs
 IUSE=kernel_FreeBSD selinux test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.18.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=c1030a228e3dd8227a5db9211c7601e1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=b50364a695b61efbddc3eb8d004e2f4e
diff --git a/metadata/md5-cache/net-misc/radvd-2.19 b/metadata/md5-cache/net-misc/radvd-2.19
index 22ffe653985a..cd1abbdcc084 100644
--- a/metadata/md5-cache/net-misc/radvd-2.19
+++ b/metadata/md5-cache/net-misc/radvd-2.19
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex test? ( dev-libs/check
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=7
 HOMEPAGE=http://v6web.litech.org/radvd/
-INHERIT=systemd user eutils readme.gentoo-r1 toolchain-funcs
+INHERIT=systemd user readme.gentoo-r1 toolchain-funcs
 IUSE=kernel_FreeBSD selinux test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.19.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=f967e8fc52769e5e86eaed0bb48f7154
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=6d5e48efeb943b268cd290b3d8ead876
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.6 b/metadata/md5-cache/net-misc/rdesktop-1.8.6
index c89d679ed696..90b0f1a63f2f 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.6
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.6
@@ -4,12 +4,12 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.6/rdesktop-1.8.6.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=2789e41dc434e33ef9061a1734734424
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=f0e9d972d93ef0d2cdd6a86931877f92
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1 b/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
index f67f37a952df..a1736fddcd0a 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
@@ -4,12 +4,12 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.6/rdesktop-1.8.6.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=ea9d798b3ce67f2e92cb84f66de559ae
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=04f84f5b69ee18f9cdaa94e9f1a0313c
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.9.0 b/metadata/md5-cache/net-misc/rdesktop-1.9.0
index 210b25bcf58d..b14612fa3ffe 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.9.0
+++ b/metadata/md5-cache/net-misc/rdesktop-1.9.0
@@ -4,12 +4,12 @@ DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/li
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) ao? ( >=media-libs/libao-0.8.6 media-libs/libsamplerate ) kerberos? ( virtual/krb5 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) oss? ( media-libs/libsamplerate ) pulseaudio? ( media-libs/libsamplerate media-sound/pulseaudio ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=954f41755debe2e3f0a3dd2a42e4215a
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=bc4554da8163c938b9766a893e3d9371
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1 b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
index 54c0237b7742..1d795d8bf91e 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
@@ -4,12 +4,12 @@ DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/li
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) ao? ( >=media-libs/libao-0.8.6 media-libs/libsamplerate ) kerberos? ( virtual/krb5 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) oss? ( media-libs/libsamplerate ) pulseaudio? ( media-libs/libsamplerate media-sound/pulseaudio ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=b3d21c317c4cc916596b93f6e5b8ff7e
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=d634bf2c83d0936fcaf198b47fe5dc0e
diff --git a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6 b/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6
index 6b5dc8dd5e32..4e5703a1ff90 100644
--- a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6
+++ b/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6
@@ -3,10 +3,10 @@ DEPEND=sys-devel/flex virtual/yacc
 DESCRIPTION=ARIN rwhois daemon
 EAPI=6
 HOMEPAGE=http://projects.arin.net/rwhois/
-INHERIT=eutils flag-o-matic user
+INHERIT=flag-o-matic user
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/arineng/rwhoisd/archive/1.5.9.6.tar.gz -> rwhoisd-1.5.9.6.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=61d2bcb15c59ec3b7902fc0bc19385ed
+_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	c0964e43ba712cb933da5f65b958fa88	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=2251ee228c71ae3cde274884e1b6966b
diff --git a/metadata/md5-cache/net-misc/scponly-4.8-r6 b/metadata/md5-cache/net-misc/scponly-4.8-r6
index 0ee5f8d897cc..bebad104a161 100644
--- a/metadata/md5-cache/net-misc/scponly-4.8-r6
+++ b/metadata/md5-cache/net-misc/scponly-4.8-r6
@@ -3,7 +3,7 @@ DEPEND=sys-apps/sed net-misc/openssh quota? ( sys-fs/quota ) rsync? ( net-misc/r
 DESCRIPTION=A tiny pseudoshell which only permits scp and sftp
 EAPI=7
 HOMEPAGE=https://github.com/scponly/scponly
-INHERIT=multilib readme.gentoo-r1 toolchain-funcs user
+INHERIT=readme.gentoo-r1 toolchain-funcs user
 IUSE=+sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=BSD-2
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/sed net-misc/openssh quota? ( sys-fs/quota ) rsync? ( net-misc/
 REQUIRED_USE=|| ( sftp scp winscp rsync unison subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/scponly/scponly-4.8.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=13e15c882b357fa3301414f84600338f
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=ed668ea049d5a012e9bc419c3eaf1cbe
diff --git a/metadata/md5-cache/net-misc/scponly-4.8-r7 b/metadata/md5-cache/net-misc/scponly-4.8-r7
index 99f6466b33ed..5153b7fd45ae 100644
--- a/metadata/md5-cache/net-misc/scponly-4.8-r7
+++ b/metadata/md5-cache/net-misc/scponly-4.8-r7
@@ -3,6 +3,7 @@ DEPEND=sys-apps/sed net-misc/openssh chroot? ( acct-user/scponly acct-group/scpo
 DESCRIPTION=A tiny pseudoshell which only permits scp and sftp
 EAPI=7
 HOMEPAGE=https://github.com/scponly/scponly
+INHERIT=readme.gentoo-r1 toolchain-funcs
 IUSE=chroot +sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=BSD-2
@@ -10,5 +11,5 @@ RDEPEND=sys-apps/sed net-misc/openssh chroot? ( acct-user/scponly acct-group/scp
 REQUIRED_USE=|| ( sftp scp winscp rsync unison subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/scponly/scponly-4.8.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c7d1ade0273fb8e65f8a6e22dcf235a6
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=0bd17097b33d21a8d19fa177c2fbe40b
diff --git a/metadata/md5-cache/net-misc/shmux-1.0.2 b/metadata/md5-cache/net-misc/shmux-1.0.2
index 49b4d697016f..db5c6d9987cd 100644
--- a/metadata/md5-cache/net-misc/shmux-1.0.2
+++ b/metadata/md5-cache/net-misc/shmux-1.0.2
@@ -3,7 +3,7 @@ DEPEND=pcre? ( dev-libs/libpcre ) sys-libs/ncurses virtual/awk sys-devel/gnuconf
 DESCRIPTION=Program for executing the same command on many hosts in parallel
 EAPI=5
 HOMEPAGE=http://web.taranis.org/shmux/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
 IUSE=pcre
 KEYWORDS=amd64 ~ppc x86
 LICENSE=shmux
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://web.taranis.org/shmux/dist/shmux-1.0.2.tgz
 _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_=bc54d20904f88adb2f7c34b88f504144
+_md5_=5337eea8aa15bbd897798ccd0fa00594
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.37-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.37-r2
index a582c8d434ab..0fe9a97b8a5c 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.37-r2
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.37-r2
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=7
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-INHERIT=autotools desktop eutils xdg-utils vala readme.gentoo-r1
+INHERIT=autotools desktop xdg-utils vala readme.gentoo-r1
 IUSE=+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) pulseaudio? ( media-sound/pulseaudio[glib] ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91 ) amd64? ( x11-libs/libva:= ) arm64? ( x11-libs/libva:= ) x86? ( x11-libs/libva:= )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.37.tar.bz2
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	vala	5fab64090cefe75c5df431cefa0b653d	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=83d68796b8511233629dd27435c8c2cb
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=c777d029ed9256e5cdb2b83fb20ba281
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.38 b/metadata/md5-cache/net-misc/spice-gtk-0.38
index 22d9ba3e7c78..fbdcb47b4676 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.38
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.38
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=7
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-INHERIT=desktop eutils meson readme.gentoo-r1 vala xdg-utils
+INHERIT=desktop meson readme.gentoo-r1 vala xdg-utils
 IUSE=+gtk3 +introspection libressl lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) pulseaudio? ( media-plugins/gst-plugins-pulse:1.0 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91 ) amd64? ( x11-libs/libva:= ) arm64? ( x11-libs/libva:= ) x86? ( x11-libs/libva:= )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.38.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2753fa1fa03f26ffa3ffd1836121e93
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7526a54e0088e7ec91a89ff34bfbdfd
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.38-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.38-r1
index 12840b6009cb..23fa20858d65 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.38-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.38-r1
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=7
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-INHERIT=desktop eutils meson python-any-r1 readme.gentoo-r1 vala xdg-utils
+INHERIT=desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils
 IUSE=+gtk3 +introspection libressl lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) pulseaudio? ( media-plugins/gst-plugins-pulse:1.0 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91 ) amd64? ( x11-libs/libva:= ) arm64? ( x11-libs/libva:= ) x86? ( x11-libs/libva:= )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.38.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=380dfefec8e2711f4dbae9930e1d0381
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=acaa3ef54a31f3b78317f54703c3bd81
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.39 b/metadata/md5-cache/net-misc/spice-gtk-0.39
index 99e7f4fec309..cfa6f689ea97 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.39
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.39
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=7
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-INHERIT=desktop eutils meson python-any-r1 readme.gentoo-r1 vala xdg-utils
+INHERIT=desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils
 IUSE=+gtk3 +introspection libressl lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91 ) amd64? ( x11-libs/libva:= ) arm64? ( x11-libs/libva:= ) x86? ( x11-libs/libva:= )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.39.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4aca8473cad8ee6fa2ae1cb1e21905c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08d42c53d7279dfbaa19be0950a703a2
diff --git a/metadata/md5-cache/net-misc/spice-gtk-9999 b/metadata/md5-cache/net-misc/spice-gtk-9999
index 56046a7ad2f2..b3fb6e9d2b86 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-9999
+++ b/metadata/md5-cache/net-misc/spice-gtk-9999
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=7
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-INHERIT=desktop eutils git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils
+INHERIT=desktop git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils
 IUSE=+gtk3 +introspection libressl lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) pulseaudio? ( media-plugins/gst-plugins-pulse:1.0 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91 ) amd64? ( x11-libs/libva:= ) arm64? ( x11-libs/libva:= ) x86? ( x11-libs/libva:= )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0583568b544f684b19d10de5ae118c3c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=45073d428a73e0925d264b5cd71f2866
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1 b/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
index 451f4bab2e28..e76149aa7f3e 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp:= virtual/pk
 DESCRIPTION=A client implementation of Secure Socket Tunneling Protocol (SSTP)
 EAPI=6
 HOMEPAGE=http://sstp-client.sourceforge.net/
-INHERIT=autotools linux-info multilib user
+INHERIT=autotools linux-info user
 IUSE=static kernel_linux
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+-with-openssl-exception
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp:=
 SLOT=0
 SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.10.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=b8e4ffe427d30f3679742850961e91d8
+_md5_=6faa6d6e0d9fd49f566c0a2f5acd87e7
diff --git a/metadata/md5-cache/net-misc/stunnel-5.58 b/metadata/md5-cache/net-misc/stunnel-5.58
index 586c35a70042..b34737f3c592 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.58
+++ b/metadata/md5-cache/net-misc/stunnel-5.58
@@ -4,7 +4,7 @@ DEPEND=dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=7
 HOMEPAGE=https://www.stunnel.org/index.html
-INHERIT=multilib ssl-cert systemd tmpfiles
+INHERIT=ssl-cert systemd tmpfiles
 IUSE=ipv6 selinux stunnel3 tcpd ssl
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=acct-user/stunnel acct-group/stunnel dev-libs/openssl:0= tcpd? ( sys-app
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.58.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.58.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.58.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.58.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.58.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.58.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.58.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ssl-cert	a9ab3ee655f5ee43246ff3999cfedfe6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=412f4c1d4a5f33d69e481956f7b11db4
+_eclasses_=ssl-cert	a9ab3ee655f5ee43246ff3999cfedfe6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=16cf88f4a9f582eac64aca3fc2d170ac
diff --git a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1 b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
index 7fe0dd75360b..2d9d3b837222 100644
--- a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
+++ b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
@@ -3,7 +3,7 @@ DEPEND=sys-libs/ncurses:= !net-misc/netkit-telnetd xinetd? ( sys-apps/xinetd ) v
 DESCRIPTION=Telnet and telnetd ported from OpenBSD with IPv6 support
 EAPI=5
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=autotools epatch toolchain-funcs
 IUSE=nls xinetd
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/telnet-bsd-1.2.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	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_=2e6db56274b369739bb2c3c9f4d49fd4
+_md5_=c9aa73d5a7dc57b0b56c99b78031d207
diff --git a/metadata/md5-cache/net-misc/tipcutils-2.0.3 b/metadata/md5-cache/net-misc/tipcutils-2.0.3
index 68172db8b847..201ddfd7dc7a 100644
--- a/metadata/md5-cache/net-misc/tipcutils-2.0.3
+++ b/metadata/md5-cache/net-misc/tipcutils-2.0.3
@@ -3,10 +3,10 @@ DEPEND=>=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for TIPC (Transparent Inter-Process Communication)
 EAPI=5
 HOMEPAGE=http://tipc.sourceforge.net
-INHERIT=eutils
+INHERIT=epatch
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( BSD-2 GPL-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tipc/tipcutils-2.0.3.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
-_md5_=78d9058e78086990960e7bf96b3b8293
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=20f73c5a1edc1ecc83b91048ca651cba
diff --git a/metadata/md5-cache/net-misc/udpxy-1.0.23.7-r2 b/metadata/md5-cache/net-misc/udpxy-1.0.23.7-r2
index 52b590c375a0..647e98762678 100644
--- a/metadata/md5-cache/net-misc/udpxy-1.0.23.7-r2
+++ b/metadata/md5-cache/net-misc/udpxy-1.0.23.7-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Small daemon to relay multicast UDP traffic to client's TCP (HTTP) connection
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/udpxy/
-INHERIT=eutils systemd toolchain-funcs versionator
+INHERIT=systemd toolchain-funcs versionator
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.udpxy.com/download/1_23/udpxy.1.0.23-7-prod.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	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=bffb889a33b92f9ab5833b3baa95c9e4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=2bcff89323ad3284062b6112231e2b02
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2-r6 b/metadata/md5-cache/net-misc/vde-2.3.2-r6
index 51d41a8321cd..20b9651ecbbf 100644
--- a/metadata/md5-cache/net-misc/vde-2.3.2-r6
+++ b/metadata/md5-cache/net-misc/vde-2.3.2-r6
@@ -3,12 +3,10 @@ DEPEND=pcap? ( net-libs/libpcap ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libr
 DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
 EAPI=6
 HOMEPAGE=https://virtualsquare.org
-INHERIT=flag-o-matic
 IUSE=pcap selinux ssl libressl static-libs
 KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=pcap? ( net-libs/libpcap ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
 SLOT=0
 SRC_URI=mirror://sourceforge/vde/vde2-2.3.2.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	c0964e43ba712cb933da5f65b958fa88
-_md5_=5d1169316c45ab3369a6f6f12191195b
+_md5_=0f9bb3592ffeca39a5084725a9e785ca
diff --git a/metadata/md5-cache/net-misc/vrrpd-1.9 b/metadata/md5-cache/net-misc/vrrpd-1.9
index 48bec6c4caf2..db942577dd05 100644
--- a/metadata/md5-cache/net-misc/vrrpd-1.9
+++ b/metadata/md5-cache/net-misc/vrrpd-1.9
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gcc
 DESCRIPTION=Virtual Router Redundancy Protocol Daemon
 EAPI=5
 HOMEPAGE=http://numsys.eu/vrrp_art.php
-INHERIT=eutils
+INHERIT=epatch
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/fredbcode/Vrrpd/archive/v1.9.tar.gz -> vrrpd-1.9.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
-_md5_=d00dd83b590f09ab80ccefb68a7908bf
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=b029a61d94246c55450ea389a1b34e2e
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.2 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
index 2338b028d886..915de0bafa0d 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.2
@@ -3,7 +3,7 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-util/desktop-file-u
 DESCRIPTION=The X2Go server
 EAPI=6
 HOMEPAGE=http://www.x2go.org
-INHERIT=multilib systemd toolchain-funcs user xdg
+INHERIT=systemd toolchain-funcs user xdg
 IUSE=+fuse postgres +sqlite
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/Fi
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=76e965dfd154aca74c7f4d41ed32b60b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=3572db335e01879b409700ea4ac18282
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
index efd471a63388..e1f60a890f73 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
@@ -4,7 +4,7 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-util/desktop-file-utils x11-misc/shar
 DESCRIPTION=The X2Go server
 EAPI=7
 HOMEPAGE=http://www.x2go.org
-INHERIT=multilib systemd toolchain-funcs user xdg
+INHERIT=systemd toolchain-funcs user xdg
 IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/Fi
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=0945365bd530affae0da4b6c45897484
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=036c3c5b88e49f1e3ef59c5c2ea0cb61
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
index e49524972323..f6ad3a0ed9c1 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
@@ -4,7 +4,7 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-util/desktop-file-utils x11-misc/shar
 DESCRIPTION=The X2Go server
 EAPI=7
 HOMEPAGE=http://www.x2go.org
-INHERIT=multilib systemd toolchain-funcs xdg
+INHERIT=systemd toolchain-funcs xdg
 IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=acct-user/x2gouser acct-user/x2goprint dev-lang/perl:= dev-perl/Capture-
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=9812843ecdf55f65ad814981643b0aa7
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=ff71f3c81b75390accf1064c4d28b216
diff --git a/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1 b/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
index 717712771811..e058611a4d40 100644
--- a/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
+++ b/metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
@@ -4,11 +4,11 @@ DEPEND=app-arch/gzip
 DESCRIPTION=CLI to access Yandex Disk file storage service
 EAPI=7
 HOMEPAGE=https://disk.yandex.ru
-INHERIT=bash-completion-r1 eutils rpm
+INHERIT=bash-completion-r1 rpm
 KEYWORDS=-* amd64 x86
 LICENSE=YDSLA
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=amd64? ( https://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/yandex-disk-0.1.5.1039-1.fedora.x86_64.rpm ) x86? ( https://repo.yandex.ru/yandex-disk/rpm/stable/i386/yandex-disk-0.1.5.1039-1.fedora.i386.rpm )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	estack	055c42df72f76a4f45ec92b35e83cd56	rpm	760ff223c2c4299b68ea901e24c4cabd
-_md5_=3ff547dfa83b0e9a8c158d18288b2330
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	rpm	760ff223c2c4299b68ea901e24c4cabd
+_md5_=872eb498ff497327080e7058863b5c42
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1432 b/metadata/md5-cache/net-misc/you-get-0.4.1432
index 8f13b4b35387..4730e78fcc9e 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1432
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1432
@@ -1,9 +1,9 @@
 BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=utility to download media contents from the web
+DESCRIPTION=Utility to download media contents from the web
 EAPI=7
 HOMEPAGE=http://www.soimort.org/you-get
-INHERIT=eutils distutils-r1
+INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/archive/v0.4.1432.tar.gz -> you-get-0.4.1432.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=200450f5836640cbc0d4413bcdf8de10
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=96ac40b4dcdd607fbd48beb5598c69e2
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1500 b/metadata/md5-cache/net-misc/you-get-0.4.1500
index fe784af23eea..0cd8785d9977 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1500
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1500
@@ -1,9 +1,9 @@
 BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=utility to download media contents from the web
+DESCRIPTION=Utility to download media contents from the web
 EAPI=7
 HOMEPAGE=https://you-get.org
-INHERIT=eutils distutils-r1
+INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1500/you-get-0.4.1500.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=194c2f27f9f8226301cede056cc2eedf
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=b0351101424226711b8b897af1523046
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1520 b/metadata/md5-cache/net-misc/you-get-0.4.1520
index 2a4eba4cbf52..bb76a95b0dab 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1520
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1520
@@ -1,9 +1,9 @@
 BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=utility to download media contents from the web
+DESCRIPTION=Utility to download media contents from the web
 EAPI=7
 HOMEPAGE=https://you-get.org
-INHERIT=eutils distutils-r1
+INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1520/you-get-0.4.1520.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=194c2f27f9f8226301cede056cc2eedf
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=b0351101424226711b8b897af1523046
diff --git a/metadata/md5-cache/net-misc/zssh-1.5c-r1 b/metadata/md5-cache/net-misc/zssh-1.5c-r1
index 9861fcfdbbe0..9c731a4bdadd 100644
--- a/metadata/md5-cache/net-misc/zssh-1.5c-r1
+++ b/metadata/md5-cache/net-misc/zssh-1.5c-r1
@@ -3,12 +3,12 @@ DEPEND=readline? ( sys-libs/ncurses:0 sys-libs/readline:0 )
 DESCRIPTION=An ssh wrapper enabling zmodem up/download in ssh
 EAPI=5
 HOMEPAGE=http://zssh.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 IUSE=nls readline
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) net-misc/openssh net-dialup/lrzsz
 SLOT=0
 SRC_URI=mirror://sourceforge/zssh/zssh-1.5c.tgz
-_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
-_md5_=bc5edd35a49592050984d41ba95c85e8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=336061eeb4e5be57044ad585aa1be174
diff --git a/metadata/md5-cache/net-misc/zsync-0.6.2-r1 b/metadata/md5-cache/net-misc/zsync-0.6.2-r1
index 7e0152b673d7..39abeaf9d2a6 100644
--- a/metadata/md5-cache/net-misc/zsync-0.6.2-r1
+++ b/metadata/md5-cache/net-misc/zsync-0.6.2-r1
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Partial/differential file download client over HTTP which uses the rsync algorithm
 EAPI=5
 HOMEPAGE=http://zsync.moria.org.uk/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=http://zsync.moria.org.uk/download/zsync-0.6.2.tar.bz2 http://www.gzip.org/zlib/zlib-1.2.3.tar.bz2 http://www.zlib.net/zlib-1.2.3.tar.bz2
 _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_=0be0796d5dd11fbf561de541d842a06e
+_md5_=3bb02c1247ca77bc846e7afa5e6e031b
diff --git a/metadata/md5-cache/net-nds/shelldap-1.5.1 b/metadata/md5-cache/net-nds/shelldap-1.5.1
index 176e70d00438..aa5d311b745b 100644
--- a/metadata/md5-cache/net-nds/shelldap-1.5.1
+++ b/metadata/md5-cache/net-nds/shelldap-1.5.1
@@ -4,12 +4,12 @@ DEPEND=dev-lang/perl
 DESCRIPTION=A handy shell-like interface for browsing LDAP servers and editing their content
 EAPI=7
 HOMEPAGE=https://github.com/mahlonsmith/shelldap
-INHERIT=eutils perl-module
+INHERIT=perl-module
 IUSE=+readline sasl +ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-perl/Algorithm-Diff sasl? ( dev-perl/Authen-SASL ) dev-perl/IO-Socket-SSL dev-perl/perl-ldap dev-perl/TermReadKey readline? ( dev-perl/Term-ReadLine-Gnu ) dev-perl/Term-Shell dev-perl/Tie-IxHash dev-perl/YAML-Syck virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Digest-MD5 dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/mahlonsmith/shelldap/releases/download/v1.5.1/shelldap-1.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=6394b1b9d3be0586ff453fda4831effe
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=64dd128797a180e9f77cb7fa04c309d2
diff --git a/metadata/md5-cache/net-nntp/newspost-2.1.1-r3 b/metadata/md5-cache/net-nntp/newspost-2.1.1-r3
index a76bb219a617..e28190a6bc71 100644
--- a/metadata/md5-cache/net-nntp/newspost-2.1.1-r3
+++ b/metadata/md5-cache/net-nntp/newspost-2.1.1-r3
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A usenet binary autoposter for unix
 EAPI=5
 HOMEPAGE=http://newspost.unixcab.org/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://newspost.unixcab.org/download/newspost-2.1.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
-_md5_=0d6476e5029a20b93540b721f8206045
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=affeda3ab4f4dcbdc1e5f13479b752ea
diff --git a/metadata/md5-cache/net-nntp/nzbget-20.0 b/metadata/md5-cache/net-nntp/nzbget-20.0
index bbb89fb67e71..27dfeaf0a4be 100644
--- a/metadata/md5-cache/net-nntp/nzbget-20.0
+++ b/metadata/md5-cache/net-nntp/nzbget-20.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-
 DESCRIPTION=A command-line based binary newsgrabber supporting .nzb files
 EAPI=7
 HOMEPAGE=https://nzbget.net/
-INHERIT=autotools eutils flag-o-matic user
+INHERIT=autotools flag-o-matic user
 IUSE=debug gnutls ncurses +parcheck ssl test zlib
 KEYWORDS=amd64 arm ppc x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v20.0/nzbget-20.0-src.tar.gz -> nzbget-20.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	c0964e43ba712cb933da5f65b958fa88	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=3d279537f8850cb910649b11c9ef0e74
+_md5_=c21160cba95593249956e29f0e42ea5f
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.0 b/metadata/md5-cache/net-nntp/nzbget-21.0
index 0966894133fe..5c6e4d7fa46c 100644
--- a/metadata/md5-cache/net-nntp/nzbget-21.0
+++ b/metadata/md5-cache/net-nntp/nzbget-21.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-
 DESCRIPTION=A command-line based binary newsgrabber supporting .nzb files
 EAPI=7
 HOMEPAGE=https://nzbget.net/
-INHERIT=autotools eutils flag-o-matic user systemd
+INHERIT=autotools flag-o-matic user systemd
 IUSE=debug gnutls ncurses +parcheck ssl test zlib
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.0/nzbget-21.0-src.tar.gz -> nzbget-21.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	c0964e43ba712cb933da5f65b958fa88	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=f88de5fecc0dc0ed5ca9c7829ee791d2
+_md5_=bb3e4913d71c59cb2a4051d87f718540
diff --git a/metadata/md5-cache/net-nntp/tin-2.4.5 b/metadata/md5-cache/net-nntp/tin-2.4.5
index 8f9939244b5d..8667c065ba01 100644
--- a/metadata/md5-cache/net-nntp/tin-2.4.5
+++ b/metadata/md5-cache/net-nntp/tin-2.4.5
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/l
 DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
 EAPI=7
 HOMEPAGE=http://www.tin.org/
+INHERIT=toolchain-funcs
 IUSE=cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode
 KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses:0[unicode?] unicode? ( dev-libs/icu:= )
 SLOT=0
 SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.4.5.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c1dc51a30e0bc16cc88f4cb04309abc6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d181424bd90f795191ae3c5736f79a8e
diff --git a/metadata/md5-cache/net-p2p/fms-0.3.82 b/metadata/md5-cache/net-p2p/fms-0.3.82
index 1e0f5da7dd64..65fd26673551 100644
--- a/metadata/md5-cache/net-p2p/fms-0.3.82
+++ b/metadata/md5-cache/net-p2p/fms-0.3.82
@@ -11,4 +11,4 @@ RDEPEND=virtual/libiconv frost? ( net-libs/mbedtls ) ssl? ( net-libs/mbedtls ) >
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tommy/distfiles/fms-src-0.3.82.zip
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=a0cec245970bc38a1dcd42399c47f4a9
+_md5_=ca0b0c6b2f910fa65689b53a9e2bda82
diff --git a/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b b/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
index c0c5aa5f2c87..800d996f0501 100644
--- a/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
+++ b/metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
@@ -3,7 +3,7 @@ DEPEND=net-misc/curl >=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.4:2 virtual/pkgconf
 DESCRIPTION=A GTK2-based viewer and editor for BitTorrent meta files
 EAPI=5
 HOMEPAGE=http://gtorrentviewer.sourceforge.net/
-INHERIT=autotools eutils gnome2
+INHERIT=autotools epatch gnome2
 IUSE=debug
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=net-misc/curl >=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.4:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gtorrentviewer/GTorrentViewer-0.2b.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=20e7102ef7a32db8d39bdf6f1ffc8bd6
+_md5_=f19c999f0a9d660401d909225b22e64d
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.10.4.0 b/metadata/md5-cache/net-p2p/litecoind-0.10.4.0
index 9b51d875adaa..99f97d980c1c 100644
--- a/metadata/md5-cache/net-p2p/litecoind-0.10.4.0
+++ b/metadata/md5-cache/net-p2p/litecoind-0.10.4.0
@@ -3,7 +3,7 @@ DEPEND=dev-libs/boost:=[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( ap
 DESCRIPTION=The offical daemon to run your own (full) Litecoin node
 EAPI=5
 HOMEPAGE=https://litecoin.org/
-INHERIT=autotools db-use eutils flag-o-matic systemd user
+INHERIT=autotools db-use epatch flag-o-matic systemd user
 IUSE=logrotate upnp +wallet
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT ISC GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( a
 SLOT=0
 SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.10.4.0.tar.gz -> litecoin-0.10.4.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	db-use	063d3e7add942762a8203b52ec3066c2	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=ed96d1990adc26f308086c0c17d0ac8f
+_md5_=66beec115286dc86b7397fdc3d4bffc6
diff --git a/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r2 b/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r2
index b0b5ad2cc3d4..54ebd82bbf2d 100644
--- a/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r2
+++ b/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r2
@@ -4,7 +4,7 @@ DEPEND=>=net-print/cups-2.3.0 test? ( dev-util/cppunit ) usb-modeswitch? ( sys-a
 DESCRIPTION=Dymo SDK for LabelWriter/LabelManager printers
 EAPI=7
 HOMEPAGE=https://newellrubbermaid.secure.force.com/dymopkb
-INHERIT=eutils autotools
+INHERIT=autotools
 IUSE=test usb-modeswitch
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=>=net-print/cups-2.3.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.dymo.com/Download%20Drivers/Linux/Download/dymo-cups-drivers-1.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=b50d5063a8be8f29ccbf354bf6352fd3
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=dbdb225f87421f29e97e25bb581eb0f1
diff --git a/metadata/md5-cache/net-print/foo2zjs-20200221 b/metadata/md5-cache/net-print/foo2zjs-20200221
index d4740ecc7f9d..f9c3231e6223 100644
--- a/metadata/md5-cache/net-print/foo2zjs-20200221
+++ b/metadata/md5-cache/net-print/foo2zjs-20200221
@@ -3,6 +3,7 @@ DEPEND=net-print/cups net-print/foomatic-db-engine >=net-print/cups-filters-1.0.
 DESCRIPTION=Support for printing to ZjStream-based printers
 EAPI=7
 HOMEPAGE=http://foo2zjs.rkkda.com/
+INHERIT=toolchain-funcs
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=net-print/cups net-print/foomatic-db-engine >=net-print/cups-filters-1.0
 RESTRICT=bindist !test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/foo2zjs-20200221.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8dcc57d4c236df8ff9803c788dd943f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=208e12a5e57a29892ad84286796fd940
diff --git a/metadata/md5-cache/net-print/foo2zjs-99999999 b/metadata/md5-cache/net-print/foo2zjs-99999999
index 22865cbfbd21..1b7012fb66d3 100644
--- a/metadata/md5-cache/net-print/foo2zjs-99999999
+++ b/metadata/md5-cache/net-print/foo2zjs-99999999
@@ -3,10 +3,11 @@ DEPEND=net-print/cups net-print/foomatic-db-engine >=net-print/cups-filters-1.0.
 DESCRIPTION=Support for printing to ZjStream-based printers
 EAPI=7
 HOMEPAGE=http://foo2zjs.rkkda.com/
+INHERIT=toolchain-funcs
 IUSE=test
 LICENSE=GPL-2
 RDEPEND=net-print/cups net-print/foomatic-db-engine >=net-print/cups-filters-1.0.43-r1[foomatic] virtual/udev
 RESTRICT=bindist !test? ( test )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd5ccde4a4806756d1a8a67c4e83d3db
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=275fb196e71297e2e463af520044e363
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
index 0a1df1f7926c..4e86c6188fc1 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
@@ -3,12 +3,12 @@ DEPEND=net-print/cups virtual/pkgconfig dev-lang/perl:=[-build(-)] sys-devel/gnu
 DESCRIPTION=Generates ppds out of xml foomatic printer description files
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-INHERIT=eutils perl-module versionator autotools
+INHERIT=epatch perl-module versionator autotools
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 >=net-print/cups-filters-1.0.43-r1[foomatic] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.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	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=9ffc7fbd9cce35ab1dfacfad7f940120
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=830489f7d8675cef9f19e89ac2313da0
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
index 40a811011cb3..f8459e5d1025 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-INHERIT=eutils versionator
+INHERIT=epatch versionator
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20170331.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=84eec4f2a1a43ee7d44d475bd930b369
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=1a0b5d8e7b36646426374dcb9803cb72
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
index ba7295a24b21..7c89515b7fa4 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
 EAPI=6
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-INHERIT=eutils versionator
+INHERIT=versionator
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20180126.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=71db498b0f5c55855a752f521165258c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=0836ebf1a69cfbb935b652530b932c0e
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20190226 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20190226
index 679545d1bb7c..cc4b98e0764b 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20190226
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20190226
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
 EAPI=6
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-INHERIT=eutils versionator
+INHERIT=versionator
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20190226.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=fdc617008ffda05e52da540429580ba3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=234902cd0fcec4968cc52db0d0b23da6
diff --git a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5 b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
index b447bfe35859..0366ccad8101 100644
--- a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
+++ b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=GNOME cups library
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
-INHERIT=autotools eutils gnome2 multilib-minimal
+INHERIT=autotools epatch gnome2 multilib-minimal
 IUSE=debug 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 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2
 _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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=fa81f55a6a403b2867250721df6ea2b2
+_md5_=e090d92d56e3b40c33f255dd1c6612f8
diff --git a/metadata/md5-cache/net-print/lm1100-1.0.2a-r1 b/metadata/md5-cache/net-print/lm1100-1.0.2a-r1
index 1d1dadc25c0c..cdbfa602b688 100644
--- a/metadata/md5-cache/net-print/lm1100-1.0.2a-r1
+++ b/metadata/md5-cache/net-print/lm1100-1.0.2a-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=The Tim Engler's Lexmark 1100 driver
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/show_driver.cgi?driver=lm1100
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/lm1100.1.0.2a.tar.gz mirror://gentoo/lm1100maint.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
-_md5_=5a0ff21b21538e93be6ebd21533dac9c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=048a900dd3ccfa40b7aacf93be5329ca
diff --git a/metadata/md5-cache/net-print/npadmin-0.8.7-r1 b/metadata/md5-cache/net-print/npadmin-0.8.7-r1
index 90ec24ba2a41..8e4fb9eef132 100644
--- a/metadata/md5-cache/net-print/npadmin-0.8.7-r1
+++ b/metadata/md5-cache/net-print/npadmin-0.8.7-r1
@@ -2,10 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Network printer command-line adminstration tool
 EAPI=6
 HOMEPAGE=http://npadmin.sourceforge.net/
-INHERIT=eutils
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/npadmin/npadmin-0.8.7.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
-_md5_=5ec57ba93015ed71b8d24cd98f17422e
+_md5_=c478a05e85796f79be70136bf5110ebd
diff --git a/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1 b/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
index 6d9b52e200fa..02df63163f6c 100644
--- a/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
+++ b/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
@@ -3,11 +3,12 @@ DEPEND=>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs
 DESCRIPTION=A set of CUPS printer drivers for SPL (Samsung Printer Language) printers
 EAPI=7
 HOMEPAGE=http://splix.sourceforge.net/
+INHERIT=toolchain-funcs
 IUSE=+jbig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/splix-2.0.0_p20130826.tar.bz2 https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c42301e85499caca3314c66569908fe
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=06ef84b15bb9f525442eadf173ddb635
diff --git a/metadata/md5-cache/net-proxy/adzapper-20110915-r2 b/metadata/md5-cache/net-proxy/adzapper-20110915-r2
index c697cef2e333..88da494051c9 100644
--- a/metadata/md5-cache/net-proxy/adzapper-20110915-r2
+++ b/metadata/md5-cache/net-proxy/adzapper-20110915-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Redirector for squid to intercept advertising, page counters and web bugs
 EAPI=5
 HOMEPAGE=http://adzapper.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
 KEYWORDS=~alpha amd64 ~hppa ppc sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://adzapper.sourceforge.net/adzap-20110915.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
-_md5_=b06431e45c9c82be666c441e2f8b4b13
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=d9b3570f631b91a9173f0bf926db8e86
diff --git a/metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2 b/metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
index 1019537abc1b..eaec45d445ec 100644
--- a/metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
+++ b/metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy
 EAPI=6
 HOMEPAGE=http://cntlm.sourceforge.net/
-INHERIT=eutils systemd toolchain-funcs user
+INHERIT=systemd toolchain-funcs user
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ftp.awk.cz/pub/cntlm-0.93beta5.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	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=fba2802b30b93d5ac2804f1206c6a960
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=e443a4ff2ab4ebc0f610b382731a0d76
diff --git a/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.2.0 b/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.2.0
index 72a5589d2c3d..90e95d1f4749 100644
--- a/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.2.0
+++ b/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=haproxy dataplane api / sidecar
 EAPI=7
 HOMEPAGE=https://github.com/haproxytech/dataplaneapi https://www.haproxy.com/documentation/dataplaneapi/latest/
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/haproxytech/dataplaneapi/archive/v2.2.0.tar.gz -> haproxy-dataplaneapi-2.2.0.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!gehirn!inc/crypt/@v/v0.0.0-20200316065508-bb7000b8a962.zip -> github.com%2F!gehirn!inc%2Fcrypt%2F@v%2Fv0.0.0-20200316065508-bb7000b8a962.zip mirror://goproxy//github.com/!gehirn!inc/crypt/@v/v0.0.0-20200316065508-bb7000b8a962.mod -> github.com%2F!gehirn!inc%2Fcrypt%2F@v%2Fv0.0.0-20200316065508-bb7000b8a962.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200108200545-475eaeb16496.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200108200545-475eaeb16496.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/dustinkirkland/golang-petname/@v/v0.0.0-20191129215211-8e5a1ed0cff0.zip -> github.com%2Fdustinkirkland%2Fgolang-petname%2F@v%2Fv0.0.0-20191129215211-8e5a1ed0cff0.zip mirror://goproxy//github.com/dustinkirkland/golang-petname/@v/v0.0.0-20191129215211-8e5a1ed0cff0.mod -> github.com%2Fdustinkirkland%2Fgolang-petname%2F@v%2Fv0.0.0-20191129215211-8e5a1ed0cff0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.17.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.17.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.17.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.10.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.10.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.10.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.10.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.15.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.15.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.15.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.6.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.6.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.7.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.7.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.7.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.7.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.9.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.9.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.9.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.9.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.1-0.20200217212219-353f81969824.zip -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.1-0.20200217212219-353f81969824.zip mirror://goproxy//github.com/google/renameio/@v/v0.1.1-0.20200217212219-353f81969824.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.1-0.20200217212219-353f81969824.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/haproxytech/client-native/v2/@v/v2.2.0.zip -> github.com%2Fhaproxytech%2Fclient-native%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/haproxytech/client-native/v2/@v/v2.2.0.mod -> github.com%2Fhaproxytech%2Fclient-native%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/haproxytech/config-parser/v3/@v/v3.0.0-rc1.0.20201218192213-cf1331eaac44.zip -> github.com%2Fhaproxytech%2Fconfig-parser%2Fv3%2F@v%2Fv3.0.0-rc1.0.20201218192213-cf1331eaac44.zip mirror://goproxy//github.com/haproxytech/config-parser/v3/@v/v3.0.0-rc1.0.20201218192213-cf1331eaac44.mod -> github.com%2Fhaproxytech%2Fconfig-parser%2Fv3%2F@v%2Fv3.0.0-rc1.0.20201218192213-cf1331eaac44.mod mirror://goproxy//github.com/haproxytech/config-parser/v3/@v/v3.0.0.zip -> github.com%2Fhaproxytech%2Fconfig-parser%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/haproxytech/config-parser/v3/@v/v3.0.0.mod -> github.com%2Fhaproxytech%2Fconfig-parser%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/haproxytech/models/v2/@v/v2.2.0-rc1.0.20210112080933-32de531b38f2.zip -> github.com%2Fhaproxytech%2Fmodels%2Fv2%2F@v%2Fv2.2.0-rc1.0.20210112080933-32de531b38f2.zip mirror://goproxy//github.com/haproxytech/models/v2/@v/v2.2.0-rc1.0.20210112080933-32de531b38f2.mod -> github.com%2Fhaproxytech%2Fmodels%2Fv2%2F@v%2Fv2.2.0-rc1.0.20210112080933-32de531b38f2.mod mirror://goproxy//github.com/haproxytech/models/v2/@v/v2.2.0.zip -> github.com%2Fhaproxytech%2Fmodels%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/haproxytech/models/v2/@v/v2.2.0.mod -> github.com%2Fhaproxytech%2Fmodels%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.6.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.6.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.6.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.6.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.zip -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/v2/@v/v2.0.2.zip -> github.com%2Foklog%2Fulid%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/oklog/ulid/v2/@v/v2.0.2.mod -> github.com%2Foklog%2Fulid%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20170112200414-7148bc3a4c30.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20170112200414-7148bc3a4c30.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.4.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.zip -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.3+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.3+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.3+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.3+incompatible.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.5.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.5.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.3.0.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.0.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.3.2.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.2.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.3.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.3.2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200425230154-ff2c4b7c35a0.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200425230154-ff2c4b7c35a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=c0b0b07a832e0370e71332c4a8ed012e
+_md5_=9a1661dcbd7b1b2266a570c6139339f5
diff --git a/metadata/md5-cache/net-proxy/havp-0.92a-r2 b/metadata/md5-cache/net-proxy/havp-0.92a-r2
index 737ee5ff8750..dbec4fcb1ce2 100644
--- a/metadata/md5-cache/net-proxy/havp-0.92a-r2
+++ b/metadata/md5-cache/net-proxy/havp-0.92a-r2
@@ -3,7 +3,7 @@ DEPEND=clamav? ( >=app-antivirus/clamav-0.98.5 ) sys-devel/gnuconfig >=app-porta
 DESCRIPTION=HTTP AntiVirus Proxy
 EAPI=5
 HOMEPAGE=http://www.server-side.de/
-INHERIT=autotools eutils toolchain-funcs user
+INHERIT=autotools epatch toolchain-funcs user
 IUSE=clamav ssl
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=clamav? ( >=app-antivirus/clamav-0.98.5 )
 SLOT=0
 SRC_URI=http://www.server-side.de/download/havp-0.92a.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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=af6668877b057eda0548cf442c5c1f75
+_md5_=e229b447d3365d1bb07860f44b50ad5e
diff --git a/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1 b/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
index e6b40cb83e32..02f0c848398f 100644
--- a/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
+++ b/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/libyaml-0.1.4 sys-devel/gnuconfig >=app-portage/elt-patches-20
 DESCRIPTION=A fast, light-weight proxy for Memcached and Redis. (Twitter's Twemproxy)
 EAPI=5
 HOMEPAGE=https://github.com/twitter/twemproxy
-INHERIT=autotools eutils
+INHERIT=autotools epatch
 IUSE=debug doc
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libyaml-0.1.4
 SLOT=0
 SRC_URI=https://github.com/twitter/twemproxy/archive/v0.4.1.tar.gz -> nutcracker-0.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_=46d9e6171a9efaf96f0163d6b4a6980a
+_md5_=f8561b0e3f9e4a49e0435c0e01a02948
diff --git a/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5 b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5
index f7abad5ef917..556a9cadc5d0 100644
--- a/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5
+++ b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5
@@ -4,12 +4,12 @@ DEPEND=net-libs/mbedtls:= >=net-libs/libbloom-1.6 net-libs/libcork net-libs/libc
 DESCRIPTION=A lightweight secured SOCKS5 proxy for embedded devices and low end boxes
 EAPI=7
 HOMEPAGE=https://github.com/shadowsocks/shadowsocks-libev
-INHERIT=autotools eutils systemd
+INHERIT=autotools systemd
 IUSE=debug doc
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=net-libs/mbedtls:= >=net-libs/libbloom-1.6 net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre
 SLOT=0
 SRC_URI=https://github.com/shadowsocks/shadowsocks-libev/archive/v3.3.5.tar.gz -> shadowsocks-libev-3.3.5.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=999f98736d01046b6aea843a12125bc2
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=929aa457ad1fa4b693f60b960e19dc05
diff --git a/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1 b/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
index 0af06b05b268..6086ca40dd8e 100644
--- a/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
+++ b/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
@@ -3,12 +3,12 @@ DEPEND=dev-lang/perl sys-devel/flex gnutls? ( net-libs/gnutls ) zlib? ( sys-libs
 DESCRIPTION=Web caching proxy suitable for non-permanent Internet connections
 EAPI=6
 HOMEPAGE=https://www.gedanken.org.uk/software/wwwoffle/
-INHERIT=eutils user
+INHERIT=user
 IUSE=gnutls ipv6 zlib
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=gnutls? ( net-libs/gnutls ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://www.gedanken.org.uk/software/wwwoffle/download/wwwoffle-2.9i.tgz
-_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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=8ab8a39dbf7564e67b40df7700ac9dca
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=1469f6e281299c7abef32564299607ff
diff --git a/metadata/md5-cache/net-vpn/corkscrew-2.0-r1 b/metadata/md5-cache/net-vpn/corkscrew-2.0-r1
index 9bc8eededb6b..4569052e02c3 100644
--- a/metadata/md5-cache/net-vpn/corkscrew-2.0-r1
+++ b/metadata/md5-cache/net-vpn/corkscrew-2.0-r1
@@ -3,10 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=a tool for tunneling SSH through HTTP proxies
 EAPI=7
 HOMEPAGE=https://github.com/patpadgett/corkscrew/
-INHERIT=eutils autotools
+INHERIT=autotools
 KEYWORDS=amd64 ~arm ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=d08025fa098f46c5660fab2840215bfa
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=a68791a3365f73a105462c7c33f1e134
diff --git a/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2 b/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
index 1047ef57b269..e14430e17708 100644
--- a/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
+++ b/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/gofrp/fp-multiuser/archive/v0.0.2.tar.gz -> fp-multiuser-0.0.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.zip -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.zip mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.mod -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.mod mirror://goproxy//github.com/fatedier/frp/@v/v0.34.1.zip -> github.com%2Ffatedier%2Ffrp%2F@v%2Fv0.34.1.zip mirror://goproxy//github.com/fatedier/frp/@v/v0.34.1.mod -> github.com%2Ffatedier%2Ffrp%2F@v%2Fv0.34.1.mod mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.zip -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.zip mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.mod -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.mod mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/gin-contrib/sse/@v/v0.1.0.zip -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gin-contrib/sse/@v/v0.1.0.mod -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gin-gonic/gin/@v/v1.5.0.zip -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/gin-gonic/gin/@v/v1.5.0.mod -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-playground/locales/@v/v0.12.1.zip -> github.com%2Fgo-playground%2Flocales%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/go-playground/locales/@v/v0.12.1.mod -> github.com%2Fgo-playground%2Flocales%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/go-playground/universal-translator/@v/v0.16.0.zip -> github.com%2Fgo-playground%2Funiversal-translator%2F@v%2Fv0.16.0.zip mirror://goproxy//github.com/go-playground/universal-translator/@v/v0.16.0.mod -> github.com%2Fgo-playground%2Funiversal-translator%2F@v%2Fv0.16.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/leodido/go-urn/@v/v1.1.0.zip -> github.com%2Fleodido%2Fgo-urn%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/leodido/go-urn/@v/v1.1.0.mod -> github.com%2Fleodido%2Fgo-urn%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.mod -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.mod -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.mod -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.mod mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.mod -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.mod mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.mod -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.zip -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/vaughan0/go-ini/@v/v0.0.0-20130923145212-a98ad7ee00ec.mod -> github.com%2Fvaughan0%2Fgo-ini%2F@v%2Fv0.0.0-20130923145212-a98ad7ee00ec.mod mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.mod -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/go-playground/assert.v1/@v/v1.2.1.zip -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.zip mirror://goproxy//gopkg.in/go-playground/assert.v1/@v/v1.2.1.mod -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.mod mirror://goproxy//gopkg.in/go-playground/validator.v9/@v/v9.29.1.zip -> gopkg.in%2Fgo-playground%2Fvalidator.v9%2F@v%2Fv9.29.1.zip mirror://goproxy//gopkg.in/go-playground/validator.v9/@v/v9.29.1.mod -> gopkg.in%2Fgo-playground%2Fvalidator.v9%2F@v%2Fv9.29.1.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=e9ab573613125fd125f16a80d0b0a924
+_md5_=3ed5e1098c7f572d494eb0599b7d6bf2
diff --git a/metadata/md5-cache/net-vpn/frp-0.36.0 b/metadata/md5-cache/net-vpn/frp-0.36.0
index c6d606f6be8a..8e9cd7177224 100644
--- a/metadata/md5-cache/net-vpn/frp-0.36.0
+++ b/metadata/md5-cache/net-vpn/frp-0.36.0
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/fatedier/frp/archive/v0.36.0.tar.gz -> frp-0.36.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.zip -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.zip mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.mod -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.mod mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.zip -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.zip mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.mod -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.mod mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.zip -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.zip mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.zip -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.zip mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.mod -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.zip -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.zip -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.mod -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.zip -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.zip mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.mod -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.mod mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.zip -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.zip mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.mod -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.mod mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.zip -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.zip mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.mod -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.mod mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.zip -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.zip mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.mod -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=d8d476aae80f5468c66321de267ca1ab
+_md5_=c6abb7ce9e9643c9d5e79d634572f9c1
diff --git a/metadata/md5-cache/net-vpn/frp-0.36.2 b/metadata/md5-cache/net-vpn/frp-0.36.2
index 63839d021328..23cb47ba08a5 100644
--- a/metadata/md5-cache/net-vpn/frp-0.36.2
+++ b/metadata/md5-cache/net-vpn/frp-0.36.2
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/fatedier/frp/archive/v0.36.2.tar.gz -> frp-0.36.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.zip -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.zip mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.mod -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.mod mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.zip -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.zip mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.mod -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.mod mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.zip -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.zip mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.zip -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.zip mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.mod -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.zip -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.zip -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.mod -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.zip -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.zip mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.mod -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.mod mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.zip -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.zip mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.mod -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.mod mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.zip -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.zip mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.mod -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.mod mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.zip -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.zip mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.mod -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=d8d476aae80f5468c66321de267ca1ab
+_md5_=c6abb7ce9e9643c9d5e79d634572f9c1
diff --git a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2 b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
index 83e7bf95b62e..3361ac46743e 100644
--- a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
+++ b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
@@ -3,7 +3,7 @@ DEPEND=sys-libs/zlib test? ( dev-libs/check )
 DESCRIPTION=IP over DNS tunnel
 EAPI=5
 HOMEPAGE=http://code.kryo.se/iodine/
-INHERIT=linux-info eutils toolchain-funcs
+INHERIT=linux-info epatch toolchain-funcs
 IUSE=test kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC GPL-2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=b17972ef72702bb75ca4f08b40fd8d3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=137c596d8f03e492664849e23c36c613
diff --git a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.0 b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.0
index 5c2d77580ada..0a73c7a4790a 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.0
+++ b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.0
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=NetworkManager L2TP plugin
 EAPI=7
 HOMEPAGE=https://github.com/nm-l2tp/network-manager-l2tp
-INHERIT=eutils gnome.org autotools
+INHERIT=gnome.org autotools
 IUSE=gnome static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-misc/networkmanager-1.2[ppp] dev-libs/dbus-glib net-dialup/ppp[eap-tls] net-dialup/xl2tpd >=dev-libs/glib-2.32 || ( net-vpn/strongswan net-vpn/libreswan ) gnome? ( x11-libs/gtk+:3 app-crypt/libsecret gnome-extra/nm-applet )
 SLOT=0
 SRC_URI=https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/1.8.0/NetworkManager-l2tp-1.8.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=2665255fc25e57e774b796a3b473682d
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=42ed02a5c016498f7e63a386c30ba4a4
diff --git a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.2 b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.2
index d9778c46c22d..743f44cd0f56 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.2
+++ b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.2
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=NetworkManager L2TP plugin
 EAPI=7
 HOMEPAGE=https://github.com/nm-l2tp/network-manager-l2tp
-INHERIT=eutils gnome.org autotools
+INHERIT=gnome.org autotools
 IUSE=gnome static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-misc/networkmanager-1.2[ppp] dev-libs/dbus-glib net-dialup/ppp[eap-tls] net-dialup/xl2tpd >=dev-libs/glib-2.32 || ( net-vpn/strongswan net-vpn/libreswan ) gnome? ( x11-libs/gtk+:3 app-crypt/libsecret gnome-extra/nm-applet )
 SLOT=0
 SRC_URI=https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/1.8.2/NetworkManager-l2tp-1.8.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=2665255fc25e57e774b796a3b473682d
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=42ed02a5c016498f7e63a386c30ba4a4
diff --git a/metadata/md5-cache/net-vpn/vpncwatch-1.8.1 b/metadata/md5-cache/net-vpn/vpncwatch-1.8.1
index 13689bcf14e0..c2e2658b973d 100644
--- a/metadata/md5-cache/net-vpn/vpncwatch-1.8.1
+++ b/metadata/md5-cache/net-vpn/vpncwatch-1.8.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Keepalive daemon for vpnc on Linux systems
 EAPI=5
 HOMEPAGE=https://github.com/dcantrell/vpncwatch/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-vpn/vpnc
 SLOT=0
 SRC_URI=https://github.com/downloads/dcantrell/vpncwatch/vpncwatch-1.8.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
-_md5_=268358bbd04fa3cfb5c992e3f69956bb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d56e1894a9d34d4cc6e3c2ae9eb77897
diff --git a/metadata/md5-cache/net-wireless/crackle-0.1 b/metadata/md5-cache/net-wireless/crackle-0.1
index ca2bea212a65..d3b87aeea8fc 100644
--- a/metadata/md5-cache/net-wireless/crackle-0.1
+++ b/metadata/md5-cache/net-wireless/crackle-0.1
@@ -3,12 +3,12 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=Crackle cracks BLE Encryption (AKA Bluetooth Smart)
 EAPI=5
 HOMEPAGE=http://lacklustre.net/projects/crackle/
-INHERIT=eutils
+INHERIT=epatch
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap
 RESTRICT=test
 SLOT=0
 SRC_URI=http://lacklustre.net/projects/crackle/crackle-0.1.tgz
-_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
-_md5_=b5cab7b5f08cb4c8e72ef569e46ad675
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=6c98394a7482bcde64aefd8b1f70e874
diff --git a/metadata/md5-cache/net-wireless/crackle-9999 b/metadata/md5-cache/net-wireless/crackle-9999
index 4e2bf135547c..bb9fdf07ec38 100644
--- a/metadata/md5-cache/net-wireless/crackle-9999
+++ b/metadata/md5-cache/net-wireless/crackle-9999
@@ -3,12 +3,12 @@ DEPEND=net-libs/libpcap test? ( dev-lang/perl ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Crackle cracks BLE Encryption (AKA Bluetooth Smart)
 EAPI=5
 HOMEPAGE=http://lacklustre.net/projects/crackle/
-INHERIT=eutils git-r3
+INHERIT=git-r3
 IUSE=test
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=net-libs/libpcap
 RESTRICT=!test? ( test )
 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	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=47fd2a2add779317306365b7f1912da8
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=8dcb060016183e2ad255a8356d68b7d8
diff --git a/metadata/md5-cache/net-wireless/kismet-2020.12.3 b/metadata/md5-cache/net-wireless/kismet-2020.12.3
index 80765e464751..c26734f5870e 100644
--- a/metadata/md5-cache/net-wireless/kismet-2020.12.3
+++ b/metadata/md5-cache/net-wireless/kismet-2020.12.3
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
-INHERIT=autotools eutils multilib python-single-r1 udev systemd
+INHERIT=autotools multilib python-single-r1 udev systemd
 IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 arm ~arm64 ~ppc x86
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/2020.12.3
 SRC_URI=https://www.kismetwireless.net/code/kismet-2020-12-R3.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=c7f38185960e13713c74025df7e800c1
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=0355c54faa0841b8d744a6f04c9bdd2a
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index f512ba0b1c02..7aee6f02ecfc 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
-INHERIT=autotools eutils multilib python-single-r1 udev systemd git-r3
+INHERIT=autotools multilib python-single-r1 udev systemd git-r3
 IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PDEPEND=rtlsdr? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) net-wireless/rtl-sdr )
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=strip
 SLOT=0/9999
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=6058a5f1693bea4c984dbe05cbe353c7
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=d4088e5f0a0eef33181e87d7649c7e67
diff --git a/metadata/md5-cache/net-wireless/mdk-3.6-r1 b/metadata/md5-cache/net-wireless/mdk-3.6-r1
index 7974ba1fdabf..b9ae04084b9d 100644
--- a/metadata/md5-cache/net-wireless/mdk-3.6-r1
+++ b/metadata/md5-cache/net-wireless/mdk-3.6-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Wireless injection tool with various functions
 EAPI=5
 HOMEPAGE=http://homepages.tu-darmstadt.de/~p_larbig/wlan
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk3-v6.tar.bz2
-_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
-_md5_=7b708cd05a522d580292174c90e2f3ba
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3a26e70e906224e16c09f982225748ee
diff --git a/metadata/md5-cache/net-wireless/spectools-2016.01.1 b/metadata/md5-cache/net-wireless/spectools-2016.01.1
index d1269f0294cc..a5fb2ad746cb 100644
--- a/metadata/md5-cache/net-wireless/spectools-2016.01.1
+++ b/metadata/md5-cache/net-wireless/spectools-2016.01.1
@@ -4,12 +4,12 @@ DEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2
 DESCRIPTION=Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net/spectools/
-INHERIT=autotools eutils toolchain-funcs udev flag-o-matic
+INHERIT=autotools toolchain-funcs udev flag-o-matic
 IUSE=debug +ncurses +gtk
 KEYWORDS=amd64 arm ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango dev-libs/glib:= )
 SLOT=0
 SRC_URI=https://www.kismetwireless.net/code/spectools-2016-01-R1.tar.xz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	udev	452708c3f55cf6e918b045adb949a9e6	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=950f7515cad7deee79cae6c13ace1693
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	udev	452708c3f55cf6e918b045adb949a9e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=7b4da02a24bc3d4ece03681a121aa584
diff --git a/metadata/md5-cache/net-wireless/spectools-9999 b/metadata/md5-cache/net-wireless/spectools-9999
index 459ba3cd218b..372d99afb8a5 100644
--- a/metadata/md5-cache/net-wireless/spectools-9999
+++ b/metadata/md5-cache/net-wireless/spectools-9999
@@ -4,11 +4,11 @@ DEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2
 DESCRIPTION=Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net/spectools/
-INHERIT=autotools eutils toolchain-funcs udev flag-o-matic git-r3
+INHERIT=autotools toolchain-funcs udev flag-o-matic git-r3
 IUSE=debug +ncurses +gtk
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango dev-libs/glib:= )
 SLOT=0
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	udev	452708c3f55cf6e918b045adb949a9e6	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=7f5d4cdb14e0e190c1d9d9bb7f21b43c
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	udev	452708c3f55cf6e918b045adb949a9e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=af21c4f13819174a33bf4d687cfdb47f
diff --git a/metadata/md5-cache/net-wireless/urh-2.9.1 b/metadata/md5-cache/net-wireless/urh-2.9.1
index 0c0b37aeda18..ffbf98aa70db 100644
--- a/metadata/md5-cache/net-wireless/urh-2.9.1
+++ b/metadata/md5-cache/net-wireless/urh-2.9.1
@@ -4,7 +4,7 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_
 DESCRIPTION=Universal Radio Hacker: investigate wireless protocols like a boss
 EAPI=7
 HOMEPAGE=https://github.com/jopohl/urh
-INHERIT=distutils-r1 eutils
+INHERIT=distutils-r1
 IUSE=airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jopohl/urh/archive/v2.9.1.tar.gz -> urh-2.9.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=45c8db5b0ae9fc8b77cbe10583935e94
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=3397715f719ef41568d8f9796ecf5d33
diff --git a/metadata/md5-cache/net-wireless/urh-9999 b/metadata/md5-cache/net-wireless/urh-9999
index cb5ea2e5b2af..7a901f4eec25 100644
--- a/metadata/md5-cache/net-wireless/urh-9999
+++ b/metadata/md5-cache/net-wireless/urh-9999
@@ -4,12 +4,12 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_
 DESCRIPTION=Universal Radio Hacker: investigate wireless protocols like a boss
 EAPI=7
 HOMEPAGE=https://github.com/jopohl/urh
-INHERIT=distutils-r1 eutils git-r3
+INHERIT=distutils-r1 git-r3
 IUSE=airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyzmq[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( net-wireless/sdrplay:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),testlib] net-wireless/gr-osmosdr python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=45c8db5b0ae9fc8b77cbe10583935e94
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=3397715f719ef41568d8f9796ecf5d33
diff --git a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r5 b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
index a85d2e55dc6b..a17d43740be4 100644
--- a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
+++ b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
@@ -3,12 +3,12 @@ DEPEND=dev-libs/openssl:0= net-libs/libpcap sys-libs/zlib
 DESCRIPTION=WLAN tool for breaking 802.11 WEP keys
 EAPI=5
 HOMEPAGE=http://wepattack.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 IUSE=john
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= net-libs/libpcap sys-libs/zlib john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/wepattack/WepAttack-0.1.3.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
-_md5_=70626a65a31124a1707e842b353dc48c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3f1f3c04f609a2c795a5f5eca2b18e62
diff --git a/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1 b/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
index 083d8ab17fff..bea280aaed54 100644
--- a/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
+++ b/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
@@ -3,10 +3,11 @@ DEPEND=sys-apps/sed
 DESCRIPTION=A collection of tools to configure IEEE 802.11 wireless LAN cards
 EAPI=7
 HOMEPAGE=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+INHERIT=toolchain-funcs multilib
 IUSE=multicall
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.30.pre9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=36dad4d37eb5c177215c2cdf3ac3fb18
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=2b50351d39b48bdd47a30c08a0d96671
diff --git a/metadata/md5-cache/sci-astronomy/aatm-0.6 b/metadata/md5-cache/sci-astronomy/aatm-0.6
index 64ec3c69b34a..1a6b3fc5a932 100644
--- a/metadata/md5-cache/sci-astronomy/aatm-0.6
+++ b/metadata/md5-cache/sci-astronomy/aatm-0.6
@@ -3,11 +3,11 @@ DEPEND=dev-libs/boost:= doc? ( app-doc/doxygen[dot] )
 DESCRIPTION=Atmospheric Modelling for ALMA Observatory
 EAPI=6
 HOMEPAGE=https://svn.cv.nrao.edu/view/aatm/devel/casa/
-INHERIT=eutils ltprune
+INHERIT=ltprune
 IUSE=doc static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/aatm-0.6.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
-_md5_=580c1594713f3fcff209e346e3aca3a3
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=6a306ddf37c0125c7e7fbe01076a4c84
diff --git a/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4 b/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4
index 1e46d59cbb7d..ce723aa90bfa 100644
--- a/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4
+++ b/metadata/md5-cache/sci-astronomy/cdsclient-3.8.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Collection of scripts to access the CDS databases
 EAPI=6
 HOMEPAGE=http://cdsweb.u-strasbg.fr/doc/cdsclient.html
-INHERIT=eutils versionator
+INHERIT=versionator
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
 RDEPEND=app-shells/tcsh
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=ftp://cdsarc.u-strasbg.fr/pub/sw/cdsclient-3.84.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=11b41459528548027968f722b066c51a
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=5366dd2ad10012d0c4cb521a3cd95ae5
diff --git a/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1 b/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
index 95680f55af65..dcda34fcc67d 100644
--- a/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
+++ b/metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
@@ -3,12 +3,12 @@ DEPEND=sys-libs/readline:0= x11-libs/motif:0= x11-libs/libX11:= x11-libs/libXt:=
 DESCRIPTION=European Southern Observatory Munich Image Data Analysis System
 EAPI=6
 HOMEPAGE=http://www.eso.org/projects/esomidas/
-INHERIT=eutils fortran-2 toolchain-funcs flag-o-matic
+INHERIT=fortran-2 toolchain-funcs flag-o-matic
 IUSE=+libtirpc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= x11-libs/motif:0= x11-libs/libX11:= x11-libs/libXt:= !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) virtual/fortran
 SLOT=0/8
 SRC_URI=ftp://ftp.eso.org/pub/midaspub/17FEB/sources/17FEBpl1.2.tar.gz -> esomidas-17.02.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	fortran-2	b4796813ccda91c9c0d3463fc90aa969	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=61522acf5e08c9069980240cbf947f3e
+_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	fortran-2	b4796813ccda91c9c0d3463fc90aa969	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=9e5a06fb77023d72584d4b3c97b96bfc
diff --git a/metadata/md5-cache/sci-astronomy/gnuastro-0.3 b/metadata/md5-cache/sci-astronomy/gnuastro-0.3
index 2c6c27f8ad11..b6d2f234b983 100644
--- a/metadata/md5-cache/sci-astronomy/gnuastro-0.3
+++ b/metadata/md5-cache/sci-astronomy/gnuastro-0.3
@@ -3,7 +3,7 @@ DEPEND=app-text/ghostscript-gpl dev-libs/libgit2:= sci-astronomy/wcslib:0= sci-l
 DESCRIPTION=GNU Astronomy Utilities
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gnuastro
-INHERIT=eutils autotools ltprune
+INHERIT=autotools ltprune
 IUSE=static-libs threads
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=app-text/ghostscript-gpl dev-libs/libgit2:= sci-astronomy/wcslib:0= sci-
 SLOT=0/1
 SRC_URI=mirror://gnu/gnuastro/gnuastro-0.3.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_=25c0c3d58667aead8985f44f7d950e42
+_md5_=3863bc48db49dd0e66cfa04641ca3d62
diff --git a/metadata/md5-cache/sci-astronomy/healpix-3.31 b/metadata/md5-cache/sci-astronomy/healpix-3.31
index ba9041da8cb6..74913de83e43 100644
--- a/metadata/md5-cache/sci-astronomy/healpix-3.31
+++ b/metadata/md5-cache/sci-astronomy/healpix-3.31
@@ -3,7 +3,7 @@ DEPEND=>=sci-libs/cfitsio-3 idl? ( dev-lang/gdl sci-astronomy/idlastro ) java? (
 DESCRIPTION=Hierarchical Equal Area isoLatitude Pixelization of a sphere
 EAPI=6
 HOMEPAGE=http://healpix.sourceforge.net/
-INHERIT=autotools toolchain-funcs eutils java-pkg-opt-2 java-ant-2 ltprune
+INHERIT=autotools toolchain-funcs java-pkg-opt-2 java-ant-2 ltprune
 IUSE=cxx doc idl java openmp static-libs test elibc_FreeBSD java elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/healpix/Healpix_3.31/Healpix_3.31_2016Aug26.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-ant-2	51fb0a4707d58382310390ad47ab0ab0
-_md5_=360bf07250d8f79e69d517ea6fcb29cd
+_md5_=a82440fb576df9ea462abd61cb233319
diff --git a/metadata/md5-cache/sci-astronomy/pal-0.9.7 b/metadata/md5-cache/sci-astronomy/pal-0.9.7
index 1ac77f394b95..00463268bb2e 100644
--- a/metadata/md5-cache/sci-astronomy/pal-0.9.7
+++ b/metadata/md5-cache/sci-astronomy/pal-0.9.7
@@ -3,12 +3,12 @@ DEPEND=sci-astronomy/erfa:=
 DESCRIPTION=Positional Astronomy Library
 EAPI=6
 HOMEPAGE=https://github.com/Starlink/pal
-INHERIT=eutils ltprune
+INHERIT=ltprune
 IUSE=doc static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-astronomy/erfa:=
 SLOT=0
 SRC_URI=https://github.com/Starlink/pal/releases/download/v0.9.7/pal-0.9.7.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
-_md5_=351d5454c2f93bd81d47bc6f18334022
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=6e022a71c739505200f255107e618046
diff --git a/metadata/md5-cache/sci-astronomy/wcstools-3.9.5 b/metadata/md5-cache/sci-astronomy/wcstools-3.9.5
index 4b2835a505d6..358bef0095ed 100644
--- a/metadata/md5-cache/sci-astronomy/wcstools-3.9.5
+++ b/metadata/md5-cache/sci-astronomy/wcstools-3.9.5
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=World Coordinate System library for astronomical FITS images
 EAPI=6
 HOMEPAGE=http://tdc-www.harvard.edu/software/wcstools
-INHERIT=eutils autotools
+INHERIT=autotools
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://tdc-www.harvard.edu/software/wcstools/wcstools-3.9.5.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_=f66b7a36e9f26d0f7a1394dd5c9d67b4
+_md5_=040f5bfd6ef5b4fa382be832ddb68699
diff --git a/metadata/md5-cache/sci-biology/mira-4.0.2 b/metadata/md5-cache/sci-biology/mira-4.0.2
index c6feefe4d23b..1dc7a80c4892 100644
--- a/metadata/md5-cache/sci-biology/mira-4.0.2
+++ b/metadata/md5-cache/sci-biology/mira-4.0.2
@@ -3,7 +3,7 @@ DEPEND=dev-libs/boost[threads] dev-util/google-perftools sys-devel/flex app-edit
 DESCRIPTION=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Illumina
 EAPI=6
 HOMEPAGE=http://www.chevreux.org/projects_mira.html
-INHERIT=autotools eutils multilib
+INHERIT=autotools multilib
 IUSE=doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/boost[threads] dev-util/google-perftools
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/mira-assembler/files/MIRA/stable/mira-4.0.2.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_06-07-2012.tar.bz2
 _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_=fda11f1c5cd244c9f03806334b1eda1c
+_md5_=43c171b4d4fe8641b5d27f17ad50b957
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.8 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
index 68514815a583..bf231807d2c0 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.8
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend test
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 cmake cuda multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2018.8
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2018.8.tar.gz doc? ( http://ftp.gromacs.org/manual/manual-2018.8.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2018.8.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=ee4f399f504cc2f62e764e35a1a1ba84
+_md5_=de105958f175ef1c51823120e6bb8139
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
index c32b9e506d57..f1d183eb0b9f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend test
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 cmake cuda multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2019.6
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2019.6.tar.gz doc? ( http://ftp.gromacs.org/manual/manual-2019.6.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2019.6.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=5b73913d7996e428aea7754e0ef423c6
+_md5_=cf4d3e6d737c4802ee569a861260d9f5
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
index 0aa214ba00c3..4dac93509af5 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2020.4
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.4.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.4.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=268d1dca0e8f7feed1031af2a5732ae2
+_md5_=6117e0badd27d43e5c66caf62dc67c82
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.5 b/metadata/md5-cache/sci-chemistry/gromacs-2020.5
index 1891d7d6d12a..93a47be7b968 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.5
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2020.5
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.5.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.5.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=6ee6830377d9ea3eb3afdd734dbd61a3
+_md5_=45e3f559f1c36da9511e8d902910d0cc
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.6 b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
index ca238d51c34b..b95221e48959 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2020.6
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.6.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.6.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=6ee6830377d9ea3eb3afdd734dbd61a3
+_md5_=45e3f559f1c36da9511e8d902910d0cc
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
index 0ae0a2f36519..2e742997812c 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2020.9999
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=6ee6830377d9ea3eb3afdd734dbd61a3
+_md5_=45e3f559f1c36da9511e8d902910d0cc
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021 b/metadata/md5-cache/sci-chemistry/gromacs-2021
index 365f00efc419..2d8b247bc627 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2021
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=25f8b9abe4e6cbacf577ba78ddda6cea
+_md5_=b81d840baa66f6b1ee754c1421cba988
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.1 b/metadata/md5-cache/sci-chemistry/gromacs-2021.1
index d1a121d959e5..8a6c8774e012 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2021.1
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.1.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.1.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=25f8b9abe4e6cbacf577ba78ddda6cea
+_md5_=b81d840baa66f6b1ee754c1421cba988
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index 114549ff9f24..5ece64c6099a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=25f8b9abe4e6cbacf577ba78ddda6cea
+_md5_=b81d840baa66f6b1ee754c1421cba988
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 9e6c19a74789..299dd45e268a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup test unp
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-INHERIT=bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
+INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils git-r3
 IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	c2f1b334711bbbf2130f339636dc7515	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	distutils-r1	d8655e1387589a2e1930339b1627d5c1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=25f8b9abe4e6cbacf577ba78ddda6cea
+_md5_=b81d840baa66f6b1ee754c1421cba988
diff --git a/metadata/md5-cache/sci-chemistry/modeller-9.25 b/metadata/md5-cache/sci-chemistry/modeller-9.25
index 4720d5f531d8..ff379cb33f0a 100644
--- a/metadata/md5-cache/sci-chemistry/modeller-9.25
+++ b/metadata/md5-cache/sci-chemistry/modeller-9.25
@@ -4,7 +4,7 @@ DEPEND=>=dev-lang/swig-1.3
 DESCRIPTION=Homology or comparative modeling of protein three-dimensional structures
 EAPI=7
 HOMEPAGE=https://salilab.org/modeller/
-INHERIT=distutils-r1 eutils multilib
+INHERIT=distutils-r1 multilib
 IUSE=doc examples python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=modeller
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://salilab.org/modeller/9.25/modeller-9.25.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=6c2d57ce052105f589366e6b66b96530
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=75e9355e9b224443883e3703eb173b42
diff --git a/metadata/md5-cache/sci-chemistry/namd-2.10 b/metadata/md5-cache/sci-chemistry/namd-2.10
index 591b979c1739..4b5bf3592c40 100644
--- a/metadata/md5-cache/sci-chemistry/namd-2.10
+++ b/metadata/md5-cache/sci-chemistry/namd-2.10
@@ -3,12 +3,12 @@ DEPEND=>=sys-cluster/charm-6.5.1-r2 sci-libs/fftw:3.0 dev-lang/tcl:0= virtual/pk
 DESCRIPTION=A powerful and highly parallelized molecular dynamics code
 EAPI=6
 HOMEPAGE=http://www.ks.uiuc.edu/Research/namd/
-INHERIT=eutils multilib toolchain-funcs flag-o-matic
+INHERIT=multilib toolchain-funcs flag-o-matic
 KEYWORDS=~amd64
 LICENSE=namd
 RDEPEND=>=sys-cluster/charm-6.5.1-r2 sci-libs/fftw:3.0 dev-lang/tcl:0=
 RESTRICT=fetch
 SLOT=0
 SRC_URI=NAMD_2.10_Source.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=5967d8717c25e57c994e736572a4beee
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	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	c0964e43ba712cb933da5f65b958fa88
+_md5_=9ececc89d028148efb247f92866214f8
diff --git a/metadata/md5-cache/sci-chemistry/tinker-8.2.1 b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
index e67075191cf4..2bc1354e8ca2 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-8.2.1
+++ b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 virtual/pkgconfig virtual/fortran java? ( >=dev-java/ja
 DESCRIPTION=Molecular modeling package that includes force fields, such as AMBER and CHARMM
 EAPI=6
 HOMEPAGE=http://dasher.wustl.edu/tinker/
-INHERIT=eutils flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs
+INHERIT=flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs
 IUSE=examples elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Tinker
@@ -11,5 +11,5 @@ RDEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !sys-apps/bar !
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-8.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
-_md5_=9880e4681acf0d7e538e93103a2c14c3
+_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	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
+_md5_=61457eb4ec14437ac6d628ef46e9e805
diff --git a/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1 b/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
index be483a8e0a83..4bb1854e2b6f 100644
--- a/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
+++ b/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
@@ -3,12 +3,12 @@ DEPEND=>=sci-geosciences/libtcd-2.2.3
 DESCRIPTION=Calculate speeds, equilibrium arguments, node factors of tidal constituents
 EAPI=6
 HOMEPAGE=http://www.flaterco.com/xtide/files.html
-INHERIT=eutils ltprune
+INHERIT=ltprune
 IUSE=static-libs
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=sci-geosciences/libtcd-2.2.3
 SLOT=0
 SRC_URI=ftp://ftp.flaterco.com/xtide/congen-1.6.2.tar.bz2
-_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
-_md5_=5ccc5f3a5659b0d44c51cb1b15b0aa28
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=a6a359d20fa11434042f9b7f95dd0185
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index 38933293cd41..91a0b7b98e89 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -4,7 +4,7 @@ DEPEND=acct-user/gpsd >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireles
 DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
 EAPI=7
 HOMEPAGE=https://gpsd.gitlab.io/gpsd/
-INHERIT=eutils udev multilib distutils-r1 scons-utils toolchain-funcs git-r3
+INHERIT=udev multilib distutils-r1 scons-utils toolchain-funcs git-r3
 IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_mtk3301 +gpsd_protocols_navcom +gpsd_protocols_nmea0183 +gpsd_protocols_nmea2000 +gpsd_protocols_ntrip +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_passthrough +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python3_7 python_targets_python3_8
 LICENSE=BSD
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=acct-user/gpsd >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wirele
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_7 python_targets_python3_8 ) ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/27
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	udev	452708c3f55cf6e918b045adb949a9e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	scons-utils	fc8e53815030125602cc608cd1bff857	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=e1ccdd73dd42b34c9157972e3e12c5e5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	udev	452708c3f55cf6e918b045adb949a9e6	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	scons-utils	fc8e53815030125602cc608cd1bff857	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=92fc9d94de6af8e896e5e7a75e7477c0
diff --git a/metadata/md5-cache/sci-libs/armadillo-10.2.0 b/metadata/md5-cache/sci-libs/armadillo-10.2.0
index 64b57943ae24..1228ba50eb01 100644
--- a/metadata/md5-cache/sci-libs/armadillo-10.2.0
+++ b/metadata/md5-cache/sci-libs/armadillo-10.2.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack?
 DESCRIPTION=Streamlined C++ linear algebra library
 EAPI=7
 HOMEPAGE=http://arma.sourceforge.net/
-INHERIT=cmake toolchain-funcs multilib eutils
+INHERIT=cmake toolchain-funcs multilib
 IUSE=arpack blas doc examples hdf5 lapack mkl superlu test
 KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://sourceforge/arma/armadillo-10.2.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=3615fdc151f95705b7033d458f29014f
+_md5_=9c760cbaaf695833d27807f5ae9b1d52
diff --git a/metadata/md5-cache/sci-libs/armadillo-10.3.0 b/metadata/md5-cache/sci-libs/armadillo-10.3.0
index 1be4701e2389..263cbf346361 100644
--- a/metadata/md5-cache/sci-libs/armadillo-10.3.0
+++ b/metadata/md5-cache/sci-libs/armadillo-10.3.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack?
 DESCRIPTION=Streamlined C++ linear algebra library
 EAPI=7
 HOMEPAGE=http://arma.sourceforge.net/
-INHERIT=cmake toolchain-funcs multilib eutils
+INHERIT=cmake toolchain-funcs multilib
 IUSE=arpack blas doc examples hdf5 lapack mkl superlu test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://sourceforge/arma/armadillo-10.3.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=0fae2c62057a08ba6873bf1a9cc2542f
+_md5_=d01abd672cd16baaf41c1a009b4db115
diff --git a/metadata/md5-cache/sci-libs/cifparse-obj-7.105 b/metadata/md5-cache/sci-libs/cifparse-obj-7.105
index aef73ee8d781..7aa05a6aa2cb 100644
--- a/metadata/md5-cache/sci-libs/cifparse-obj-7.105
+++ b/metadata/md5-cache/sci-libs/cifparse-obj-7.105
@@ -3,10 +3,10 @@ DEPEND=sys-devel/bison sys-devel/flex
 DESCRIPTION=Provides an object-oriented application interface to information in mmCIF format
 EAPI=6
 HOMEPAGE=http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/index.html
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=PDB
 SLOT=0
 SRC_URI=http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/cifparse-obj-v7.105-prod-src.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
-_md5_=792e51470b0c9dbb73b149d5cf9efb44
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=31c46e4831f82fdd6278f4b258d42207
diff --git a/metadata/md5-cache/sci-libs/dealii-9.2.0 b/metadata/md5-cache/sci-libs/dealii-9.2.0
index 32dee349afb9..65fa08f8f5f7 100644
--- a/metadata/md5-cache/sci-libs/dealii-9.2.0
+++ b/metadata/md5-cache/sci-libs/dealii-9.2.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib adolc? ( sci-libs/adolc ) arp
 DESCRIPTION=Solving partial differential equations with the finite element method
 EAPI=7
 HOMEPAGE=https://www.dealii.org/
-INHERIT=cmake-utils eutils multilib
+INHERIT=cmake-utils multilib
 IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser nanoflann opencascade netcdf p4est petsc scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
@@ -13,4 +13,4 @@ REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/dealii/dealii/releases/download/v9.2.0/dealii-9.2.0.tar.gz doc? ( https://github.com/dealii/dealii/releases/download/v9.2.0/dealii-9.2.0-offline_documentation.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=b739a85d5322e4dee5c07c1cfedd9ec0
+_md5_=db889085ccfbd2e5426300e565fc34a0
diff --git a/metadata/md5-cache/sci-libs/dealii-9999 b/metadata/md5-cache/sci-libs/dealii-9999
index fab6a7e79c2c..cbf6dd72b7ba 100644
--- a/metadata/md5-cache/sci-libs/dealii-9999
+++ b/metadata/md5-cache/sci-libs/dealii-9999
@@ -4,7 +4,7 @@ DEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow adolc? (
 DESCRIPTION=Solving partial differential equations with the finite element method
 EAPI=7
 HOMEPAGE=https://www.dealii.org/
-INHERIT=cmake-utils eutils multilib git-r3
+INHERIT=cmake-utils multilib git-r3
 IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse static-libs sundials symengine trilinos
 LICENSE=LGPL-2.1+
 PROPERTIES=live
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow adolc?
 REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=324f8cdcd7f50d5651ddbbef3e0c3bfc
+_md5_=3e90e0e534e7d96df8c277e96055b667
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5 b/metadata/md5-cache/sci-libs/hdf5-1.10.5
index cfe2961f320d..b67abe22dbb0 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5
@@ -4,7 +4,7 @@ DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
-INHERIT=autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib prefix
+INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
 IUSE=cxx debug examples fortran +hl mpi szip threads zlib
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
@@ -12,5 +12,5 @@ RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl )
 SLOT=0/1.10.5
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=5be849262642b75aba61cacea83f2da8
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	fortran-2	b4796813ccda91c9c0d3463fc90aa969	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=b6bc8615894f8e21e102fa6a103e0111
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1 b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
index 6e61804e2a70..ef010edd7ae4 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
@@ -4,7 +4,7 @@ DEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:
 DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
-INHERIT=autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib prefix
+INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
 IUSE=cxx debug examples fortran +hl mpi szip threads unsupported zlib
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
@@ -12,5 +12,5 @@ RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib
 REQUIRED_USE=!unsupported? ( ?? ( cxx mpi ) threads? ( !cxx !mpi !fortran !hl ) )
 SLOT=0/1.10.5
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=ec4a66bf2295a2678d9227d2d9de4417
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	fortran-2	b4796813ccda91c9c0d3463fc90aa969	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=72ecb4224d6a50593ca71a93771a86a0
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r2 b/metadata/md5-cache/sci-libs/libint-2.6.0-r2
index 64d51941a988..133a97c9e7fb 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r2
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r2
@@ -4,12 +4,12 @@ DEPEND=dev-libs/boost dev-libs/gmp[cxx] doc? ( dev-texlive/texlive-latex dev-tex
 DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian functions
 EAPI=7
 HOMEPAGE=https://github.com/evaleev/libint
-INHERIT=autotools eutils fortran-2 toolchain-funcs
+INHERIT=autotools fortran-2 toolchain-funcs
 IUSE=static-libs doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=2
 SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
-_md5_=de27c8b8f17f7b11f65e3b7d9cb5450e
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	fortran-2	b4796813ccda91c9c0d3463fc90aa969
+_md5_=635a97d6aa5418dfc98be5387f55b9ca
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r4 b/metadata/md5-cache/sci-libs/libint-2.6.0-r4
index ad8c378c409b..5d81e244fcea 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r4
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r4
@@ -4,12 +4,12 @@ DEPEND=dev-libs/boost dev-libs/gmp[cxx] doc? ( dev-texlive/texlive-latex dev-tex
 DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian functions
 EAPI=7
 HOMEPAGE=https://github.com/evaleev/libint
-INHERIT=autotools eutils fortran-2 toolchain-funcs
+INHERIT=autotools fortran-2 toolchain-funcs
 IUSE=static-libs doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=2
 SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
-_md5_=6fc10dc3ecd023ecf78057299bd88982
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	fortran-2	b4796813ccda91c9c0d3463fc90aa969
+_md5_=e9b2ee7024fef816cbe32a3b7768f60c
diff --git a/metadata/md5-cache/sci-libs/libpdb-991112-r1 b/metadata/md5-cache/sci-libs/libpdb-991112-r1
index 199722cc1948..589fac0b534e 100644
--- a/metadata/md5-cache/sci-libs/libpdb-991112-r1
+++ b/metadata/md5-cache/sci-libs/libpdb-991112-r1
@@ -3,11 +3,11 @@ DEPEND=app-arch/sharutils
 DESCRIPTION=PDB Record I/O Libraries -- c version
 EAPI=6
 HOMEPAGE=http://www.cgl.ucsf.edu/Overview/software.html
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/libpdb-991112.shar
-_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
-_md5_=994ad396dd2be24364a99a945c35df0e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=519962201483b7f2bd8ed927cd127ae8
diff --git a/metadata/md5-cache/sci-libs/libsc-2.2-r100 b/metadata/md5-cache/sci-libs/libsc-2.2-r100
index 29e04d998eb3..678579b9e742 100644
--- a/metadata/md5-cache/sci-libs/libsc-2.2-r100
+++ b/metadata/md5-cache/sci-libs/libsc-2.2-r100
@@ -4,7 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 DESCRIPTION=Support for parallel scientific applications
 EAPI=7
 HOMEPAGE=http://www.p4est.org/
-INHERIT=autotools lua-single toolchain-funcs eutils
+INHERIT=autotools lua-single toolchain-funcs
 IUSE=debug examples mpi openmp romio static-libs threads lua_single_target_lua5-1 lua_single_target_lua5-2
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
@@ -12,5 +12,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=2f284599c1428f2855127a318e065442
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=e15087fd7d75027baf01aec757af2e52
diff --git a/metadata/md5-cache/sci-libs/libsc-9999 b/metadata/md5-cache/sci-libs/libsc-9999
index ad8f4627c742..52e08d86d163 100644
--- a/metadata/md5-cache/sci-libs/libsc-9999
+++ b/metadata/md5-cache/sci-libs/libsc-9999
@@ -4,12 +4,12 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 DESCRIPTION=Support for parallel scientific applications
 EAPI=7
 HOMEPAGE=http://www.p4est.org/
-INHERIT=autotools lua-single toolchain-funcs eutils git-r3
+INHERIT=autotools lua-single toolchain-funcs git-r3
 IUSE=debug examples mpi openmp romio static-libs threads lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=6d02426f213809648edf7150468c13ff
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=d0bd523b37765b314d3ae4dfff112879
diff --git a/metadata/md5-cache/sci-libs/lrslib-062 b/metadata/md5-cache/sci-libs/lrslib-062
index 9670ddafa253..dc6d840295e8 100644
--- a/metadata/md5-cache/sci-libs/lrslib-062
+++ b/metadata/md5-cache/sci-libs/lrslib-062
@@ -3,12 +3,12 @@ DEPEND=gmp? ( dev-libs/gmp:0= mpi? ( virtual/mpi ) )
 DESCRIPTION=Self-contained C implementation of the reverse search algorithm
 EAPI=6
 HOMEPAGE=http://cgm.cs.mcgill.ca/~avis/C/lrs.html
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs
 IUSE=gmp mpi
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gmp? ( dev-libs/gmp:0= mpi? ( virtual/mpi ) )
 SLOT=0
 SRC_URI=http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-062.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
-_md5_=0d81d2e57d59bd90babdf73a7e9081f9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d071c682b66423529d933a62884bf046
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3
index f69b2d0e2855..dbf33cc17216 100644
--- a/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3
+++ b/metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3
@@ -3,7 +3,7 @@ DEPEND=sci-libs/netcdf dev-lang/cfortran sys-devel/gnuconfig >=app-portage/elt-p
 DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=6
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-INHERIT=autotools eutils fortran-2 flag-o-matic ltprune
+INHERIT=autotools fortran-2 flag-o-matic ltprune
 IUSE=examples static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
@@ -11,4 +11,4 @@ RDEPEND=sci-libs/netcdf virtual/fortran
 SLOT=0/6
 SRC_URI=https://github.com/Unidata/netcdf-fortran/archive/v4.4.3.tar.gz -> netcdf-fortran-4.4.3.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	fortran-2	b4796813ccda91c9c0d3463fc90aa969	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=a63d332052c99a54f1f4f016b32ef4f4
+_md5_=c4f53edcc1793cd309a1dce4ef9bc3e7
diff --git a/metadata/md5-cache/sci-libs/p4est-2.2-r100 b/metadata/md5-cache/sci-libs/p4est-2.2-r100
index 33dd5a56bbb4..84f976dfdec9 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.2-r100
+++ b/metadata/md5-cache/sci-libs/p4est-2.2-r100
@@ -4,7 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
 EAPI=7
 HOMEPAGE=http://www.p4est.org/
-INHERIT=autotools lua-single toolchain-funcs eutils
+INHERIT=autotools lua-single toolchain-funcs
 IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -12,5 +12,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/p4est/archive/v2.2.tar.gz -> p4est-2.2.tar.gz https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=399b375ccf8e487b5cd3113e1747451b
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=5b9d80a2c39cd47b0a752b0d15230e9d
diff --git a/metadata/md5-cache/sci-libs/p4est-9999 b/metadata/md5-cache/sci-libs/p4est-9999
index bdfa35dd345c..3f41b144b2e2 100644
--- a/metadata/md5-cache/sci-libs/p4est-9999
+++ b/metadata/md5-cache/sci-libs/p4est-9999
@@ -4,12 +4,12 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
 EAPI=7
 HOMEPAGE=http://www.p4est.org/
-INHERIT=autotools lua-single toolchain-funcs eutils git-r3
+INHERIT=autotools lua-single toolchain-funcs git-r3
 IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=c3832d9f8afcaf6e6db80b355bf87f14
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=5b68577f1ef9b64ea8812ad1ff1d03ba
diff --git a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7 b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
index b7250a0e5641..1aeb7db15b54 100644
--- a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
+++ b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
@@ -3,12 +3,12 @@ DEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/
 DESCRIPTION=FORTRAN/C device-independent scientific graphic library
 EAPI=6
 HOMEPAGE=https://www.astro.caltech.edu/~tjp/pgplot/
-INHERIT=eutils fortran-2 flag-o-matic toolchain-funcs
+INHERIT=fortran-2 flag-o-matic toolchain-funcs
 IUSE=doc motif static-libs tk
 KEYWORDS=amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 RDEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/motif:= ) tk? ( dev-lang/tk:= ) virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.astro.caltech.edu/pub/pgplot/pgplot522.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	fortran-2	b4796813ccda91c9c0d3463fc90aa969	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=28c36c5c31e2fd31977a7aba39c45a41
+_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	fortran-2	b4796813ccda91c9c0d3463fc90aa969	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=d6282c23a7da12e45a2a2214bf0c78ed
diff --git a/metadata/md5-cache/sci-libs/rosetta-db-3.4 b/metadata/md5-cache/sci-libs/rosetta-db-3.4
index 490826fa73a3..0494b3e10f16 100644
--- a/metadata/md5-cache/sci-libs/rosetta-db-3.4
+++ b/metadata/md5-cache/sci-libs/rosetta-db-3.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install nofetch
 DESCRIPTION=Essential database for rosetta
 EAPI=6
 HOMEPAGE=http://www.rosettacommons.org
-INHERIT=eutils vcs-clean
+INHERIT=vcs-clean
 KEYWORDS=~amd64 ~x86
 LICENSE=rosetta
 RESTRICT=fetch binchecks strip
 SLOT=0
 SRC_URI=rosetta3.4_database.tgz
-_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
-_md5_=5bbc71419aad2f4ee6fb8e2db8d974d2
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=181fb3379bb252513edaf5f03ae5d7c3
diff --git a/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1 b/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1
index d6a827437847..0b83a3ce49b1 100644
--- a/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1
+++ b/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install nofetch prepare
 DESCRIPTION=Fragment library for rosetta
 EAPI=6
 HOMEPAGE=http://www.rosettacommons.org
-INHERIT=eutils flag-o-matic prefix toolchain-funcs vcs-clean
+INHERIT=flag-o-matic prefix toolchain-funcs vcs-clean
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=rosetta
 RDEPEND=sci-biology/ncbi-tools sci-biology/update-blastdb sci-biology/psipred
 RESTRICT=fetch
 SLOT=0
 SRC_URI=rosetta3.1_fragments.tgz
-_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	c0964e43ba712cb933da5f65b958fa88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=3146064850bdb8ce07be619963976d0e
+_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	c0964e43ba712cb933da5f65b958fa88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=5d2d5821d119722d7a92c246be648dc8
diff --git a/metadata/md5-cache/sci-libs/superlu_mt-3.1 b/metadata/md5-cache/sci-libs/superlu_mt-3.1
index 5952e046a66c..bfd44dd15a1c 100644
--- a/metadata/md5-cache/sci-libs/superlu_mt-3.1
+++ b/metadata/md5-cache/sci-libs/superlu_mt-3.1
@@ -3,7 +3,7 @@ DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh )
 DESCRIPTION=Multithreaded sparse LU factorization library
 EAPI=6
 HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
-INHERIT=eutils toolchain-funcs versionator
+INHERIT=toolchain-funcs versionator
 IUSE=doc examples int64 openmp static-libs test threads
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( openmp threads )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU/superlu_mt_3.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=053b329e6b02c27954d7c8eb0370631e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=e5464f5029047a47b6d2ac102d7b5a9b
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.5.1 b/metadata/md5-cache/sci-libs/votca-tools-1.5.1
index ee4803857629..dc4f550e3e88 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-1.5.1
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.5.1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 fftw? ( sci-libs/fftw
 DESCRIPTION=Votca tools library
 EAPI=6
 HOMEPAGE=http://www.votca.org
-INHERIT=cmake-utils eutils multilib
+INHERIT=cmake-utils multilib
 IUSE=doc +fftw sqlite
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 fftw? ( sci-libs/fft
 SLOT=0
 SRC_URI=https://github.com/votca/tools/archive/v1.5.1.tar.gz -> votca-tools-1.5.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=e2087c9810bd8edfa9cb8c7ceba4e73c
+_md5_=7026001aaea0f7f0b7e1c14bb3cffcc6
diff --git a/metadata/md5-cache/sci-mathematics/jags-4.2.0 b/metadata/md5-cache/sci-mathematics/jags-4.2.0
index 68bdf05bd008..d2037fd68386 100644
--- a/metadata/md5-cache/sci-mathematics/jags-4.2.0
+++ b/metadata/md5-cache/sci-mathematics/jags-4.2.0
@@ -3,12 +3,12 @@ DEPEND=virtual/blas virtual/lapack virtual/pkgconfig doc? ( virtual/latex-base d
 DESCRIPTION=Just Another Gibbs Sampler for Bayesian MCMC simulation
 EAPI=6
 HOMEPAGE=http://mcmc-jags.sourceforge.net/
-INHERIT=eutils ltprune toolchain-funcs
+INHERIT=ltprune toolchain-funcs
 IUSE=doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.2.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
-_md5_=524a0799000e94663c825a7602b6c552
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=5e8faf82a98fd622cc2eb8308f0d5c16
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.3.0 b/metadata/md5-cache/sci-mathematics/normaliz-3.3.0
index c3538324f5e7..ee86dac06e24 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.3.0
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.3.0
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp:=[cxx] dev-libs/boost sys-devel/gnuconfig >=app-portage/elt-
 DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=6
 HOMEPAGE=http://www.mathematik.uni-osnabrueck.de/normaliz/
-INHERIT=autotools toolchain-funcs eutils ltprune
+INHERIT=autotools toolchain-funcs ltprune
 IUSE=doc extras openmp static-libs
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/gmp:=[cxx]
 SLOT=0/3
 SRC_URI=https://github.com/Normaliz/Normaliz/archive/v3.3.0.tar.gz -> normaliz-3.3.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
-_md5_=4dc8d6dc565b0049b685cf4a3cec37bf
+_md5_=d1b4fed9833e9c7d6ccc99d92ee34cd3
diff --git a/metadata/md5-cache/sci-mathematics/octave-epstk-2.4 b/metadata/md5-cache/sci-mathematics/octave-epstk-2.4
index 776514914748..b4ae6f5c4931 100644
--- a/metadata/md5-cache/sci-mathematics/octave-epstk-2.4
+++ b/metadata/md5-cache/sci-mathematics/octave-epstk-2.4
@@ -8,5 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/octave app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/octave-epstk/octave-epstk_2.4.orig.tar.bz2 mirror://debian/pool/main/o/octave-epstk/octave-epstk_2.4-1.debian.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9cd425b97ddedb4be70a0c829a0d85b6
+_md5_=cb3b1eec0b5bb48f032ebac872663b8f
diff --git a/metadata/md5-cache/sci-mathematics/polymake-3.0_p2 b/metadata/md5-cache/sci-mathematics/polymake-3.0_p2
index be4962107a01..e1753e0f38d6 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-3.0_p2
+++ b/metadata/md5-cache/sci-mathematics/polymake-3.0_p2
@@ -3,7 +3,7 @@ DEPEND=dev-lang/perl dev-libs/gmp:0= dev-libs/mpfr:0 dev-libs/libxml2:2 dev-libs
 DESCRIPTION=research tool for polyhedral geometry and combinatorics
 EAPI=6
 HOMEPAGE=https://polymake.org
-INHERIT=eutils flag-o-matic
+INHERIT=flag-o-matic
 IUSE=+cdd lrs ppl bliss group +libnormaliz singular libpolymake
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl dev-libs/gmp:0= dev-libs/mpfr:0 dev-libs/libxml2:2 dev-lib
 REQUIRED_USE=group? ( cdd lrs )
 SLOT=0
 SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-3.0r2.tar.bz2
-_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	c0964e43ba712cb933da5f65b958fa88
-_md5_=9b1072d5478d453a77e0cf0c62c313c0
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=4efbfc167da92740421c09599ec5b8e3
diff --git a/metadata/md5-cache/sci-mathematics/prover9-2009.11a b/metadata/md5-cache/sci-mathematics/prover9-2009.11a
index 6f7fdc52c0ef..e749cde0eba5 100644
--- a/metadata/md5-cache/sci-mathematics/prover9-2009.11a
+++ b/metadata/md5-cache/sci-mathematics/prover9-2009.11a
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Automated theorem prover for first-order and equational logic
 EAPI=7
 HOMEPAGE=https://www.cs.unm.edu/~mccune/mace4/
+INHERIT=toolchain-funcs
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz https://dev.gentoo.org/~jlec/distfiles/LADR-2009-11A-makefile.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aff4b2d5d4ef65ce5a08c32a9699d636
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=811bbc769e438813a3e35c82ded80d21
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.13.1 b/metadata/md5-cache/sci-mathematics/slepc-3.13.1
index defb543edfbc..71b56141fcd6 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.13.1
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.13.1
@@ -3,12 +3,12 @@ DEPEND==sci-mathematics/petsc-3.13*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi
 DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
 EAPI=7
 HOMEPAGE=https://slepc.upv.es/
-INHERIT=eutils flag-o-matic python-any-r1 toolchain-funcs
+INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=complex-scalars doc mpi
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND==sci-mathematics/petsc-3.13*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.13.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=ca2b1f93d30225b352626b73000ab453
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=9c9ad2a8464dd031479a2a5ad4e2d536
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.14.2 b/metadata/md5-cache/sci-mathematics/slepc-3.14.2
index 8b26347537f7..c319b922de4e 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.14.2
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.14.2
@@ -3,12 +3,12 @@ DEPEND==sci-mathematics/petsc-3.14*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi
 DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
 EAPI=7
 HOMEPAGE=https://slepc.upv.es/
-INHERIT=eutils flag-o-matic python-any-r1 toolchain-funcs
+INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=complex-scalars doc mpi
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND==sci-mathematics/petsc-3.14*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.14.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=4c393ef4fd9df9a000234c420a309e23
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=9c9ad2a8464dd031479a2a5ad4e2d536
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.15.0 b/metadata/md5-cache/sci-mathematics/slepc-3.15.0
index 260ae577b2c8..0aa669c28574 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.15.0
@@ -3,12 +3,12 @@ DEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi
 DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
 EAPI=7
 HOMEPAGE=https://slepc.upv.es/
-INHERIT=eutils flag-o-matic python-any-r1 toolchain-funcs
+INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=complex-scalars doc mpi
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.15.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=4c393ef4fd9df9a000234c420a309e23
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=9c9ad2a8464dd031479a2a5ad4e2d536
diff --git a/metadata/md5-cache/sci-physics/herwig-6.5.21-r1 b/metadata/md5-cache/sci-physics/herwig-6.5.21-r1
index ee07bf227c07..fcdaa31f092b 100644
--- a/metadata/md5-cache/sci-physics/herwig-6.5.21-r1
+++ b/metadata/md5-cache/sci-physics/herwig-6.5.21-r1
@@ -3,7 +3,7 @@ DEPEND=!sci-physics/cernlib-montecarlo[herwig] sys-devel/gnuconfig >=app-portage
 DESCRIPTION=High Energy Physics Event Generator
 EAPI=6
 HOMEPAGE=https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/
-INHERIT=autotools eutils fortran-2 ltprune versionator
+INHERIT=autotools fortran-2 ltprune versionator
 IUSE=doc static-libs
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
@@ -12,4 +12,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6521.f https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6521.inc https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/HERWIG65.INC doc? ( https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/hw65_manual.pdf )
 _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	fortran-2	b4796813ccda91c9c0d3463fc90aa969	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=826064800ac07c2bad916223e2299d47
+_md5_=789847b61b2b999ffff77454d4c88a87
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1 b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
index 0248db4ec1cb..37bc4dbb8964 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png?
 DESCRIPTION=Graphics Layout Engine
 EAPI=6
 HOMEPAGE=http://glx.sourceforge.net/
-INHERIT=eutils elisp-common flag-o-matic autotools
+INHERIT=elisp-common flag-o-matic autotools
 IUSE=X jpeg png tiff doc emacs vim-syntax
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 emacs? ( GPL-2 )
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( >=app-editors/emacs-23.1:* ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=ce35930ca2410d436b628e37c9dbc097
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	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	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=7079fc13cb3b06a56b92c5fc1ac52b4e
diff --git a/metadata/md5-cache/sys-apps/agedu-20200617 b/metadata/md5-cache/sys-apps/agedu-20200617
index 81472e2c9cf3..a01ed8c113aa 100644
--- a/metadata/md5-cache/sys-apps/agedu-20200617
+++ b/metadata/md5-cache/sys-apps/agedu-20200617
@@ -4,11 +4,11 @@ DEPEND=doc? ( app-doc/halibut )
 DESCRIPTION=A utility for tracking down wasted disk space
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/agedu/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=doc ipv6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-20200617.cec3021.tar.gz -> agedu-20200617.cec3021.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=5534177f25572393ad753ac0dfb07d1b
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=b327e495dde72eb73249205edaea46ab
diff --git a/metadata/md5-cache/sys-apps/agedu-20200705 b/metadata/md5-cache/sys-apps/agedu-20200705
index 33c212e89aad..ffeb04fba58f 100644
--- a/metadata/md5-cache/sys-apps/agedu-20200705
+++ b/metadata/md5-cache/sys-apps/agedu-20200705
@@ -4,11 +4,11 @@ DEPEND=doc? ( app-doc/halibut )
 DESCRIPTION=A utility for tracking down wasted disk space
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/agedu/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=doc ipv6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/agedu/agedu-20200705.2a7d4a2.tar.gz -> agedu-20200705.2a7d4a2.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=450c8fdb6a26080052ea28378778dfd6
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=4ab9e1feb1c45ced2b149876afe93f86
diff --git a/metadata/md5-cache/sys-apps/biosdisk-1.01 b/metadata/md5-cache/sys-apps/biosdisk-1.01
index 0b5da5a01cce..03e133b7fdaa 100644
--- a/metadata/md5-cache/sys-apps/biosdisk-1.01
+++ b/metadata/md5-cache/sys-apps/biosdisk-1.01
@@ -7,5 +7,4 @@ LICENSE=GPL-2+
 RDEPEND=app-cdr/cdrtools sys-boot/grub sys-boot/syslinux
 SLOT=0
 SRC_URI=https://github.com/dell/biosdisk/archive/1.01.tar.gz -> biosdisk-1.01.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9f4a5559f146ed606dc5cef48a023eb6
+_md5_=37e58d25a369b012daab0ad6373ffe1c
diff --git a/metadata/md5-cache/sys-apps/dtc-1.5.0 b/metadata/md5-cache/sys-apps/dtc-1.5.0
index 55a245da6c3d..cb6c97dab623 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.5.0
+++ b/metadata/md5-cache/sys-apps/dtc-1.5.0
@@ -3,11 +3,11 @@ DEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DESCRIPTION=Open Firmware device tree compiler
 EAPI=6
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
-INHERIT=multilib toolchain-funcs eutils
+INHERIT=multilib toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/dtc/dtc-1.5.0.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=86e391ac7fd008a07b37bd0a5c8fc61a
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3ce2a175bb65a3ab06c35213f067f522
diff --git a/metadata/md5-cache/sys-apps/dtc-1.5.0-r2 b/metadata/md5-cache/sys-apps/dtc-1.5.0-r2
index 50c441a45286..5292407fe7d1 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.5.0-r2
+++ b/metadata/md5-cache/sys-apps/dtc-1.5.0-r2
@@ -4,11 +4,12 @@ DEPEND=yaml? ( dev-libs/libyaml )
 DESCRIPTION=Open Firmware device tree compiler
 EAPI=7
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
+INHERIT=multilib toolchain-funcs
 IUSE=static-libs yaml
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/dtc/dtc-1.5.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c66a19384131f449775118206a6b9d92
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b8e6ada596b7f133a7b0adf14f5abd74
diff --git a/metadata/md5-cache/sys-apps/dtc-1.6.0 b/metadata/md5-cache/sys-apps/dtc-1.6.0
index dd206cab71c6..44e8b579f3e8 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.6.0
+++ b/metadata/md5-cache/sys-apps/dtc-1.6.0
@@ -4,11 +4,12 @@ DEPEND=yaml? ( dev-libs/libyaml )
 DESCRIPTION=Open Firmware device tree compiler
 EAPI=7
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
+INHERIT=multilib toolchain-funcs
 IUSE=static-libs yaml
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/dtc/dtc-1.6.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba4b2b2dd62fbfb73379ea6965aa147f
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=912369cc13bb38050edc98547c7f8d3b
diff --git a/metadata/md5-cache/sys-apps/dtc-9999 b/metadata/md5-cache/sys-apps/dtc-9999
index 4f575338131f..2c969b813bcc 100644
--- a/metadata/md5-cache/sys-apps/dtc-9999
+++ b/metadata/md5-cache/sys-apps/dtc-9999
@@ -4,11 +4,11 @@ DEPEND=yaml? ( dev-libs/libyaml )
 DESCRIPTION=Open Firmware device tree compiler
 EAPI=7
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
-INHERIT=multilib toolchain-funcs eutils git-r3
+INHERIT=multilib toolchain-funcs git-r3
 IUSE=static-libs yaml
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=yaml? ( dev-libs/libyaml )
 SLOT=0
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=b23acac381521d989c6d3b87867bca8f
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=3f6ff2bf77c8ba56f7bd906625cfce9e
diff --git a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1 b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1
index 6abdc4fcc91f..bbf4fda95349 100644
--- a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1
@@ -3,7 +3,7 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ope
 DESCRIPTION=Utility for controlling IPMI enabled devices.
 EAPI=6
 HOMEPAGE=http://ipmitool.sf.net/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=libressl openbmc openipmi static
 KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86
 LICENSE=BSD
@@ -11,4 +11,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) op
 SLOT=0
 SRC_URI=https://github.com/ipmitool/ipmitool/archive/7fd7c0f2ba39e223868a8d83d81d4074f057d6fc.tar.gz -> ipmitool-1.8.18_p20201004.tar.gz https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.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
-_md5_=3fbded8015b2cb8b6f58af236baf78c0
+_md5_=fe0339acc6355c237babcec3a915a4ae
diff --git a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r2 b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r2
index cce4b3087129..5f72044b96c2 100644
--- a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r2
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r2
@@ -4,7 +4,7 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ope
 DESCRIPTION=Utility for controlling IPMI enabled devices.
 EAPI=7
 HOMEPAGE=http://ipmitool.sf.net/
-INHERIT=autotools eutils flag-o-matic systemd
+INHERIT=autotools flag-o-matic systemd
 IUSE=libressl openbmc openipmi static
 KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
@@ -12,4 +12,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) op
 SLOT=0
 SRC_URI=https://github.com/ipmitool/ipmitool/archive/7fd7c0f2ba39e223868a8d83d81d4074f057d6fc.tar.gz -> ipmitool-1.8.18_p20201004.tar.gz https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=36ec8e39ff2b3f2c562a435737c4dcb0
+_md5_=20692bcc8aa358cb275ce6f306ad5274
diff --git a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3 b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
index a316aebbf923..18829dbc0b89 100644
--- a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
@@ -4,7 +4,7 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ope
 DESCRIPTION=Utility for controlling IPMI enabled devices.
 EAPI=7
 HOMEPAGE=http://ipmitool.sf.net/
-INHERIT=autotools eutils flag-o-matic systemd
+INHERIT=autotools flag-o-matic systemd
 IUSE=libressl openbmc openipmi static
 KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
@@ -12,4 +12,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) op
 SLOT=0
 SRC_URI=https://github.com/ipmitool/ipmitool/archive/7fd7c0f2ba39e223868a8d83d81d4074f057d6fc.tar.gz -> ipmitool-1.8.18_p20201004.tar.gz https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=1538818770699e8898bbba94330eb0b5
+_md5_=57d7bd4a609c640d27a6f7332dd8ce85
diff --git a/metadata/md5-cache/sys-apps/msr-tools-1.3 b/metadata/md5-cache/sys-apps/msr-tools-1.3
index c0928b33b750..d0bf2a604d49 100644
--- a/metadata/md5-cache/sys-apps/msr-tools-1.3
+++ b/metadata/md5-cache/sys-apps/msr-tools-1.3
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Utilities allowing the read and write of CPU model-specific registers (MSR)
 EAPI=6
 HOMEPAGE=https://01.org/msr-tools
-INHERIT=eutils linux-info toolchain-funcs
+INHERIT=linux-info toolchain-funcs
 IUSE=kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/msr-tools/msr-tools-1.3.zip
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=515f943da2af5095554530e2627bf658
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=fecfd715b71422998d998c02382118bd
diff --git a/metadata/md5-cache/sys-apps/proot-5.1.0-r2 b/metadata/md5-cache/sys-apps/proot-5.1.0-r2
index 101191d496bb..92c88517a4eb 100644
--- a/metadata/md5-cache/sys-apps/proot-5.1.0-r2
+++ b/metadata/md5-cache/sys-apps/proot-5.1.0-r2
@@ -3,6 +3,7 @@ DEPEND=care? ( app-arch/libarchive:0= ) sys-libs/talloc care? ( dev-libs/uthash
 DESCRIPTION=User-space implementation of chroot, mount --bind, and binfmt_misc
 EAPI=7
 HOMEPAGE=https://proot-me.github.io
+INHERIT=toolchain-funcs
 IUSE=care test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=care? ( app-arch/libarchive:0= ) sys-libs/talloc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/proot-me/PRoot/archive/v5.1.0.tar.gz -> proot-5.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ed467c837769dc6da0d9350ca22d0d9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=011573ddc5a41b777d4b5b02368b5924
diff --git a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r6 b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r6
index b39455f4c943..c3a965b44b85 100644
--- a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r6
+++ b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r6
@@ -3,11 +3,11 @@ DEPEND=virtual/os-headers
 DESCRIPTION=Various sparc utilities from Debian GNU/Linux
 EAPI=6
 HOMEPAGE=https://packages.debian.org/sparc-utils
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=-* sparc
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.13-r1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9.orig.tar.gz mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9-4.diff.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
-_md5_=9a3368e6f38cc03a80271011bbfd3347
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=eede0c8cdea93712b1a48fb053aeb427
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
index 8af9549f8a45..c6f71eb66d7c 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
@@ -3,7 +3,7 @@ DEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 DESCRIPTION=NSS module for name lookups using LDAP
 EAPI=6
 HOMEPAGE=https://arthurdejong.org/nss-pam-ldapd/
-INHERIT=eutils prefix user python-r1 multilib multilib-minimal systemd s6 tmpfiles
+INHERIT=prefix user python-r1 multilib multilib-minimal systemd s6 tmpfiles
 IUSE=debug kerberos +pam pynslcd sasl test +utils python_targets_python3_7 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 x86
 LICENSE=LGPL-2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=utils? ( || ( python_targets_python3_7 ) ) test? ( || ( python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.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	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	s6	599dcc78e04aacd51c16d9b0652f65f2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=f552ff3229a45307345a35db3cfb6ffa
+_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	s6	599dcc78e04aacd51c16d9b0652f65f2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=c1807150caa3df3d8f984f336f517647
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
index 9ad2654d5dc1..6dd5768cb516 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
@@ -4,7 +4,7 @@ DEPEND=acct-group/nslcd acct-user/nslcd net-nds/openldap[abi_x86_32(-)?,abi_x86_
 DESCRIPTION=NSS module for name lookups using LDAP
 EAPI=7
 HOMEPAGE=https://arthurdejong.org/nss-pam-ldapd/
-INHERIT=eutils prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
+INHERIT=prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
 IUSE=debug kerberos +pam pynslcd sasl test +utils python_targets_python3_7 python_targets_python3_8 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 x86
 LICENSE=LGPL-2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=utils? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	s6	599dcc78e04aacd51c16d9b0652f65f2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=6c6103233091e4916a7570dd152e6a30
+_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	s6	599dcc78e04aacd51c16d9b0652f65f2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=d1dd4841697932344834fb620878e54d
diff --git a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2 b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
index 94f1dfba9286..453672e2bb46 100644
--- a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
+++ b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
@@ -3,7 +3,7 @@ DEPEND=pam? ( sys-libs/pam ) pskc? ( dev-libs/xmlsec ) test? ( dev-libs/libxml2
 DESCRIPTION=Toolkit for using one-time password authentication with HOTP/TOTP algorithms
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/oath-toolkit/
-INHERIT=pam eutils autotools
+INHERIT=pam autotools
 IUSE=pam pskc test
 KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=GPL-3 LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.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	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=c01f1d646f87e66f2839fc68b2fcfa3b
+_md5_=ea574de34278144eca62d41a1b92e8b2
diff --git a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6 b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6
index 3e1ee39c6918..cbf1cecef434 100644
--- a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6
+++ b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6
@@ -4,11 +4,11 @@ DEPEND=net-libs/libnsl:0= >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 DESCRIPTION=PAM interface for the S/Key authentication system
 EAPI=7
 HOMEPAGE=http://freshmeat.net/projects/pam_skey/
-INHERIT=eutils pam autotools multilib readme.gentoo-r1
+INHERIT=pam autotools multilib readme.gentoo-r1
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=net-libs/libnsl:0= >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 SLOT=0
 SRC_URI=http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz https://dev.gentoo.org/~ulm/distfiles/pam_skey-1.1.5-patches-7.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=290abc22725c9e9622e133ceab8bd7ac
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=ab88622debb014dfbf902d44583ea141
diff --git a/metadata/md5-cache/sys-block/blktrace-1.1.0-r1 b/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
index 62a933780cbc..c58ed1c88b31 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libaio sys-kernel/linux-headers doc? ( virtual/latex-base >=app-
 DESCRIPTION=btrace can show detailed info about what is happening on a block device io queue
 EAPI=6
 HOMEPAGE=https://git.kernel.dk/cgit/blktrace/
-INHERIT=eutils toolchain-funcs flag-o-matic linux-info
+INHERIT=toolchain-funcs flag-o-matic linux-info
 IUSE=doc kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
-_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	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=55263e21b154e6175c888a694a662392
+_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	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=2ba5279e836370c2a45a6633f310a278
diff --git a/metadata/md5-cache/sys-block/megarc-1.11-r2 b/metadata/md5-cache/sys-block/megarc-1.11-r2
index 4a2f987577bb..f6fcc63b5471 100644
--- a/metadata/md5-cache/sys-block/megarc-1.11-r2
+++ b/metadata/md5-cache/sys-block/megarc-1.11-r2
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip doc? ( app-text/antiword )
 DESCRIPTION=LSI Logic MegaRAID Text User Interface management tool
 EAPI=5
 HOMEPAGE=http://www.avagotech.com/cs/Satellite?q=megacli&pagename=AVG2%2FsearchLayout&locale=avg_en&within=megacli&Search=megarc&srch-radio=new&Submit=Search
+INHERIT=multilib
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=LSI
@@ -10,4 +11,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.avagotech.com/docs-and-downloads/legacy-raid-controllers/legacy-raid-controllers-common-files/ut_linux_megarc_1-11.zip http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/README_FOR_ut_linux_megarc_1-11-zip.txt
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44d54405fa1503af87a47c1621535f6a
+_md5_=5101de1aeb7e0854b3bb06b8be820b34
diff --git a/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3 b/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
index 79cbbe8b6104..745b8e3fb257 100644
--- a/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
+++ b/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Alpha Linux boot loader for SRM
 EAPI=7
 HOMEPAGE=http://aboot.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=-* ~alpha
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://aboot.sourceforge.net/tarballs/aboot-1.0_pre20040408.tar.bz2 mirror://gentoo/gentoo-headers-base-2.6.22.tar.bz2 mirror://gentoo/aboot_gentoo.diff.bz2 https://dev.gentoo.org/~armin76/dist/aboot_gentoo.diff.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43baab453b4aff965914ed11fde57750
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=fa5304816043220566feda29529848e0
diff --git a/metadata/md5-cache/sys-boot/elilo-3.16-r4 b/metadata/md5-cache/sys-boot/elilo-3.16-r4
index fff4f23f8e42..9252956455c2 100644
--- a/metadata/md5-cache/sys-boot/elilo-3.16-r4
+++ b/metadata/md5-cache/sys-boot/elilo-3.16-r4
@@ -3,11 +3,11 @@ DEPEND=>=sys-boot/gnu-efi-3.0g dev-util/patchutils
 DESCRIPTION=Linux boot loader for EFI-based systems such as IA-64
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/elilo/
-INHERIT=toolchain-funcs eutils multilib
+INHERIT=toolchain-funcs multilib
 KEYWORDS=~amd64 ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-boot/efibootmgr sys-fs/dosfstools[compat]
 SLOT=0
 SRC_URI=mirror://sourceforge/elilo/elilo-3.16-all.tar.gz mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.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
-_md5_=a0c2840458b3a0891b7c14047d7208b1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=6a3e02d74c33f96ac652ac01151f1e6e
diff --git a/metadata/md5-cache/sys-boot/milo-2.4.18 b/metadata/md5-cache/sys-boot/milo-2.4.18
index 01d28f60740c..b00444968fe9 100644
--- a/metadata/md5-cache/sys-boot/milo-2.4.18
+++ b/metadata/md5-cache/sys-boot/milo-2.4.18
@@ -3,11 +3,11 @@ DEPEND=sys-apps/kbd >=sys-apps/sed-4
 DESCRIPTION=The Alpha MIniLOader, for Alpha Machines without SRM
 EAPI=7
 HOMEPAGE=http://milo.core-systems.de/
-INHERIT=flag-o-matic eutils
+INHERIT=flag-o-matic
 KEYWORDS=-* ~alpha
 LICENSE=MILO
 RDEPEND=sys-fs/mtools
 SLOT=0
 SRC_URI=http://www.suse.de/~stepan/source/milo-2.2-18.tar.bz2 https://www.kernel.org/pub/linux/kernel/v2.2/linux-2.2.25.tar.bz2 https://dev.gentoo.org/~taviso/milo/ldmilo-patched-20010430 http://ftp.namesys.com/pub/reiserfs-for-2.2/linux-2.2.20-reiserfs-3.5.35.diff.bz2 https://dev.gentoo.org/~taviso/milo/linload.exe http://www.ibiblio.org/pub/Linux/docs/HOWTO/MILO-HOWTO
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=4c8140f664d3ea2b0208b5a11998490a
+_md5_=26be7df6be95bbbbd0b6a23d2521ace0
diff --git a/metadata/md5-cache/sys-boot/tboot-1.9.11 b/metadata/md5-cache/sys-boot/tboot-1.9.11
index 7c46bc478064..4898578f04ea 100644
--- a/metadata/md5-cache/sys-boot/tboot-1.9.11
+++ b/metadata/md5-cache/sys-boot/tboot-1.9.11
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tboot/tboot-1.9.11.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	mount-boot	060ced4c5e0fd737db17cbb609bbf557
-_md5_=549e7d6f207a2cb82844d5d1251b7909
+_md5_=70171dfeeda4d123fe9e1d94debb9f16
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1 b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
index ddfbfa1cbcae..339d3bbaf7eb 100644
--- a/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
+++ b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
@@ -3,12 +3,12 @@ DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libres
 DESCRIPTION=Chrome OS verified boot tools
 EAPI=6
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=libressl minimal static
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=BSD
 RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= dev-libs/libzip:= !minimal? ( dev-libs/libyaml:= app-arch/xz-utils:= ) ) elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0
 SRC_URI=mirror://gentoo/vboot-utils-72_p20181229.tar.xz https://dev.gentoo.org/~zmedico/dist/vboot-utils-72_p20181229.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
-_md5_=11598b492418d85f20827087b831f59c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8eeee9d309ecfbe3aee36b22cc4718f7
diff --git a/metadata/md5-cache/sys-cluster/cinder-16.2.1 b/metadata/md5-cache/sys-cluster/cinder-16.2.1
index 5fc9edee61f1..2341ac341a53 100644
--- a/metadata/md5-cache/sys-cluster/cinder-16.2.1
+++ b/metadata/md5-cache/sys-cluster/cinder-16.2.1
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target
 DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
 EAPI=7
 HOMEPAGE=https://launchpad.net/cinder
-INHERIT=distutils-r1 eutils linux-info
+INHERIT=distutils-r1 linux-info
 IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_7 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-16.2.1 https://tarballs.openstack.org/cinder/cinder-16.2.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=440bb69c1884e2a8e62ced83432ad7aa
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=28391522c152297cce57304c40c194c7
diff --git a/metadata/md5-cache/sys-cluster/cinder-17.1.0 b/metadata/md5-cache/sys-cluster/cinder-17.1.0
index 9604c0e8bd44..baf0a1878ae6 100644
--- a/metadata/md5-cache/sys-cluster/cinder-17.1.0
+++ b/metadata/md5-cache/sys-cluster/cinder-17.1.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-5.4.1[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
 EAPI=7
 HOMEPAGE=https://launchpad.net/cinder
-INHERIT=distutils-r1 eutils linux-info
+INHERIT=distutils-r1 linux-info
 IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-17.1.0 https://tarballs.openstack.org/cinder/cinder-17.1.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=fd04e280429b89fc981ef318244de98a
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=628c8f2c7547e6a299e7f3f7d4423a69
diff --git a/metadata/md5-cache/sys-cluster/cinder-2020.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
index 7e05b2a088e8..2b7e122c10e3 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target
 DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
 EAPI=7
 HOMEPAGE=https://launchpad.net/cinder
-INHERIT=distutils-r1 eutils linux-info git-r3
+INHERIT=distutils-r1 linux-info git-r3
 IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_7 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-2020.1.9999
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=ce485c312d1457c4eba59df25efaaa7e
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=fcfe58b1645f082821bb77f6bcf0b204
diff --git a/metadata/md5-cache/sys-cluster/cinder-2020.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2020.2.9999
index 437bd543dad7..dfb927289592 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2020.2.9999
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-5.4.1[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
 EAPI=7
 HOMEPAGE=https://launchpad.net/cinder
-INHERIT=distutils-r1 eutils linux-info git-r3
+INHERIT=distutils-r1 linux-info git-r3
 IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_7 python_targets_python3_8 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-2020.2.9999
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=d6538078aca568125e9db40730e099f4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=a000efd8823a91d5dc7798e42642bbca
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
index a96e32344a1d..756d54025d68 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
@@ -3,7 +3,7 @@ DEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/liba
 DESCRIPTION=Library pack for Heartbeat / Pacemaker
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
-INHERIT=autotools eutils multilib user
+INHERIT=autotools multilib user
 IUSE=doc libnet static-libs
 KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/lib
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.11.tar.bz2
 _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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=e66b60371bcdfb10f4d831d853d92a0e
+_md5_=8ff8c926627bb5adaca90bf4b8580cdc
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
index 916e1a173536..dd59ebc46282 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
@@ -3,7 +3,7 @@ DEPEND=app-text/asciidoc app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/gl
 DESCRIPTION=Library pack for Heartbeat / Pacemaker
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
-INHERIT=autotools eutils multilib user
+INHERIT=autotools multilib user
 IUSE=doc libnet static-libs
 KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=app-text/asciidoc app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/g
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.tar.bz2
 _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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=d4e5a9cfa732f765d8acb5f8113818f5
+_md5_=a6bf2623357409beb55ed057e3ff9968
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
index d1c6b019584c..6eed24fa141c 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/gl
 DESCRIPTION=Library pack for Heartbeat / Pacemaker
 EAPI=7
 HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
-INHERIT=autotools eutils flag-o-matic multilib user
+INHERIT=autotools flag-o-matic multilib user
 IUSE=doc ipmilan libnet static-libs
 KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2 app-text/asciidoc app-text/docbook-xml-dtd:4.4 dev-libs/g
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.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	c0964e43ba712cb933da5f65b958fa88	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=5ac80d81c16d90d45888ff7497bd2a16
+_md5_=55a2f788451c58b08c758effaad4a788
diff --git a/metadata/md5-cache/sys-cluster/crmsh-4.2.1 b/metadata/md5-cache/sys-cluster/crmsh-4.2.1
index fdf05b384158..4d0254cfeb32 100644
--- a/metadata/md5-cache/sys-cluster/crmsh-4.2.1
+++ b/metadata/md5-cache/sys-cluster/crmsh-4.2.1
@@ -3,7 +3,7 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_
 DESCRIPTION=Pacemaker command line interface for management and configuration
 EAPI=6
 HOMEPAGE=https://crmsh.github.io/
-INHERIT=eutils python-r1
+INHERIT=python-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/crmsh/crmsh/archive/4.2.1.tar.gz -> crmsh-4.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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
-_md5_=41330b3301a7c74c0e980d476934c639
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
+_md5_=8ebcf05791a6282fe25b385c785cb7c0
diff --git a/metadata/md5-cache/sys-cluster/heat-14.1.0 b/metadata/md5-cache/sys-cluster/heat-14.1.0
index 7500f8a9a892..0bd44c99a747 100644
--- a/metadata/md5-cache/sys-cluster/heat-14.1.0
+++ b/metadata/md5-cache/sys-cluster/heat-14.1.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target
 DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=7
 HOMEPAGE=https://launchpad.net/heat
-INHERIT=distutils-r1 eutils linux-info
+INHERIT=distutils-r1 linux-info
 IUSE=+mysql +memcached postgres sqlite python_targets_python3_7 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-14.1.0 https://tarballs.openstack.org/heat/openstack-heat-14.1.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=039698b749e8ae8eb9b10b65c83fb73a
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=0085c9a4bd6020a2146347a1915dca56
diff --git a/metadata/md5-cache/sys-cluster/heat-15.0.0 b/metadata/md5-cache/sys-cluster/heat-15.0.0
index ea3c54fc40bd..c3bffa7f4a52 100644
--- a/metadata/md5-cache/sys-cluster/heat-15.0.0
+++ b/metadata/md5-cache/sys-cluster/heat-15.0.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=7
 HOMEPAGE=https://launchpad.net/heat
-INHERIT=distutils-r1 eutils linux-info
+INHERIT=distutils-r1 linux-info
 IUSE=+mysql +memcached postgres sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-15.0.0 https://tarballs.openstack.org/heat/openstack-heat-15.0.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=7abaf2e9984c18ea7793b6ae320dfa70
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=8acf1d20e87e021164c175f15b912d39
diff --git a/metadata/md5-cache/sys-cluster/heat-2020.1.9999 b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
index 340b01ba329d..3231b44bf6a2 100644
--- a/metadata/md5-cache/sys-cluster/heat-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target
 DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=7
 HOMEPAGE=https://launchpad.net/heat
-INHERIT=distutils-r1 eutils linux-info git-r3
+INHERIT=distutils-r1 linux-info git-r3
 IUSE=+mysql +memcached postgres sqlite python_targets_python3_7 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-2020.1.9999
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=e86b55d7c22ec858bb0794fff2a75378
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=1ae461ca5b4ee352a6f1fb26cd7736cd
diff --git a/metadata/md5-cache/sys-cluster/heat-2020.2.9999 b/metadata/md5-cache/sys-cluster/heat-2020.2.9999
index fc0629535903..57261c624c1d 100644
--- a/metadata/md5-cache/sys-cluster/heat-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2020.2.9999
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=7
 HOMEPAGE=https://launchpad.net/heat
-INHERIT=distutils-r1 eutils linux-info git-r3
+INHERIT=distutils-r1 linux-info git-r3
 IUSE=+mysql +memcached postgres sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-2020.2.9999
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=d986d1896dcd1a2601d0cd4b839a5ac8
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=0e3aa399b5cd3611a0395b70a19dac25
diff --git a/metadata/md5-cache/sys-cluster/mpich2-1.5 b/metadata/md5-cache/sys-cluster/mpich2-1.5
index 59d87be82e10..8c8699ae7d88 100644
--- a/metadata/md5-cache/sys-cluster/mpich2-1.5
+++ b/metadata/md5-cache/sys-cluster/mpich2-1.5
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libaio net-libs/libnsl:0= sys-apps/hwloc romio? ( net-fs/nfs-uti
 DESCRIPTION=A high performance and portable MPI implementation
 EAPI=5
 HOMEPAGE=http://www.mcs.anl.gov/research/projects/mpich2/index.php
-INHERIT=fortran-2
+INHERIT=epatch fortran-2
 IUSE=+cxx doc fortran mpi-threads romio threads
 KEYWORDS=amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=mpich2
 RDEPEND=dev-libs/libaio net-libs/libnsl:0= sys-apps/hwloc romio? ( net-fs/nfs-utils ) !sys-cluster/mpich !sys-cluster/openmpi fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.5/mpich2-1.5.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	fortran-2	b4796813ccda91c9c0d3463fc90aa969
-_md5_=865c9f70b248f49ef06f952b54b4954d
+_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	fortran-2	b4796813ccda91c9c0d3463fc90aa969
+_md5_=061f2a7d1eb809b9189c7de7fbb9ce5e
diff --git a/metadata/md5-cache/sys-cluster/nova-2020.1.9999 b/metadata/md5-cache/sys-cluster/nova-2020.1.9999
index bc21c72afcf3..ed4a445258c6 100644
--- a/metadata/md5-cache/sys-cluster/nova-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2020.1.9999
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target
 DESCRIPTION=Cloud computing fabric controller
 EAPI=7
 HOMEPAGE=https://launchpad.net/nova
-INHERIT=distutils-r1 eutils linux-info multilib udev git-r3
+INHERIT=distutils-r1 linux-info multilib udev git-r3
 IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-2020.1.9999
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=c802e808132c825c4fa918c040e73886
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=e57c02d80e112362c18e9421faee8f98
diff --git a/metadata/md5-cache/sys-cluster/nova-2020.2.9999 b/metadata/md5-cache/sys-cluster/nova-2020.2.9999
index ff9e2b9517e6..2789381c5edd 100644
--- a/metadata/md5-cache/sys-cluster/nova-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2020.2.9999
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=Cloud computing fabric controller
 EAPI=7
 HOMEPAGE=https://launchpad.net/nova
-INHERIT=distutils-r1 eutils linux-info multilib udev git-r3
+INHERIT=distutils-r1 linux-info multilib udev git-r3
 IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-2020.2.9999
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=429c7817517c9c772d7b3c9c173683b7
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=c245a0534dc4fcfdd73ccb6a745aaea0
diff --git a/metadata/md5-cache/sys-cluster/nova-21.1.2 b/metadata/md5-cache/sys-cluster/nova-21.1.2
index c44691426c96..a51b8bdb02a5 100644
--- a/metadata/md5-cache/sys-cluster/nova-21.1.2
+++ b/metadata/md5-cache/sys-cluster/nova-21.1.2
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target
 DESCRIPTION=Cloud computing fabric controller
 EAPI=7
 HOMEPAGE=https://launchpad.net/nova
-INHERIT=distutils-r1 eutils linux-info multilib udev
+INHERIT=distutils-r1 linux-info multilib udev
 IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.1.2 https://tarballs.openstack.org/nova/nova-21.1.2.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=b77e85ae8a00eef3b4d5fde38b956933
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=6c8d62a316ea4a0ff071a004435501ec
diff --git a/metadata/md5-cache/sys-cluster/nova-21.2.0 b/metadata/md5-cache/sys-cluster/nova-21.2.0
index 76a5326e5569..c05f5de62672 100644
--- a/metadata/md5-cache/sys-cluster/nova-21.2.0
+++ b/metadata/md5-cache/sys-cluster/nova-21.2.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target
 DESCRIPTION=Cloud computing fabric controller
 EAPI=7
 HOMEPAGE=https://launchpad.net/nova
-INHERIT=distutils-r1 eutils linux-info multilib udev
+INHERIT=distutils-r1 linux-info multilib udev
 IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.2.0 https://tarballs.openstack.org/nova/nova-21.2.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=d6625cd78cfe587fb6e85c7da87e3e5e
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=b9b1278df0240df127d472e5184a9b0f
diff --git a/metadata/md5-cache/sys-cluster/nova-22.1.0 b/metadata/md5-cache/sys-cluster/nova-22.1.0
index ed2b01e3715e..a5894cba8cf6 100644
--- a/metadata/md5-cache/sys-cluster/nova-22.1.0
+++ b/metadata/md5-cache/sys-cluster/nova-22.1.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=Cloud computing fabric controller
 EAPI=7
 HOMEPAGE=https://launchpad.net/nova
-INHERIT=distutils-r1 eutils linux-info multilib udev
+INHERIT=distutils-r1 linux-info multilib udev
 IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-22.1.0 https://tarballs.openstack.org/nova/nova-22.1.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=60cc744ac18aeec5a593e7a3f7692772
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=52406b4880e9361bb2d494a8c93304f1
diff --git a/metadata/md5-cache/sys-cluster/nova-22.2.0 b/metadata/md5-cache/sys-cluster/nova-22.2.0
index ba655452a784..4c4c544fa982 100644
--- a/metadata/md5-cache/sys-cluster/nova-22.2.0
+++ b/metadata/md5-cache/sys-cluster/nova-22.2.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=Cloud computing fabric controller
 EAPI=7
 HOMEPAGE=https://launchpad.net/nova
-INHERIT=distutils-r1 eutils linux-info multilib udev
+INHERIT=distutils-r1 linux-info multilib udev
 IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-22.2.0 https://tarballs.openstack.org/nova/nova-22.2.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=429c7817517c9c772d7b3c9c173683b7
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c245a0534dc4fcfdd73ccb6a745aaea0
diff --git a/metadata/md5-cache/sys-cluster/resource-agents-3.9.6 b/metadata/md5-cache/sys-cluster/resource-agents-3.9.6
index 56308a063689..bcbc9fcd77ff 100644
--- a/metadata/md5-cache/sys-cluster/resource-agents-3.9.6
+++ b/metadata/md5-cache/sys-cluster/resource-agents-3.9.6
@@ -3,7 +3,7 @@ DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue libnet? ( net-libs/libnet:1.1
 DESCRIPTION=Resources pack for Heartbeat / Pacemaker
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Resource_Agents
-INHERIT=autotools eutils multilib
+INHERIT=autotools multilib
 IUSE=doc libnet rgmanager
 KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/iproute2 sys-cluster/cluster-glue libnet? ( net-libs/libnet:1.1
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/resource-agents/archive/v3.9.6.tar.gz -> resource-agents-3.9.6.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_=7486e42a81227074bd83ab016d38afd5
+_md5_=5aacaf85c51889ce2a253252b3c8191f
diff --git a/metadata/md5-cache/sys-cluster/resource-agents-4.0.1 b/metadata/md5-cache/sys-cluster/resource-agents-4.0.1
index d11efce3ceee..e87f713ce261 100644
--- a/metadata/md5-cache/sys-cluster/resource-agents-4.0.1
+++ b/metadata/md5-cache/sys-cluster/resource-agents-4.0.1
@@ -3,7 +3,7 @@ DEPEND=sys-apps/iproute2 sys-cluster/cluster-glue libnet? ( net-libs/libnet:1.1
 DESCRIPTION=Resources pack for Heartbeat / Pacemaker
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Resource_Agents
-INHERIT=autotools eutils multilib
+INHERIT=autotools multilib
 IUSE=doc libnet rgmanager
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/iproute2 sys-cluster/cluster-glue libnet? ( net-libs/libnet:1.1
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/resource-agents/archive/v4.0.1.tar.gz -> resource-agents-4.0.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_=c75507e20e7117117155b24b1c3fca36
+_md5_=87e32e59d49202f4d574d88ddfa41039
diff --git a/metadata/md5-cache/sys-cluster/resource-agents-4.6.1 b/metadata/md5-cache/sys-cluster/resource-agents-4.6.1
index 4fd5192fc4f0..ea3f21c5b089 100644
--- a/metadata/md5-cache/sys-cluster/resource-agents-4.6.1
+++ b/metadata/md5-cache/sys-cluster/resource-agents-4.6.1
@@ -4,12 +4,12 @@ DEPEND=sys-apps/iproute2 >=sys-cluster/cluster-glue-1.0.12-r1 libnet? ( net-libs
 DESCRIPTION=Resources pack for Heartbeat / Pacemaker
 EAPI=7
 HOMEPAGE=http://www.linux-ha.org/wiki/Resource_Agents
-INHERIT=autotools eutils multilib
+INHERIT=autotools multilib
 IUSE=doc libnet rgmanager
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 >=sys-cluster/cluster-glue-1.0.12-r1 libnet? ( net-libs/libnet:1.1 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/resource-agents/archive/v4.6.1.tar.gz -> resource-agents-4.6.1.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=d6c1176fabb8f63fdd01412259db30a7
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=d7a55a556c2306e4de37b8c69ae6370f
diff --git a/metadata/md5-cache/sys-cluster/swift-2.25.1 b/metadata/md5-cache/sys-cluster/swift-2.25.1
index 6c81b4a51b27..9ed296244965 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.25.1
+++ b/metadata/md5-cache/sys-cluster/swift-2.25.1
@@ -4,7 +4,7 @@ DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
-INHERIT=distutils-r1 eutils linux-info
+INHERIT=distutils-r1 linux-info
 IUSE=account container doc +memcached +object proxy python_targets_python3_7 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.25.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=1b56f8177523e8707cbdb2504f83bcf6
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=c6297ba469b84af39158defac241fdf2
diff --git a/metadata/md5-cache/sys-cluster/swift-2.26.0 b/metadata/md5-cache/sys-cluster/swift-2.26.0
index 11444ca7576d..78dcaaa2c6f1 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.26.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.26.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
-INHERIT=distutils-r1 eutils linux-info
+INHERIT=distutils-r1 linux-info
 IUSE=account container doc +memcached +object proxy python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.26.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=03425bb59a852f708cb41db1417695f7
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=34f6fa8c2476bbde81dfe4d755cedab2
diff --git a/metadata/md5-cache/sys-cluster/swift-2.27.0 b/metadata/md5-cache/sys-cluster/swift-2.27.0
index de3ecb4b4fa9..6079cefc4309 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.27.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.27.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_8(-)?,python_targets_python
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
-INHERIT=distutils-r1 eutils linux-info
+INHERIT=distutils-r1 linux-info
 IUSE=account container doc +memcached +object proxy python_targets_python3_8 python_targets_python3_9 kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.27.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=02744480f5a6e27931f7c003bab9af11
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=c43519677b1032614ba8186015704837
diff --git a/metadata/md5-cache/sys-cluster/swift-2020.1.9999 b/metadata/md5-cache/sys-cluster/swift-2020.1.9999
index 335928956a19..6570d6fa8130 100644
--- a/metadata/md5-cache/sys-cluster/swift-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2020.1.9999
@@ -4,12 +4,12 @@ DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
-INHERIT=distutils-r1 eutils linux-info git-r3
+INHERIT=distutils-r1 linux-info git-r3
 IUSE=account container doc +memcached +object proxy python_targets_python3_7 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyxattr[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_7 )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=a574d16535db6fab572ca948ac54d43b
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=17938c19bfc8e5789fd2639e23b196cd
diff --git a/metadata/md5-cache/sys-cluster/swift-2020.2.9999 b/metadata/md5-cache/sys-cluster/swift-2020.2.9999
index 3355b1a75b78..ed54164bcfde 100644
--- a/metadata/md5-cache/sys-cluster/swift-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2020.2.9999
@@ -4,12 +4,12 @@ DEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
-INHERIT=distutils-r1 eutils linux-info git-r3
+INHERIT=distutils-r1 linux-info git-r3
 IUSE=account container doc +memcached +object proxy python_targets_python3_7 python_targets_python3_8 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyxattr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=5aefc18ccfd9c1dbbb99811925f781a0
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=cf80699cc13ac7b5b010a994ebc77671
diff --git a/metadata/md5-cache/sys-cluster/swift-2021.1.9999 b/metadata/md5-cache/sys-cluster/swift-2021.1.9999
index 4118838a7f5e..efbc76fb6184 100644
--- a/metadata/md5-cache/sys-cluster/swift-2021.1.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2021.1.9999
@@ -4,12 +4,12 @@ DEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_8(-)?,python_targets_python
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=7
 HOMEPAGE=https://launchpad.net/swift
-INHERIT=distutils-r1 eutils linux-info git-r3
+INHERIT=distutils-r1 linux-info git-r3
 IUSE=account container doc +memcached +object proxy python_targets_python3_8 python_targets_python3_9 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/netifaces-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyxattr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=22b4915dea71f905449576c551d8a13a
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=24056138dc54bbd35ff63fac6595dab2
diff --git a/metadata/md5-cache/sys-cluster/torque-4.2.10-r1 b/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
index a0e183724ff4..73cd20cd168d 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
@@ -3,7 +3,7 @@ DEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 !libressl? ( dev-libs
 DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=6
 HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
-INHERIT=autotools eutils linux-info
+INHERIT=autotools linux-info
 IUSE=cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk kernel_linux
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=torque-2.5
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 !libressl? ( dev-lib
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b6157164a8846e5b60f42a5ae7f6.tar.gz -> torque-4.2.10-gh-20150517.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=3f7a3975d792fccfae0daa21ca9a93c6
+_md5_=2e232004e51ebd5cbcee90357654f9b7
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1752 b/metadata/md5-cache/sys-devel/gdb-apple-1752
index 43eb3ded633c..7c962c7a67e0 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1752
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1752
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= =dev-db/sqlite-3* nls?
 DESCRIPTION=Apple branch of the GNU Debugger, Developer Tools 4.3
 EAPI=6
 HOMEPAGE=https://sourceware.org/gdb/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=nls
 KEYWORDS=~ppc-macos ~x64-macos
 LICENSE=APSL-2 GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1752.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	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=b0b8933bc02b50a3cfca4e025b27b426
+_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	c0964e43ba712cb933da5f65b958fa88
+_md5_=8445d8442c42359de3c7614a7dd98e3c
diff --git a/metadata/md5-cache/sys-fabric/opensm-3.3.23-r1 b/metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
index c3a95d5e05f3..dc3cd1bed618 100644
--- a/metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
+++ b/metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
@@ -4,12 +4,12 @@ DEPEND=sys-cluster/rdma-core
 DESCRIPTION=OpenSM - InfiniBand Subnet Manager and Administration for OpenIB
 EAPI=7
 HOMEPAGE=https://github.com/linux-rdma/opensm/
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=tools
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-cluster/rdma-core tools? ( net-misc/iputils net-misc/openssh )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/opensm/archive/3.3.23.tar.gz -> opensm-3.3.23.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=faf7c697aa8526e245325542cc1ff988
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_md5_=678970c16f76c5e6511dcf2b8f1a7ab4
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-201905 b/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
index 999df8599b44..52322c4228bf 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
@@ -3,12 +3,12 @@ DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
-INHERIT=eutils python-any-r1 readme.gentoo-r1
+INHERIT=python-any-r1 readme.gentoo-r1
 IUSE=+binary
 KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable201905.tar.gz -> edk2-ovmf-201905.tar.gz https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bundled.tar.xz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bin.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=f72a25e467557119756cc382c33f2b53
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=b8c9bbefc2e1f4598d3ae6b8a15ff82b
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
index d9e5a01c9e9b..57fd0b12779a 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
@@ -3,12 +3,12 @@ DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
-INHERIT=eutils python-any-r1 readme.gentoo-r1
+INHERIT=python-any-r1 readme.gentoo-r1
 IUSE=+binary
 KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202008.tar.gz -> edk2-ovmf-202008.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-bin.tar.xz ) https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-qemu-firmware.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=b039a8b33016c0e654abd6c4d331d59b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=beb961634bd8ff1caadf90ddd5e417cc
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
index 104b35f44a16..16fa7e50abbf 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -3,12 +3,12 @@ DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? (
 DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
 HOMEPAGE=https://ipxe.org/
-INHERIT=toolchain-funcs eutils savedconfig
+INHERIT=toolchain-funcs savedconfig
 IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.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	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=d3cef17b0437a954e35c3dcb9244f591
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=29963ebe5065538d2d33c2d4e2c8f8aa
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
index a00afc5d0073..494fcf15c7c0 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
@@ -3,12 +3,12 @@ DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? (
 DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
 HOMEPAGE=https://ipxe.org/
-INHERIT=toolchain-funcs eutils savedconfig
+INHERIT=toolchain-funcs savedconfig
 IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86
 LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3.tar.bz2 -> ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20190728-a4f8c6e-bin.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	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=6f5d681071922bab077c6709d5b1a5ce
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=571f202510b0ed2a6beaa62eba755f94
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.21.1 b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
index 11fbbfcafdae..1573228917d0 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.21.1
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
@@ -3,12 +3,12 @@ DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? (
 DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
 HOMEPAGE=https://ipxe.org/
-INHERIT=toolchain-funcs eutils savedconfig
+INHERIT=toolchain-funcs savedconfig
 IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/ipxe/ipxe/archive/refs/tags/v1.21.1.tar.gz -> ipxe-1.21.1.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.21.1-bin.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	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=c35aedba4c142b70fe7fdfa575dec7cc
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=f84dd539039b34c416d1e315476b43f3
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0 b/metadata/md5-cache/sys-firmware/seabios-1.12.0
index 6be73b2271ef..3439b3eb7aa2 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.12.0
@@ -3,12 +3,12 @@ DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.9 de
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=7
 HOMEPAGE=https://www.seabios.org/
-INHERIT=eutils toolchain-funcs python-any-r1
+INHERIT=toolchain-funcs python-any-r1
 IUSE=+binary debug +seavgabios
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=5ec84389f04070e1811c2629c5c147ae
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=84da5fa9566738985e3bf56bcfee4596
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1 b/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
index 28fb487fccdf..c092393f2f7a 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
+++ b/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
@@ -3,12 +3,12 @@ DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.9 dev-lang/py
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=7
 HOMEPAGE=https://www.seabios.org/
-INHERIT=eutils toolchain-funcs python-any-r1
+INHERIT=toolchain-funcs python-any-r1
 IUSE=+binary debug +seavgabios
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=66dae70bf7230023bd8d34801bc773e4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=b7454a08f42bc5b1a52951c023db4981
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0 b/metadata/md5-cache/sys-firmware/seabios-1.14.0
index fbe53a1a3d81..8caeea730566 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0
@@ -3,12 +3,12 @@ DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.9 dev-lang/py
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=7
 HOMEPAGE=https://www.seabios.org/
-INHERIT=eutils toolchain-funcs python-any-r1
+INHERIT=toolchain-funcs python-any-r1
 IUSE=+binary debug +seavgabios
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.14.0-bin.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=fae241815a5a48cea2896bf6c9317768
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=61950df5b9e4348b2f948b4c84e80874
diff --git a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10 b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
index 025c0e82173a..f53a60cb5227 100644
--- a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
+++ b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=serial graphics adapter bios option rom for x86
 EAPI=6
 HOMEPAGE=https://code.google.com/p/sgabios/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=+binary
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=mirror://gentoo/sgabios-0.1_pre10.tar.gz !binary? ( https://dev.gentoo.org/~tamiko/distfiles/sgabios-0.1_pre10.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/sgabios-0.1_pre10-bin.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
-_md5_=861f586e45f95118c5378d1fb07bcfd1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=054742f7d634956fe019f2a8d08b615a
diff --git a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
index 3fa6657ed14b..89eace32d8c5 100644
--- a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
+++ b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=serial graphics adapter bios option rom for x86
 EAPI=6
 HOMEPAGE=https://code.google.com/p/sgabios/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=+binary
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz !binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz ) binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.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
-_md5_=e3c67c50f77d3fb5ad58bb2341784a4d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=98661b7ef0abd376121c24fe11b7fc0c
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603 b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
index 812e7d285dad..b9b8a71028cf 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
@@ -3,12 +3,12 @@ DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 ~sys-fs/aufs-headers-4.14_p20190
 DESCRIPTION=Utilities are always necessary for aufs
 EAPI=7
 HOMEPAGE=http://aufs.sourceforge.net/
-INHERIT=eutils flag-o-matic linux-info multilib toolchain-funcs
+INHERIT=flag-o-matic linux-info multilib toolchain-funcs
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.14_p20190603.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=708b65e98b79dcc71519c47eb51cecd5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=31bbbf6bb3f1632545b77d300fe48d79
diff --git a/metadata/md5-cache/sys-fs/reiser4progs-1.2.1 b/metadata/md5-cache/sys-fs/reiser4progs-1.2.1
index e92f2227c71d..f3bf3c6fcd03 100644
--- a/metadata/md5-cache/sys-fs/reiser4progs-1.2.1
+++ b/metadata/md5-cache/sys-fs/reiser4progs-1.2.1
@@ -3,12 +3,12 @@ DEPEND=!static? ( >=sys-libs/libaal-1.0.6:= readline? ( sys-libs/readline:0= ) )
 DESCRIPTION=reiser4progs: mkfs, fsck, etc...
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/reiser4/
-INHERIT=multilib eutils toolchain-funcs usr-ldscript
+INHERIT=multilib toolchain-funcs usr-ldscript
 IUSE=debug readline static static-libs split-usr
 KEYWORDS=amd64 arm ppc ppc64 -sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/libaal-1.0.6:= readline? ( sys-libs/readline:0= ) ) static-libs? ( >=sys-libs/libaal-1.0.6:=[static-libs(+)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/reiser4/reiser4progs-1.2.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=6b9236ffc8414a623e1bdd1a5d69ff4a
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=7376c4af48806c53ac059b43c0ef5ca5
diff --git a/metadata/md5-cache/sys-fs/vhba-20200106-r1 b/metadata/md5-cache/sys-fs/vhba-20200106-r1
index 2aaf6313da80..47c60e678236 100644
--- a/metadata/md5-cache/sys-fs/vhba-20200106-r1
+++ b/metadata/md5-cache/sys-fs/vhba-20200106-r1
@@ -4,7 +4,7 @@ DEPEND=virtual/udev virtual/pkgconfig kernel_linux? ( sys-apps/kmod[tools] dist-
 DESCRIPTION=Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
 EAPI=7
 HOMEPAGE=https://cdemu.sourceforge.io
-INHERIT=eutils linux-mod udev
+INHERIT=linux-mod udev
 IUSE=kernel_linux kernel_linux dist-kernel
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
@@ -12,4 +12,4 @@ RDEPEND=virtual/udev kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20200106.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=bfc78dba169905caba01792412c502cd
+_md5_=cd6f7c22f3a1666b639f42fd657c108a
diff --git a/metadata/md5-cache/sys-fs/zerofree-1.1.1 b/metadata/md5-cache/sys-fs/zerofree-1.1.1
index 970c42cc0a31..4dba6ea7532a 100644
--- a/metadata/md5-cache/sys-fs/zerofree-1.1.1
+++ b/metadata/md5-cache/sys-fs/zerofree-1.1.1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/e2fsprogs-libs
 DESCRIPTION=Zeroes out all free space on a filesystem
 EAPI=7
 HOMEPAGE=http://frippery.org/uml/index.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/e2fsprogs-libs
 SLOT=0
 SRC_URI=http://frippery.org/uml/zerofree-1.1.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f1469c1b1623e67806f08746226bcd46
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=05b59e844aa9ea4e53fb340c509f8893
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.5.7 b/metadata/md5-cache/sys-libs/freeipmi-1.5.7
index 3585cb501974..e0db15c34fd6 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.5.7
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.5.7
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libgcrypt:0 virtual/os-headers
 DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/freeipmi/
-INHERIT=eutils multilib
+INHERIT=multilib
 IUSE=debug nagios
 KEYWORDS=amd64 hppa x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0 nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://gnu/freeipmi/freeipmi-1.5.7.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
-_md5_=bd317ec406c6675580b2b519be4ebde3
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5787fb9e20ad2783bdb97acf965c6a76
diff --git a/metadata/md5-cache/sys-libs/ldb-2.1.4-r1 b/metadata/md5-cache/sys-libs/ldb-2.1.4-r1
index 82330f0eb986..7e8fdad16f72 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.1.4-r1
+++ b/metadata/md5-cache/sys-libs/ldb-2.1.4-r1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-INHERIT=python-single-r1 waf-utils multilib-minimal eutils
+INHERIT=python-single-r1 waf-utils multilib-minimal
 IUSE=doc +ldap +lmdb python test python_single_target_python3_7 python_single_target_python3_8 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 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0/2.1.4
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.1.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=25fc44ffb74af489aa1b2138dc8f4298
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	waf-utils	941688efbf28e7ea7a106e516fc9bc91	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=6c26892f92d52c05e0aaf5cdc342045d
diff --git a/metadata/md5-cache/sys-process/psinfo-0.12-r1 b/metadata/md5-cache/sys-process/psinfo-0.12-r1
index 6a2f120225a0..933bbbd75c57 100644
--- a/metadata/md5-cache/sys-process/psinfo-0.12-r1
+++ b/metadata/md5-cache/sys-process/psinfo-0.12-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Process information and statistics using the kernel /proc interface
 EAPI=7
 HOMEPAGE=http://www.ward.nu/computer/psinfo/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.ward.nu/computer/psinfo/psinfo-0.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f2cacd01c64f33816df0a8534b30bd6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3bfa8b38465fb5c1f2381f67560db08d
diff --git a/metadata/md5-cache/www-apache/libapreq2-2.13-r1 b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
index 1b98bc677254..94440980da6a 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.13-r1
+++ b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
@@ -3,12 +3,12 @@ DEPEND=perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apa
 DESCRIPTION=A library for manipulating client request data via the Apache API
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/apreq/
-INHERIT=apache-module perl-module multilib
+INHERIT=apache-module epatch perl-module multilib
 IUSE=perl
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.13.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=30bf1d6ae5e8d435290aafc0b7cffaaf
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	unpacker	517f16af48ee3ab88180dd58b5143213	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=3af85084e6b73ce2716359208a2c131a
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
index 79321531c2d3..277f2d03c6a3 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
@@ -3,7 +3,7 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=6
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-INHERIT=apache-module eutils python-single-r1
+INHERIT=apache-module python-single-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.1.tar.gz -> mod_wsgi-4.7.1.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	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	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=c3c451f35fd84a103f858062aafb5de2
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
+_md5_=acd95c5820da7f8f6babe783eb35b429
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
index c8e7c9ad7b2e..8355f34caaa1 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
@@ -3,7 +3,7 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=6
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-INHERIT=apache-module eutils python-single-r1
+INHERIT=apache-module python-single-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.1.tar.gz -> mod_wsgi-4.7.1.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	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	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=ad4db5f79f9274080db68d2d4e4fea6a
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	apache-module	6d6745b832afba32cbcfba34e3ee328f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
+_md5_=6ae5294e8d6b938303526c38aa097567
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.8.2 b/metadata/md5-cache/www-apps/icingaweb2-2.8.2
index 270b6dd86fd8..53bd40355554 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.8.2
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.8.2
@@ -3,7 +3,7 @@ DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagem
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
-INHERIT=depend.apache eutils multilib
+INHERIT=depend.apache multilib
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/image
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.8.2 -> icingaweb2-2.8.2.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	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
-_md5_=a7cbeeb009d6131dfa270fd951967d81
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1adf6fa32ca3190878c92a59edcb1234
diff --git a/metadata/md5-cache/www-apps/icingaweb2-9999 b/metadata/md5-cache/www-apps/icingaweb2-9999
index e2aee6873d45..49cf51df7bc0 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-9999
+++ b/metadata/md5-cache/www-apps/icingaweb2-9999
@@ -3,12 +3,12 @@ DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagem
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
-INHERIT=depend.apache eutils multilib user git-r3
+INHERIT=depend.apache multilib user git-r3
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	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	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=d8281571b0cc310e442a29b8687bdd9a
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=077901c4b288eb64db0c8b8628a7c6b5
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6 b/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
index bd579da9ea5a..99c6c2227c55 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
+++ b/metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
@@ -3,10 +3,11 @@ DEPEND=www-apps/rocketwiki-lqfb www-servers/apache >=www-apps/webmcp-1.2.6 >=www
 DESCRIPTION=Internet platforms for proposition development and decision making
 EAPI=7
 HOMEPAGE=https://www.public-software-group.org/liquid_feedback
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=HPND CC-BY-2.5
 RDEPEND=>=www-apps/liquid_feedback_core-3.0.4
 SLOT=0
 SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v3.0.6/liquid_feedback_frontend-v3.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a06d71b27a17828b57df255694408bf
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=fe400fa057d8153639f12e55690b7677
diff --git a/metadata/md5-cache/www-apps/mirmon-2.11-r2 b/metadata/md5-cache/www-apps/mirmon-2.11-r2
index 8d97199af687..fff163bc086c 100644
--- a/metadata/md5-cache/www-apps/mirmon-2.11-r2
+++ b/metadata/md5-cache/www-apps/mirmon-2.11-r2
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/perl-5.8.5-r2:0 >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Simple webapp to monitor the status of mirrors
 EAPI=7
 HOMEPAGE=http://www2.projects.science.uu.nl/csg/mirmon/mirmon.html
-INHERIT=webapp eutils
+INHERIT=webapp
 IUSE=vhosts
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.5-r2:0 dev-perl/File-Tempdir dev-perl/Socket6 >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://debian/pool/main/m/mirmon/mirmon_2.11.orig.tar.gz -> mirmon-2.11.tar.gz
-_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=8bff8dbd84cd7139a11bfd3737595f5a
+_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_md5_=a24d8ab665d069dae0845974f1da5334
diff --git a/metadata/md5-cache/www-apps/mythweb-0.28.1 b/metadata/md5-cache/www-apps/mythweb-0.28.1
index af2db58c7338..609ab007c795 100644
--- a/metadata/md5-cache/www-apps/mythweb-0.28.1
+++ b/metadata/md5-cache/www-apps/mythweb-0.28.1
@@ -3,12 +3,12 @@ DEPEND=dev-lang/php:*[json,mysql,session,posix] dev-perl/DBD-mysql dev-perl/DBI
 DESCRIPTION=PHP scripts intended to manage MythTV from a web browser
 EAPI=6
 HOMEPAGE=https://www.mythtv.org
-INHERIT=eutils webapp
+INHERIT=webapp
 IUSE=vhosts
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php:*[json,mysql,session,posix] dev-perl/DBD-mysql dev-perl/DBI dev-perl/HTTP-Date dev-perl/Net-UPnP virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=0.28.1
 SRC_URI=https://github.com/MythTV/mythweb/archive/v0.28.1.tar.gz -> mythweb-0.28.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	webapp	990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=0c2ef9fd515b4281432ced104fa8ed4e
+_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_md5_=d9ca1f3199631bfe4432f6c5f4a45fd9
diff --git a/metadata/md5-cache/www-apps/radicale-3.0.6-r1 b/metadata/md5-cache/www-apps/radicale-3.0.6-r1
index a6a89ef2107e..5b63bc05ee05 100644
--- a/metadata/md5-cache/www-apps/radicale-3.0.6-r1
+++ b/metadata/md5-cache/www-apps/radicale-3.0.6-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A simple CalDAV calendar server
 EAPI=7
 HOMEPAGE=https://radicale.org/
-INHERIT=distutils-r1 eutils systemd
+INHERIT=distutils-r1 systemd
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
@@ -11,5 +11,5 @@ RDEPEND=acct-user/radicale acct-group/radicale dev-python/defusedxml dev-python/
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Kozea/Radicale/archive/refs/tags/3.0.6.tar.gz -> radicale-3.0.6.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=b33d2c50cccb758213cd1ca8bfa680d7
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=32c99fbbaf946069668298458f3522f9
diff --git a/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4 b/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
index 18b164cf33f1..9108844d287d 100644
--- a/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
+++ b/metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
@@ -8,5 +8,4 @@ LICENSE=HPND
 RDEPEND=dev-libs/gmp
 SLOT=0
 SRC_URI=https://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/v0.4/rocketwiki-lqfb-v0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9ce5448d0a78478a47b08991bd6a4f68
+_md5_=bb5b86a4b65aca4d2fdf6abf3c860680
diff --git a/metadata/md5-cache/www-apps/rt-4.4.4 b/metadata/md5-cache/www-apps/rt-4.4.4
index 7084f40a898b..6d170402d4ed 100644
--- a/metadata/md5-cache/www-apps/rt-4.4.4
+++ b/metadata/md5-cache/www-apps/rt-4.4.4
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=
 DESCRIPTION=RT is an enterprise-grade ticketing system
 EAPI=6
 HOMEPAGE=https://www.bestpractical.com/rt/
-INHERIT=webapp eutils depend.apache user
+INHERIT=webapp depend.apache user
 IUSE=mysql +postgres fastcgi lighttpd vhosts
 KEYWORDS=~amd64
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( mysql postgres )
 RESTRICT=test
 SLOT=4.4.4
 SRC_URI=https://download.bestpractical.com/pub/rt/release/rt-4.4.4.tar.gz
-_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54	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	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=98036bf9ee1ec2041daa9741afabd546
+_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=3a19e66735f9d24b873773ad84149f42
diff --git a/metadata/md5-cache/www-client/httrack-3.49.2-r2 b/metadata/md5-cache/www-client/httrack-3.49.2-r2
index 765bf8e8dcdf..36a797fcff83 100644
--- a/metadata/md5-cache/www-client/httrack-3.49.2-r2
+++ b/metadata/md5-cache/www-client/httrack-3.49.2-r2
@@ -4,12 +4,12 @@ DEPEND=>=sys-libs/zlib-1.2.5.1-r1 !libressl? ( >=dev-libs/openssl-1.1.0:= ) libr
 DESCRIPTION=HTTrack Website Copier, Open Source Offline Browser
 EAPI=7
 HOMEPAGE=https://www.httrack.com/
-INHERIT=autotools multilib eutils xdg-utils
+INHERIT=autotools multilib xdg-utils
 IUSE=libressl static-libs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/zlib-1.2.5.1-r1 !libressl? ( >=dev-libs/openssl-1.1.0:= ) libressl? ( dev-libs/libressl )
 SLOT=0
 SRC_URI=https://mirror.httrack.com/historical/httrack-3.49.2.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46a018e87b90f61bdb3ceab626afb8fc
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41ec2fa52a9106563d0fd87466b9b8c8
diff --git a/metadata/md5-cache/www-misc/awstats-7.8-r1 b/metadata/md5-cache/www-misc/awstats-7.8-r1
index 86d372f53f86..51daf26ca9c9 100644
--- a/metadata/md5-cache/www-misc/awstats-7.8-r1
+++ b/metadata/md5-cache/www-misc/awstats-7.8-r1
@@ -8,5 +8,4 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5.6.1 dev-perl/URI virtual/perl-Time-Local geoip? ( dev-perl/Geo-IP ) ipv6? ( dev-perl/Net-DNS dev-perl/Net-IP )
 SLOT=0
 SRC_URI=https://www.awstats.org/files/awstats-7.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d958e5b41e6b7658e27d1e60ed512593
+_md5_=80e6ee3c53d008caca52ae52953b4041
diff --git a/metadata/md5-cache/www-servers/gatling-0.16-r1 b/metadata/md5-cache/www-servers/gatling-0.16-r1
index 4e8bb5b38e90..786869750973 100644
--- a/metadata/md5-cache/www-servers/gatling-0.16-r1
+++ b/metadata/md5-cache/www-servers/gatling-0.16-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/libowfat-0.32-r2[diet=] diet? ( dev-libs/dietlibc ) ssl? ( !li
 DESCRIPTION=High performance web server
 EAPI=7
 HOMEPAGE=https://www.fefe.de/gatling/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=libressl ssl diet
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libowfat-0.32-r2[diet=] diet? ( dev-libs/dietlibc ) ssl? ( !l
 REQUIRED_USE=ssl? ( !diet )
 SLOT=0
 SRC_URI=https://www.fefe.de/gatling/gatling-0.16.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=ce4249713d94fd24f2a28ff6bfca14f4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=06af0b0379e6adacbed91909da59452e
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.4 b/metadata/md5-cache/www-servers/tomcat-10.0.4
index b47dccd13fd2..6eadc7d5e298 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.0.4
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.4
@@ -3,7 +3,7 @@ DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakart
 DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~amd64-linux
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakar
 RESTRICT=test
 SLOT=10
 SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.4/src/apache-tomcat-10.0.4-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=b55a13a4352359e573f5bd84cb76ef01
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=f285f7c91f3eae9c4d09a2c0c68214b1
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.5 b/metadata/md5-cache/www-servers/tomcat-10.0.5
index db6ae8d33b38..2a2801552f40 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.0.5
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.5
@@ -3,7 +3,7 @@ DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakart
 DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~amd64-linux
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakar
 RESTRICT=test
 SLOT=10
 SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.5/src/apache-tomcat-10.0.5-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=73b15c450c602c97453bacbb85fda2fa
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=478c19bd09da8f15c83db184bd9691f5
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.108 b/metadata/md5-cache/www-servers/tomcat-7.0.108
index f1455784c53a..36a830caf1c9 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.108
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.108
@@ -3,7 +3,7 @@ DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.108:3.0 virtual
 DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.108:3.0 acct-g
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.108/src/apache-tomcat-7.0.108-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=0cc6c380e354a99e799880d00438db4c
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=9ed5891d1b16b4122519d274a32a4cf0
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.64 b/metadata/md5-cache/www-servers/tomcat-8.5.64
index f9e93bb5e80e..a3f0826f231b 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.64
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.64
@@ -3,7 +3,7 @@ DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.64:3.1 app-admi
 DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.64:3.1 acct-gr
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.64/src/apache-tomcat-8.5.64-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=fd97eba162ab424e2838ec625737ad5c
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=a60ccfff074f501319ea4a6baf3b58a6
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.65 b/metadata/md5-cache/www-servers/tomcat-8.5.65
index 6e59759b794d..1eabbf128db6 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.65
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.65
@@ -3,7 +3,7 @@ DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.65:3.1 app-admi
 DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.65:3.1 acct-gr
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.65/src/apache-tomcat-8.5.65-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=db1c0cad0bf62e1f7845ddd0442d4b7c
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=434731b55148ad2a282d2ba14ce8fc76
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.44 b/metadata/md5-cache/www-servers/tomcat-9.0.44
index e0c9a82ea379..9c92d3b79b63 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.44
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.44
@@ -3,7 +3,7 @@ DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomca
 DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomc
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.44/src/apache-tomcat-9.0.44-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=e160d3351142289b49ecab079147286d
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=72a658acb64935aa53b3067db79130e7
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.45 b/metadata/md5-cache/www-servers/tomcat-9.0.45
index 2f5f3c46e2bd..546b1fcb5060 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.45
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.45
@@ -3,7 +3,7 @@ DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomca
 DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
-INHERIT=eutils java-pkg-2 java-ant-2 prefix
+INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomc
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.45/src/apache-tomcat-9.0.45-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=a75160dedbcd86c28e28f2306fdaa065
+_eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=6eb197661b473d691c57e5c57576c957
diff --git a/metadata/md5-cache/x11-libs/librfm-5.3.16.3-r1 b/metadata/md5-cache/x11-libs/librfm-5.3.16.3-r1
index 0fb167f5a2d1..57c0cf840d11 100644
--- a/metadata/md5-cache/x11-libs/librfm-5.3.16.3-r1
+++ b/metadata/md5-cache/x11-libs/librfm-5.3.16.3-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.22.5:2 >=dev-libs/libdbh-5.0.13 >=dev-libs/libtubo-5.0.
 DESCRIPTION=The basic library used by some rfm applications, such as Rodent filemanager
 EAPI=6
 HOMEPAGE=http://xffm.org/libxffm.html
-INHERIT=autotools eutils ltprune
+INHERIT=autotools ltprune
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22.5:2 >=dev-libs/libdbh-5.0.13 >=dev-libs/libtubo-5.0.13 >=dev-libs/libxml2-2.4.0:2 >=dev-libs/libzip-0.9:0= >=gnome-base/librsvg-2.26:2 >=x11-libs/cairo-1.12.6[X] >=x11-libs/gtk+-3.12:3[X] >=x11-libs/pango-1.28.0[X] !<x11-misc/rodent-5
 SLOT=0
 SRC_URI=mirror://sourceforge/xffm/librfm/librfm5-5.3.16.3.tar.bz2
 _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_=db43bd7dacdafb94cddc78a64b79921b
+_md5_=c349ac7a58f6921e2661e8c50bd31f1b
diff --git a/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3 b/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
index 96527c7306fb..80e1dfe77836 100644
--- a/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
+++ b/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/librep-0.90.5 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.24.0:2 >
 DESCRIPTION=GTK+/libglade/GNOME bindings for the librep Lisp environment
 EAPI=6
 HOMEPAGE=http://sawfish.wikia.com/wiki/Main_Page
-INHERIT=autotools eutils
+INHERIT=autotools
 IUSE=examples
 KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/librep-0.90.5 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.24.0:2
 SLOT=gtk-2.0
 SRC_URI=http://download.tuxfamily.org/librep/rep-gtk/rep-gtk_0.90.8.3.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
-_md5_=1aa1ab25213f6cde8b5611084ea2ca5e
+_md5_=19c648687ea30af9977790fc471429ac
diff --git a/metadata/md5-cache/x11-misc/alock-1.0.0 b/metadata/md5-cache/x11-misc/alock-1.0.0
index edb388978ada..5ea9dc131b4d 100644
--- a/metadata/md5-cache/x11-misc/alock-1.0.0
+++ b/metadata/md5-cache/x11-misc/alock-1.0.0
@@ -3,12 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-
 DESCRIPTION=locks the local X display until a password is entered
 EAPI=6
 HOMEPAGE=https://darkshed.net/projects/alock https://github.com/mgumz/alock
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=doc imlib pam
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( sys-libs/pam ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://github.com/mgumz/alock/archive/v1.0.0.tar.gz -> alock-1.0.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
-_md5_=b8fbcc2d6eb7264e27718152e0cf0167
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=5114043eadc076043def8925d92f607c
diff --git a/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107 b/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
index 9c1cbb4f424c..9cb9829d3308 100644
--- a/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
+++ b/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=The Console Display Manager
 EAPI=6
 HOMEPAGE=https://github.com/evertiro/cdm
-INHERIT=pam eutils
+INHERIT=pam
 IUSE=pam
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -10,4 +10,4 @@ RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~gienah/snapshots/cdm-0.6.1_pre20180107.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	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=5d372dec43fc4b3f9cced4e7cc5e2939
+_md5_=8ea8e2266bc7bda3c08c615beacf685a
diff --git a/metadata/md5-cache/x11-misc/cdm-0.7 b/metadata/md5-cache/x11-misc/cdm-0.7
index 07b9aae045d5..cbcd37484d40 100644
--- a/metadata/md5-cache/x11-misc/cdm-0.7
+++ b/metadata/md5-cache/x11-misc/cdm-0.7
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=The Console Display Manager
 EAPI=7
 HOMEPAGE=https://github.com/evertiro/cdm
-INHERIT=pam eutils
+INHERIT=pam
 IUSE=pam
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -10,4 +10,4 @@ RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=https://github.com/evertiro/cdm/archive/0.7.tar.gz -> cdm-0.7.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=9c8ed48716d6fd6cee029426de37cb9a
+_md5_=1f89a1212fe7cb0166b625403ed910f8
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r3 b/metadata/md5-cache/x11-misc/redshift-1.12-r3
index 638e50d2d249..95ade9e1df5b 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.12-r3
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r3
@@ -3,7 +3,7 @@ DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm
 DESCRIPTION=A screen color temperature adjusting software
 EAPI=6
 HOMEPAGE=http://jonls.dk/redshift/
-INHERIT=systemd autotools eutils gnome2-utils python-r1
+INHERIT=systemd autotools gnome2-utils python-r1
 IUSE=appindicator geoclue gtk nls python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ REQUIRED_USE=gtk? ( || ( python_targets_python3_7 python_targets_python3_8 pytho
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
-_md5_=5d2ca1fe8c42b1e56f44b38cf911c066
+_md5_=7ffe66e6da63d25e60685524afdded6c
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r4 b/metadata/md5-cache/x11-misc/redshift-1.12-r4
index 2597d5dba775..e7d53e576238 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.12-r4
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r4
@@ -3,7 +3,7 @@ DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm
 DESCRIPTION=A screen color temperature adjusting software
 EAPI=6
 HOMEPAGE=http://jonls.dk/redshift/
-INHERIT=flag-o-matic systemd autotools eutils gnome2-utils python-r1
+INHERIT=flag-o-matic systemd autotools gnome2-utils python-r1
 IUSE=appindicator geoclue gtk nls python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ REQUIRED_USE=gtk? ( || ( python_targets_python3_7 python_targets_python3_8 pytho
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.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	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
-_md5_=c22ede16a292527e72fac2f1a9850f2f
+_md5_=92705982a23cef7c0630030f1f24b486
diff --git a/metadata/md5-cache/x11-misc/xhkeys-2.2.1 b/metadata/md5-cache/x11-misc/xhkeys-2.2.1
index 6a2b49f9a2db..e8b222b5df2f 100644
--- a/metadata/md5-cache/x11-misc/xhkeys-2.2.1
+++ b/metadata/md5-cache/x11-misc/xhkeys-2.2.1
@@ -3,11 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
 DESCRIPTION=assign particular actions to any key or key combination
 EAPI=6
 HOMEPAGE=http://wmalms.tripod.com/#XHKEYS
-INHERIT=eutils
 KEYWORDS=ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://gentoo/xhkeys-2.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
-_md5_=5c5a81dabc0f7d8c575e580b68723e0a
+_md5_=471526a5e062198a5fcedc585f1f933d
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.50-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.50-r1
index 337474dd9289..a1254fc1c532 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.50-r1
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.50-r1
@@ -3,7 +3,7 @@ DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif?
 DESCRIPTION=Just another screensaver application for X
 EAPI=6
 HOMEPAGE=https://www.sillycycle.com/xlockmore.html
-INHERIT=autotools eutils flag-o-matic pam
+INHERIT=autotools flag-o-matic pam
 IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=BSD GPL-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
 SLOT=0
 SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.50.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.50.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	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=cb2705f76cef3f69a963a2e93251f7f5
+_md5_=d151f0e9130871f1fb0930952fe5e1de
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12 b/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
index 90a47025d7e8..da2b79dd2fa1 100644
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
+++ b/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=The xsri wallpaper setter from RedHat
 EAPI=7
 HOMEPAGE=https://fedoraproject.org
-INHERIT=autotools eutils rpm
+INHERIT=autotools rpm
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/source/SRPMS/xsri-2.1.0-17.fc12.src.rpm
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	estack	055c42df72f76a4f45ec92b35e83cd56	rpm	760ff223c2c4299b68ea901e24c4cabd
-_md5_=0378d627a9a84cee27f2ca2465f1635f
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	rpm	760ff223c2c4299b68ea901e24c4cabd
+_md5_=a18c2e77a0cccd9257f9cce1c811bec6
diff --git a/metadata/md5-cache/x11-plugins/purple-facebook-20170608 b/metadata/md5-cache/x11-plugins/purple-facebook-20170608
index 6c04add0c5de..a50948b2de21 100644
--- a/metadata/md5-cache/x11-plugins/purple-facebook-20170608
+++ b/metadata/md5-cache/x11-plugins/purple-facebook-20170608
@@ -3,11 +3,11 @@ DEPEND=dev-libs/json-glib net-im/pidgin sys-devel/gnuconfig >=app-portage/elt-pa
 DESCRIPTION=Facebook protocol plugin for libpurple
 EAPI=6
 HOMEPAGE=https://github.com/dequis/purple-facebook
-INHERIT=eutils autotools
+INHERIT=autotools
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-glib net-im/pidgin
 SLOT=0
 SRC_URI=https://github.com/dequis/purple-facebook/releases/download/v0.9.4-c9b74a765767/purple-facebook-0.9.4-c9b74a765767.tar.gz -> purple-facebook-20170608.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_=b432209c2fa3d6a868d68638536bb555
+_md5_=4f24a6cc673eb66c876bf3a56f7525e5
diff --git a/metadata/md5-cache/x11-plugins/purple-facebook-20170831 b/metadata/md5-cache/x11-plugins/purple-facebook-20170831
index 83c0faba9294..ba5631d2fe2b 100644
--- a/metadata/md5-cache/x11-plugins/purple-facebook-20170831
+++ b/metadata/md5-cache/x11-plugins/purple-facebook-20170831
@@ -3,11 +3,11 @@ DEPEND=dev-libs/json-glib net-im/pidgin sys-devel/gnuconfig >=app-portage/elt-pa
 DESCRIPTION=Facebook protocol plugin for libpurple
 EAPI=6
 HOMEPAGE=https://github.com/dequis/purple-facebook
-INHERIT=eutils autotools
+INHERIT=autotools
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-glib net-im/pidgin
 SLOT=0
 SRC_URI=https://github.com/dequis/purple-facebook/releases/download/v0.9.5-9ff9acf9fa14/purple-facebook-0.9.5-9ff9acf9fa14.tar.gz -> purple-facebook-20170831.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_=e17154b31677c21c3bd4695a15b172f8
+_md5_=6aa4be7bbfb2bb40532f47061f281f12
diff --git a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3 b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
index 1db73a81f05b..c30ef9ab8563 100644
--- a/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
+++ b/metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
@@ -3,11 +3,9 @@ DEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2 v
 DESCRIPTION=dockapp which provides a drawer (retractable button bar) to launch applications
 EAPI=6
 HOMEPAGE=http://people.easter-eggs.org/~valos/wmdrawer/
-INHERIT=eutils
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://people.easter-eggs.org/~valos/wmdrawer/wmdrawer-0.10.5.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
-_md5_=e47bdc7fbf187ba69185cfd3d3c1f63d
+_md5_=b6a9feca8037f748e7e7039c71206473
diff --git a/metadata/md5-cache/x11-plugins/wmpop3-0.5.6a-r1 b/metadata/md5-cache/x11-plugins/wmpop3-0.5.6a-r1
index 42021eb1e782..27a1b8f1b9dc 100644
--- a/metadata/md5-cache/x11-plugins/wmpop3-0.5.6a-r1
+++ b/metadata/md5-cache/x11-plugins/wmpop3-0.5.6a-r1
@@ -3,11 +3,11 @@ DEPEND=x11-wm/windowmaker x11-libs/libXpm
 DESCRIPTION=dockapp for checking pop3 accounts
 EAPI=6
 HOMEPAGE=https://www.dockapps.net/wmpop3
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-wm/windowmaker x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/WMPop3-0.5.6a.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
-_md5_=2c07e3f83555d3048b4e2dbf18a1a1a8
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=867acb8f77e30d42f12c7681dde8728c
diff --git a/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3 b/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
index 74f4b766a578..f49888dbe6d3 100644
--- a/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
+++ b/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
@@ -3,11 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=GTK-2.0 Theme Switcher
 EAPI=6
 HOMEPAGE=http://plasmasturm.org/programs/gtk-chtheme/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://plasmasturm.org/programs/gtk-chtheme/gtk-chtheme-0.3.1.tar.bz2
-_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
-_md5_=76316a024f93cc093b8fc5a7c644d545
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a7e6b14ee2abb4ca621a93f2a4fb4971
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.2 b/metadata/md5-cache/x11-wm/ctwm-4.0.2
index d868eeb91faf..8e5da94bae1b 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.2
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.2
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
 DESCRIPTION=A clean, light window manager
 EAPI=6
 HOMEPAGE=http://ctwm.org/
-INHERIT=cmake-utils eutils flag-o-matic toolchain-funcs
+INHERIT=cmake-utils flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=http://ctwm.org/dist/ctwm-4.0.2.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	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	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=784ce58039d65c79be7c9845c5704b12
+_md5_=81f4d6f79e31da57c9b03d81a6542e4f
diff --git a/metadata/md5-cache/x11-wm/jwm-2.3.2 b/metadata/md5-cache/x11-wm/jwm-2.3.2
index 4d24d5a3494b..f0638620a801 100644
--- a/metadata/md5-cache/x11-wm/jwm-2.3.2
+++ b/metadata/md5-cache/x11-wm/jwm-2.3.2
@@ -3,12 +3,12 @@ DEPEND=xpm? ( x11-libs/libXpm ) xinerama? ( x11-libs/libXinerama ) x11-libs/libX
 DESCRIPTION=Very fast and lightweight still powerful window manager for X
 EAPI=5
 HOMEPAGE=http://joewing.net/projects/jwm/
-INHERIT=eutils
+INHERIT=wrapper
 IUSE=bidi debug jpeg png truetype xinerama xpm
 KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=MIT
 RDEPEND=xpm? ( x11-libs/libXpm ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXext x11-libs/libXrender x11-libs/libXau x11-libs/libXdmcp truetype? ( x11-libs/libXft ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0= ) bidi? ( dev-libs/fribidi ) dev-libs/expat
 SLOT=0
 SRC_URI=http://joewing.net/programs/jwm/releases/jwm-2.3.2.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
-_md5_=696f8b369d9a1d0af10720aab54d85e9
+_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ebee1cf314af139ce778dff89406552e
diff --git a/metadata/md5-cache/x11-wm/jwm-2.3.7 b/metadata/md5-cache/x11-wm/jwm-2.3.7
index 630af77ae2d2..5602aa37a3fa 100644
--- a/metadata/md5-cache/x11-wm/jwm-2.3.7
+++ b/metadata/md5-cache/x11-wm/jwm-2.3.7
@@ -3,12 +3,12 @@ DEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-lib
 DESCRIPTION=Very fast and lightweight still powerful window manager for X
 EAPI=6
 HOMEPAGE=http://joewing.net/projects/jwm/
-INHERIT=eutils
+INHERIT=wrapper
 IUSE=bidi cairo debug iconv jpeg nls png truetype xinerama xpm
 KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXrender bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo gnome-base/librsvg ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg:0= ) nls? ( sys-devel/gettext virtual/libintl ) png? ( media-libs/libpng:0= ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=http://joewing.net/projects/jwm/releases/jwm-2.3.7.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
-_md5_=e337fe064674ca179c2afd25e1c02aee
+_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=86cbca32cbdca60969d79656eb76c0ef
diff --git a/metadata/md5-cache/x11-wm/muffin-4.6.3 b/metadata/md5-cache/x11-wm/muffin-4.6.3
index d3072b87a110..a5d876ea5b47 100644
--- a/metadata/md5-cache/x11-wm/muffin-4.6.3
+++ b/metadata/md5-cache/x11-wm/muffin-4.6.3
@@ -4,7 +4,7 @@ DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-lib
 DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/
-INHERIT=autotools eutils gnome2-utils xdg-utils
+INHERIT=autotools gnome2-utils xdg-utils
 IUSE=+introspection test xinerama
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/4.6.3.tar.gz -> muffin-4.6.3.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=99d7f3ea87646dac8e22bdca2e6239b1
+_md5_=e029c434e768f0d572ecf0058f599131
diff --git a/metadata/md5-cache/x11-wm/stumpwm-18.05 b/metadata/md5-cache/x11-wm/stumpwm-18.05
index 6b66ab14571a..46063a5c74e7 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-18.05
+++ b/metadata/md5-cache/x11-wm/stumpwm-18.05
@@ -3,7 +3,7 @@ DEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0
 DESCRIPTION=Stumpwm is a Window Manager written entirely in Common Lisp.
 EAPI=6
 HOMEPAGE=https://stumpwm.github.io/
-INHERIT=common-lisp-3 autotools desktop elisp-common xdg-utils versionator
+INHERIT=common-lisp-3 autotools desktop elisp-common xdg-utils
 IUSE=contrib doc emacs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://github.com/stumpwm/stumpwm/archive/18.05.tar.gz -> stumpwm-18.05.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	common-lisp-3	38ae0912688c97fa9147aaff8c26d799	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=82f89c372d2f21b6b4ccee71775adde8
+_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	common-lisp-3	38ae0912688c97fa9147aaff8c26d799	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62cb943c27e77bb57f1f97331f97d473
diff --git a/metadata/md5-cache/x11-wm/wm2-4-r1 b/metadata/md5-cache/x11-wm/wm2-4-r1
index 7c97525a06da..f36c7f8c22ff 100644
--- a/metadata/md5-cache/x11-wm/wm2-4-r1
+++ b/metadata/md5-cache/x11-wm/wm2-4-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libXmu x11-base/xorg-proto
 DESCRIPTION=Small, unconfigurable window manager
 EAPI=5
 HOMEPAGE=http://www.all-day-breakfast.com/wm2/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=wm2 HPND
 RDEPEND=x11-libs/libXmu
 SLOT=0
 SRC_URI=http://www.all-day-breakfast.com/wm2/wm2-4.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
-_md5_=c4018de65c2ca38ed2edbe7367ab77a7
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d4f840554db39f6f5ec6a8b8e055cac5
diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999
index b8bdb00767f7..7c0d81c04955 100644
--- a/metadata/md5-cache/x11-wm/xoat-9999
+++ b/metadata/md5-cache/x11-wm/xoat-9999
@@ -4,11 +4,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 DESCRIPTION=X Obstinate Asymmetric Tiler
 EAPI=7
 HOMEPAGE=https://github.com/seanpringle/xoat
-INHERIT=flag-o-matic git-r3 savedconfig toolchain-funcs
+INHERIT=git-r3 savedconfig toolchain-funcs
 IUSE=savedconfig
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=9f8fe0e64eaa3e8298fd251a28de0fa4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e1d927fa9d1edc75a70f7d20c3b8feac
diff --git a/metadata/md5-cache/x11-wm/xpra-3.0.5-r2 b/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
index e6a3ef5c96bc..cc0006a20588 100644
--- a/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
+++ b/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
@@ -3,7 +3,7 @@ DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_
 DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
 EAPI=6
 HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-INHERIT=xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
+INHERIT=xdg distutils-r1 flag-o-matic user tmpfiles prefix
 IUSE=+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-3.0.5.tar.xz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	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	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=24ba3ba7816838acc0d0fa92db9a8019
+_md5_=ed559b56c2367fcd783a885c4e1a0425
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-16 11:35:55 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-16 11:35:55 +0000
commit	ac892e0d09ee032a2534e3940980f94e7d7e1248 (patch)
tree	f02f2625a63008620e8522118d2e29da141d2ded /metadata/md5-cache
parent	Merge updates from master (diff)
download	gentoo-ac892e0d09ee032a2534e3940980f94e7d7e1248.tar.gz gentoo-ac892e0d09ee032a2534e3940980f94e7d7e1248.tar.bz2 gentoo-ac892e0d09ee032a2534e3940980f94e7d7e1248.zip