2021-04-03 16:06:05 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-03 16:06:07 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-03 16:06:07 +0000
commit: e2f78f63c97bec9626fe364aac1af5f5155422f6 (patch)
tree: 62d3982f0b3792a744eb6b77d4c9645b48ddb058 /metadata
parent: Merge updates from master (diff)
download: gentoo-e2f78f63c97bec9626fe364aac1af5f5155422f6.tar.gz
gentoo-e2f78f63c97bec9626fe364aac1af5f5155422f6.tar.bz2
gentoo-e2f78f63c97bec9626fe364aac1af5f5155422f6.zip
132 files changed, 430 insertions, 433 deletions
diff --git a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3 b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
index 205cfd4cd772..7643884f41dd 100644
--- a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
+++ b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
@@ -3,12 +3,12 @@ DEPEND=>=app-accessibility/flite-1.4 >=app-portage/elt-patches-20170815 || ( >=s
 DESCRIPTION=A speech server that allows screen readers to interact with festival lite
 EAPI=5
 HOMEPAGE=http://eflite.sourceforge.net
-INHERIT=autotools eutils epatch user
+INHERIT=autotools epatch user
 IUSE=+16k_voice
 KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-accessibility/flite-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/eflite/eflite-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=d680f663b15cddfe5ef9c089038c62ea
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=a06e6c86fbeedd1f84567d4ca8127075
diff --git a/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2 b/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
index 5f9e9f28b8bc..dd775935b9ac 100644
--- a/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
+++ b/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
@@ -1,12 +1,12 @@
+BDEPEND=>=app-arch/unzip-5.50-r2
 DEFINED_PHASES=compile install prepare
-DEPEND=>=app-arch/unzip-5.50-r2
-DESCRIPTION=braille translator from the National Federation of the Blind
-EAPI=6
+DESCRIPTION=Braille translator from the National Federation of the Blind
+EAPI=7
 HOMEPAGE=http://www.nfb.org/nfbtrans
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=669ba6e6f0caa99233098de5799ef559
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=79626daa4c7bcd6405ed08e88b8d8010
diff --git a/metadata/md5-cache/app-admin/ccze-0.2.1-r4 b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
index b8cb4bf8e670..1819e69bb320 100644
--- a/metadata/md5-cache/app-admin/ccze-0.2.1-r4
+++ b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libpcre sys-libs/ncurses:0= >=app-portage/elt-patches-20170815 |
 DESCRIPTION=A flexible and fast logfile colorizer
 EAPI=6
 HOMEPAGE=https://github.com/madhouse/ccze/releases
-INHERIT=fixheadtails autotools eutils toolchain-funcs
+INHERIT=autotools fixheadtails toolchain-funcs
 KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre sys-libs/ncurses:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=a4f5a5e6e8ab2d836f499f3e902fbeda
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	fixheadtails	1721997ed44d035654efe12da50797ef
+_md5_=e1253f55dc0340c692067fea5c80acc8
diff --git a/metadata/md5-cache/app-admin/keepass-2.46 b/metadata/md5-cache/app-admin/keepass-2.46
index b1d5ac822076..2e415d358330 100644
--- a/metadata/md5-cache/app-admin/keepass-2.46
+++ b/metadata/md5-cache/app-admin/keepass-2.46
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/mono app-arch/unzip
+DEPEND=dev-lang/mono
 DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
 EAPI=7
 HOMEPAGE=https://keepass.info/
+INHERIT=desktop optfeature wrapper xdg-utils
 IUSE=aot
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.46-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a0e31fa0d114076cc3f4b112828c564
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	6a2add34e06e5a05d88471a33ccdd73e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b9290ef5e2b58cb3ffbaee0ed5b4a0d
diff --git a/metadata/md5-cache/app-admin/keepass-2.47 b/metadata/md5-cache/app-admin/keepass-2.47
index a508133b267f..8b8bb37b46b5 100644
--- a/metadata/md5-cache/app-admin/keepass-2.47
+++ b/metadata/md5-cache/app-admin/keepass-2.47
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/mono app-arch/unzip
+DEPEND=dev-lang/mono
 DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
 EAPI=7
 HOMEPAGE=https://keepass.info/
+INHERIT=desktop optfeature wrapper xdg-utils
 IUSE=aot
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.47-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce919533ef3c01a5174fe2e67f3db260
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	6a2add34e06e5a05d88471a33ccdd73e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a769291097e04fe4ae5cfc7670d419dd
diff --git a/metadata/md5-cache/app-admin/lnav-0.8.5 b/metadata/md5-cache/app-admin/lnav-0.8.5
index 3185537e53fd..93c028110da0 100644
--- a/metadata/md5-cache/app-admin/lnav-0.8.5
+++ b/metadata/md5-cache/app-admin/lnav-0.8.5
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:0= dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-7
 DESCRIPTION=A curses-based tool for viewing and analyzing log files
 EAPI=7
 HOMEPAGE=https://lnav.org
-INHERIT=toolchain-funcs autotools
+INHERIT=autotools
 IUSE=unicode
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2:0= dev-db/sqlite:3 dev-libs/libpcre[cxx] >=net-misc/curl-
 SLOT=0
 SRC_URI=https://github.com/tstack/lnav/releases/download/v0.8.5/lnav-0.8.5.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=c78239ffb50199437afbfb6064ae5f7e
+_md5_=6ec8c1021ac84de0c04a71bca4153184
diff --git a/metadata/md5-cache/app-admin/lnav-0.9.0 b/metadata/md5-cache/app-admin/lnav-0.9.0
index 2871ca589ab8..668ccf9fd59e 100644
--- a/metadata/md5-cache/app-admin/lnav-0.9.0
+++ b/metadata/md5-cache/app-admin/lnav-0.9.0
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:0= >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc/
 DESCRIPTION=A curses-based tool for viewing and analyzing log files
 EAPI=7
 HOMEPAGE=https://lnav.org
-INHERIT=toolchain-funcs autotools
+INHERIT=autotools
 IUSE=unicode
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2:0= >=dev-db/sqlite-3.9.0 dev-libs/libpcre[cxx] >=net-misc
 SLOT=0
 SRC_URI=https://github.com/tstack/lnav/releases/download/v0.9.0/lnav-0.9.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=da5a95efc75059744a074299f04e053e
+_md5_=5f7e483fe1fdefe3f83af582c34c9c7a
diff --git a/metadata/md5-cache/app-admin/socklog-2.1.0 b/metadata/md5-cache/app-admin/socklog-2.1.0
index 113aee1acb61..40a6e33c3777 100644
--- a/metadata/md5-cache/app-admin/socklog-2.1.0
+++ b/metadata/md5-cache/app-admin/socklog-2.1.0
@@ -1,8 +1,8 @@
 DEFINED_PHASES=install prepare
-DESCRIPTION=small secure replacement for syslogd with automatic log rotation
+DESCRIPTION=Small secure replacement for syslogd with automatic log rotation
 EAPI=6
 HOMEPAGE=http://smarden.org/socklog/
-INHERIT=eutils toolchain-funcs flag-o-matic
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=sys-process/runit-1.4.0
 SLOT=0
 SRC_URI=http://smarden.org/socklog/socklog-2.1.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=e2f5d69a8f23ab15e51b4e3969b12b2e
+_md5_=fbbbf22bc5dcaa1df35528081c9f1e70
diff --git a/metadata/md5-cache/app-admin/tmpwatch-2.11-r2 b/metadata/md5-cache/app-admin/tmpwatch-2.11-r2
index ac93dc67c914..6697ea2fc6c5 100644
--- a/metadata/md5-cache/app-admin/tmpwatch-2.11-r2
+++ b/metadata/md5-cache/app-admin/tmpwatch-2.11-r2
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install
+DEPEND=!kernel_Darwin? ( sys-process/psmisc )
 DESCRIPTION=Files which haven't been accessed are removed from specified directories
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/tmpwatch
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs
 IUSE=selinux
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-tmpreaper )
+RDEPEND=!kernel_Darwin? ( sys-process/psmisc ) selinux? ( sec-policy/selinux-tmpreaper )
 SLOT=0
 SRC_URI=https://releases.pagure.org/tmpwatch/tmpwatch-2.11.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=4bd744d87d34d6fb44e703505e0d2e06
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=4583d6974913b6bc89b91e92a1230a8a
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.3.7 b/metadata/md5-cache/app-admin/tripwire-2.4.3.7
index 90a54e043477..cb4a4c18fe8b 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.3.7
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.3.7
@@ -3,7 +3,7 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=6
 HOMEPAGE=http://www.tripwire.org/
-INHERIT=autotools eutils flag-o-matic
+INHERIT=autotools flag-o-matic
 IUSE=libressl selinux ssl static +tools
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:
 SLOT=0
 SRC_URI=https://github.com/Tripwire/tripwire-open-source/archive/2.4.3.7.tar.gz -> tripwire-2.4.3.7.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=445e9d5924c8a9b7be9e2a1e1ce8ff02
+_md5_=6ddb7c307179fb66be9543b7d3ce672d
diff --git a/metadata/md5-cache/app-admin/usbview-2.0 b/metadata/md5-cache/app-admin/usbview-2.0
index 1b70d957d7c0..63b5e2705879 100644
--- a/metadata/md5-cache/app-admin/usbview-2.0
+++ b/metadata/md5-cache/app-admin/usbview-2.0
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install setup
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 virtual/pkgconfig
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 DESCRIPTION=Display the topology of devices on the USB bus
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.kroah.com/linux-usb/
-INHERIT=eutils linux-info
+INHERIT=desktop linux-info
 IUSE=kernel_linux
 KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://www.kroah.com/linux-usb/usbview-2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=6101b91dfcd107c88c26c08b4d89ecf4
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=0da8448f93888ab19884604ec365f75a
diff --git a/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1 b/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
index d67518f49b5a..a4e1786913f0 100644
--- a/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
+++ b/metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
-DESCRIPTION=watches directories and processes files
-EAPI=6
+DESCRIPTION=Watches directories and processes files
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/watchfolder-0.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=222901895c02947248bb8e7ba5f05889
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=0d2841d61fc73ac00123485f957c3f96
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0-r2 b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
index 8c5f979fc5e5..1bf65f85bd40 100644
--- a/metadata/md5-cache/app-arch/makeself-2.2.0-r2
+++ b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install unpack
-DESCRIPTION=shell script that generates a self-extractible tar.gz
-EAPI=6
+DESCRIPTION=Shell script that generates a self-extractible tar.gz
+EAPI=7
 HOMEPAGE=http://www.megastep.org/makeself/
-INHERIT=unpacker eutils
+INHERIT=unpacker
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=35ae7bdf4775a969dafd228fa43bac5a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213
+_md5_=c02a669a1c8f12a5c082d9e4e12f7189
diff --git a/metadata/md5-cache/app-arch/mt-st-1.3 b/metadata/md5-cache/app-arch/mt-st-1.3
index f86b28e45abc..259ceb2033f7 100644
--- a/metadata/md5-cache/app-arch/mt-st-1.3
+++ b/metadata/md5-cache/app-arch/mt-st-1.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
-DESCRIPTION=control magnetic tape drive operation
-EAPI=6
+DESCRIPTION=Control magnetic tape drive operation
+EAPI=7
 HOMEPAGE=https://github.com/iustin/mt-st
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/iustin/mt-st/releases/download/mt-st-1.3/mt-st-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=f17257653ff2038dbdd69a5d7022d622
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a498f814f6f96a6be6edc4ef597778ad
diff --git a/metadata/md5-cache/app-arch/mt-st-1.4 b/metadata/md5-cache/app-arch/mt-st-1.4
index 24f60664921b..0690fb00be0f 100644
--- a/metadata/md5-cache/app-arch/mt-st-1.4
+++ b/metadata/md5-cache/app-arch/mt-st-1.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=control magnetic tape drive operation
 EAPI=7
 HOMEPAGE=https://github.com/iustin/mt-st
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/iustin/mt-st/releases/download/v1.4/mt-st-1.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6b3f9afc86f5d5dda039c284ddd76744
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3f93a5d48ae1fa5e2236998e711d8cf0
diff --git a/metadata/md5-cache/app-arch/mt-st-9999 b/metadata/md5-cache/app-arch/mt-st-9999
index 54016294d5f9..348e3095cf24 100644
--- a/metadata/md5-cache/app-arch/mt-st-9999
+++ b/metadata/md5-cache/app-arch/mt-st-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=9d7dd15a3db5091ffe3992da04a71587
+_md5_=50d9d0cd32d5b0db09d7e707b068e967
diff --git a/metadata/md5-cache/app-backup/pdumpfs-1.3-r2 b/metadata/md5-cache/app-backup/pdumpfs-1.3-r2
index 6dec6aa26bdd..c52938fcba8f 100644
--- a/metadata/md5-cache/app-backup/pdumpfs-1.3-r2
+++ b/metadata/md5-cache/app-backup/pdumpfs-1.3-r2
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ruby-2.0.0_p598
 DESCRIPTION=A daily backup system similar to Plan9's dumpfs
 EAPI=5
 HOMEPAGE=http://0xcc.net/pdumpfs/
-INHERIT=eutils
+INHERIT=epatch
 IUSE=l10n_ja
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://0xcc.net/pdumpfs/pdumpfs-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=ad3b9ea50c4db11d7104c66f42a71876
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347
+_md5_=4615bb7d02b2fa8dad5da0d824d27a2a
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1 b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
index 940a42563be5..2c1996e67e2a 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
+++ b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
@@ -3,7 +3,7 @@ DEPEND=dev-util/patchelf
 DESCRIPTION=Secure free online backup, storage, and sharing system
 EAPI=6
 HOMEPAGE=https://spideroak.com
-INHERIT=eutils unpacker
+INHERIT=desktop unpacker
 IUSE=dbus X
 KEYWORDS=~amd64 ~x86
 LICENSE=spideroak
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng-compat:1.2 dbus? ( sys-ap
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.5.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.5.0_amd64.deb )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=8f8e5d233b8c29f2c409b247892a4970
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213
+_md5_=c373e40fba43e0525588f9c0aeacd4b0
diff --git a/metadata/md5-cache/app-benchmarks/acovea-gtk-1.0.1 b/metadata/md5-cache/app-benchmarks/acovea-gtk-1.0.1
index d70b0e331ea9..eb0638e8807d 100644
--- a/metadata/md5-cache/app-benchmarks/acovea-gtk-1.0.1
+++ b/metadata/md5-cache/app-benchmarks/acovea-gtk-1.0.1
@@ -1,14 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=>=app-benchmarks/acovea-5 dev-cpp/gtkmm:2.4 >=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=>=app-benchmarks/acovea-5 dev-cpp/gtkmm:2.4
 DESCRIPTION=Analysis of Compiler Options via Evolutionary Algorithm GUI
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.coyotegulch.com/products/acovea/
-INHERIT=autotools eutils flag-o-matic
+INHERIT=autotools desktop flag-o-matic
 IUSE=unicode
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-benchmarks/acovea-5 dev-cpp/gtkmm:2.4
 SLOT=0
 SRC_URI=http://www.coyotegulch.com/distfiles/acovea-gtk-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=3091c7f783a16bd19a795267956de803
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=cf6dd04f4890f1ba1f257a5eef299aaf
diff --git a/metadata/md5-cache/app-benchmarks/i7z-93_p20131012-r2 b/metadata/md5-cache/app-benchmarks/i7z-93_p20131012-r2
index 0ef7bda479d2..a3045e71b029 100644
--- a/metadata/md5-cache/app-benchmarks/i7z-93_p20131012-r2
+++ b/metadata/md5-cache/app-benchmarks/i7z-93_p20131012-r2
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install
 DEPEND=sys-libs/ncurses:0= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=A better i7 (and now i3, i5) reporting tool for Linux
 EAPI=7
 HOMEPAGE=https://github.com/ajaiantilal/i7z
+INHERIT=qmake-utils toolchain-funcs
 IUSE=qt5
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/ajaiantilal/i7z/archive/5023138d7c35c4667c938b853e5ea89737334e92.tar.gz -> i7z-93_p20131012.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70719678dc6093440a44a54172e7fd8c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
+_md5_=b06a34917c9f963cdf31b0aea03a0288
diff --git a/metadata/md5-cache/app-benchmarks/libc-bench-20110206 b/metadata/md5-cache/app-benchmarks/libc-bench-20110206
index a4216f777d6c..48ee93c71a89 100644
--- a/metadata/md5-cache/app-benchmarks/libc-bench-20110206
+++ b/metadata/md5-cache/app-benchmarks/libc-bench-20110206
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=Time and memory-efficiency tests of various C/POSIX standard library functions
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.etalabs.net/libc-bench.html http://git.musl-libc.org/cgit/libc-bench/
-INHERIT=eutils toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.etalabs.net/releases/libc-bench-20110206.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=fd9030f16366f107115733e39b4a39c6
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=110744df95f32f34c0c2c3400153301e
diff --git a/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1 b/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
index 7b09ea2d8f17..719df4dbc666 100644
--- a/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
+++ b/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=A Tcl/Tk GUI for writing DVDs and CDs
-EAPI=5
+EAPI=7
 HOMEPAGE=http://regis.damongeot.free.fr/tkdvd/
-INHERIT=eutils
+INHERIT=desktop
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-lang/tcl:0 dev-lang/tk:0
 SLOT=0
 SRC_URI=http://regis.damongeot.free.fr/tkdvd/dl/tkdvd-4.0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=584c2ccad994765a2906472218a352b7
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=1ef403583e2f1da8d8f68e9bcbfc8fb2
diff --git a/metadata/md5-cache/app-crypt/gorilla-1.4-r1 b/metadata/md5-cache/app-crypt/gorilla-1.4-r1
index c537942b726b..ab0df8235ed1 100644
--- a/metadata/md5-cache/app-crypt/gorilla-1.4-r1
+++ b/metadata/md5-cache/app-crypt/gorilla-1.4-r1
@@ -1,13 +1,11 @@
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install
 DEPEND=>=dev-lang/tcl-8.4.19:0 >=dev-lang/tk-8.4.19:0 dev-tcltk/iwidgets dev-tcltk/bwidget
 DESCRIPTION=Password Safe in secure way with GUI interface
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/zdia/gorilla/wiki
-INHERIT=eutils
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tcl-8.4.19:0 >=dev-lang/tk-8.4.19:0 dev-tcltk/iwidgets dev-tcltk/bwidget
 SLOT=0
 SRC_URI=https://github.com/zdia/gorilla/archive/v1.4.tar.gz -> gorilla-1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=15979381ca8bfbf40b46e9e52a3ca60a
+_md5_=5a475f401148c0ca4ad694ad0f31bc50
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.3 b/metadata/md5-cache/app-crypt/libmd-1.0.3
index 93b49aa8b91c..eeaa1508f31f 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.3
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.3
@@ -6,5 +6,4 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.3.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3bdad3894dac18fe4b1e22bac2fb9f69
+_md5_=df29be1bda169aa30e13d55316042fc0
diff --git a/metadata/md5-cache/app-crypt/libmd-9999 b/metadata/md5-cache/app-crypt/libmd-9999
index c2d4f6e481f3..16f2b8729d9a 100644
--- a/metadata/md5-cache/app-crypt/libmd-9999
+++ b/metadata/md5-cache/app-crypt/libmd-9999
@@ -8,4 +8,4 @@ LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 PROPERTIES=live
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=90482c46bc30b36651c709fac0d58761
+_md5_=7bd88bde0d3a6a7def42e07053d013a4
diff --git a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0 b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
index faf6f28b0f9a..44698280c603 100644
--- a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
+++ b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-pkcs11/releases/download/1.5.0/tpm2-pkcs11-1.5.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
-_md5_=3ca46a0980ecf347a0740f8ec00c5719
+_md5_=a1b7a60fc42b24117e2485602efd78aa
diff --git a/metadata/md5-cache/app-misc/gentoo-0.20.7 b/metadata/md5-cache/app-misc/gentoo-0.20.7
index f5057b562686..a68cb19e69ee 100644
--- a/metadata/md5-cache/app-misc/gentoo-0.20.7
+++ b/metadata/md5-cache/app-misc/gentoo-0.20.7
@@ -3,12 +3,12 @@ DEPEND=>x11-libs/gtk+-3.12:3 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf
 DESCRIPTION=Graphical file manager for Unix-like systems, using GTK+
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/gentoo/
-INHERIT=autotools eutils
+INHERIT=autotools desktop
 IUSE=nls
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>x11-libs/gtk+-3.12:3 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/gentoo/gentoo-0.20.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=7869c8e60f78c35786b38e37f4a3fff2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=901ac42bb2e74b31716786c2ca8567d4
diff --git a/metadata/md5-cache/app-misc/razertool-0.0.7-r4 b/metadata/md5-cache/app-misc/razertool-0.0.7-r4
index 5f4524412129..c3808b9cbe26 100644
--- a/metadata/md5-cache/app-misc/razertool-0.0.7-r4
+++ b/metadata/md5-cache/app-misc/razertool-0.0.7-r4
@@ -3,12 +3,12 @@ DEPEND=dev-libs/glib:2 virtual/libusb:0 gtk? ( dev-libs/atk >=gnome-base/librsvg
 DESCRIPTION=Unofficial tool for controlling the Razer Copperhead mouse
 EAPI=6
 HOMEPAGE=http://razertool.sourceforge.net/
-INHERIT=autotools eutils
+INHERIT=autotools desktop
 IUSE=gtk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 virtual/libusb:0 gtk? ( dev-libs/atk >=gnome-base/librsvg-2.0 >=x11-libs/cairo-1.0.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.8.0:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/razertool/razertool_0.0.7.orig.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=fb53f1baccfd81a0c12a645828455d8a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=a1daf2c96300bdf8484d9d451df079de
diff --git a/metadata/md5-cache/app-shells/mksh-59c b/metadata/md5-cache/app-shells/mksh-59c
index 06d7c04503d7..d35a8d2a7d5c 100644
--- a/metadata/md5-cache/app-shells/mksh-59c
+++ b/metadata/md5-cache/app-shells/mksh-59c
@@ -3,11 +3,12 @@ DEPEND=test? ( dev-lang/perl sys-apps/ed )
 DESCRIPTION=MirBSD Korn Shell
 EAPI=7
 HOMEPAGE=http://mirbsd.de/mksh
+INHERIT=toolchain-funcs
 IUSE=lksh static test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=becb7b05725a1c28478262a3bdeb87fd
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=50a8cb64b41ea51e03faf18384ae0883
diff --git a/metadata/md5-cache/app-shells/mksh-9999 b/metadata/md5-cache/app-shells/mksh-9999
index c03aeae407c5..13a6f2a9b47e 100644
--- a/metadata/md5-cache/app-shells/mksh-9999
+++ b/metadata/md5-cache/app-shells/mksh-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-vcs/cvs
+BDEPEND=dev-vcs/cvs net-misc/openssh
 DEFINED_PHASES=compile install prepare test unpack
 DEPEND=test? ( dev-lang/perl sys-apps/ed )
 DESCRIPTION=MirBSD Korn Shell
@@ -11,4 +11,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	cvs	8f8740beb4ce1deaae8393cfc28d2ed1
-_md5_=2e93c5dcdf8b59ddaad5fbf2bf56e7af
+_md5_=8727e3818767ef57b665641f536052d6
diff --git a/metadata/md5-cache/app-text/ding-1.8.1 b/metadata/md5-cache/app-text/ding-1.8.1
index cb1be4cbcb85..87ee7de75f82 100644
--- a/metadata/md5-cache/app-text/ding-1.8.1
+++ b/metadata/md5-cache/app-text/ding-1.8.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Tk based dictionary (German-English) (incl. dictionary itself)
 EAPI=6
 HOMEPAGE=https://www-user.tu-chemnitz.de/~fri/ding/
-INHERIT=eutils
+INHERIT=desktop
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tk-8.3
 SLOT=0
 SRC_URI=http://wftp.tu-chemnitz.de/pub/Local/urz/ding/ding-1.8.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=637b45899d91ce7b76ee7afa4b78a1dd
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=64bb49fc7eacadc8a6d486303cc6cba3
diff --git a/metadata/md5-cache/app-text/htmlc-2.40.0 b/metadata/md5-cache/app-text/htmlc-2.40.0
index fd5f075fad2f..308748b67293 100644
--- a/metadata/md5-cache/app-text/htmlc-2.40.0
+++ b/metadata/md5-cache/app-text/htmlc-2.40.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install
 DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
 DESCRIPTION=HTML template files expander
-EAPI=5
+EAPI=7
 HOMEPAGE=http://htmlc.inria.fr/
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~ppc x86
@@ -9,4 +9,4 @@ LICENSE=htmlc
 RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
 SLOT=0
 SRC_URI=http://htmlc.inria.fr/htmlc-2.4.0.tgz
-_md5_=df7b6bb858c039860e4deb87a939fec0
+_md5_=0196278a2d2a5dea92cc6ab957b36335
diff --git a/metadata/md5-cache/app-text/htmlc-2.60.0 b/metadata/md5-cache/app-text/htmlc-2.60.0
index 851fd0a02c7b..5251dbc238b1 100644
--- a/metadata/md5-cache/app-text/htmlc-2.60.0
+++ b/metadata/md5-cache/app-text/htmlc-2.60.0
@@ -1,14 +1,12 @@
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install
 DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
 DESCRIPTION=HTML template files expander
-EAPI=5
+EAPI=7
 HOMEPAGE=http://htmlc.inria.fr/
-INHERIT=eutils
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=htmlc
 RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
 SLOT=0
 SRC_URI=http://htmlc.inria.fr/htmlc-2.6.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=8b23b978921e1afa773c3533cdce714d
+_md5_=54a483ffd6045c041f6e5350a33a3dd5
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r3 b/metadata/md5-cache/app-text/xmlto-0.0.28-r3
index 998fc9aa9232..ca776b25b3d1 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r3
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r3
@@ -3,12 +3,12 @@ DEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2
 DESCRIPTION=script for converting XML and DocBook documents to a variety of output formats
 EAPI=5
 HOMEPAGE=https://pagure.io/xmlto
-INHERIT=eutils
+INHERIT=epatch
 IUSE=latex text
 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=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed >=sys-apps/coreutils-6.10-r1 || ( sys-apps/util-linux app-misc/getopt ) sys-apps/which text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( dev-texlive/texlive-formatsextra )
 SLOT=0
 SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=1cbc462edca0739a94625a4802d6b7df
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347
+_md5_=5f04a1ba7afae73759bf6b39de68a796
diff --git a/metadata/md5-cache/dev-games/aseprite-1.1.6 b/metadata/md5-cache/dev-games/aseprite-1.1.6
index 60d8906daa03..31977f0c5ecb 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.1.6
+++ b/metadata/md5-cache/dev-games/aseprite-1.1.6
@@ -3,7 +3,7 @@ DEPEND=dev-libs/tinyxml media-libs/allegro:0[X,png] media-libs/freetype media-li
 DESCRIPTION=Animated sprite editor & pixel art tool
 EAPI=6
 HOMEPAGE=https://www.aseprite.org
-INHERIT=cmake-utils eutils flag-o-matic
+INHERIT=cmake-utils desktop flag-o-matic
 IUSE=debug kde gtk3 test webp
 KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2 MIT
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml media-libs/allegro:0[X,png] media-libs/freetype media-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.6/Aseprite-v1.1.6-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=81ef7324724ae197127ffce32567f9c7
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
+_md5_=a005134a8c1106ba985952d992fc0e0b
diff --git a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1 b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
index 44936dda1a5f..cde45217ce15 100644
--- a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
@@ -3,10 +3,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=A Comprehensive Open Source Library for Galois Field Arithmetic
 EAPI=7
 HOMEPAGE=http://jerasure.org
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/gf-complete-2.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=21b4a212b1919ad7ff16e6ac2f286cec
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=890939a432d23634afed9e4850acbee9
diff --git a/metadata/md5-cache/dev-libs/libev-4.33 b/metadata/md5-cache/dev-libs/libev-4.33
index aba0e06caf29..3db2ae021ea7 100644
--- a/metadata/md5-cache/dev-libs/libev-4.33
+++ b/metadata/md5-cache/dev-libs/libev-4.33
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=7
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
-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
 LICENSE=|| ( BSD GPL-2 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.33.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=089f6efaa066bf6e46de518379d79e5b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=b476ffa54bce3365ead463bc2b2d3fd5
diff --git a/metadata/md5-cache/dev-libs/liblist-2.4 b/metadata/md5-cache/dev-libs/liblist-2.4
deleted file mode 100644
index 71d69c4d4395..000000000000
--- a/metadata/md5-cache/dev-libs/liblist-2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst
-DEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
-DESCRIPTION=Generic linked-list manipulation routines, plus queues and stacks
-EAPI=7
-HOMEPAGE=http://ohnopub.net/liblist
-INHERIT=autotools
-IUSE=doc examples
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
-SLOT=0
-SRC_URI=ftp://ohnopublishing.net/mirror/liblist-2.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=6e3e89c89cbbc35482f675f4bb200b8e
diff --git a/metadata/md5-cache/dev-libs/liblist-2.4-r1 b/metadata/md5-cache/dev-libs/liblist-2.4-r1
new file mode 100644
index 000000000000..d1b6f3235a15
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblist-2.4-r1
@@ -0,0 +1,11 @@
+BDEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
+DEFINED_PHASES=configure install postinst
+DESCRIPTION=Generic linked-list manipulation routines, plus queues and stacks
+EAPI=7
+HOMEPAGE=http://ohnopub.net/liblist
+IUSE=doc examples
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ohnopublishing.net/mirror/liblist-2.4.tar.bz2
+_md5_=500c77c56d60e60ba83d8bd6cd6e9710
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1 b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
index 1112d3771cf2..33ad3486011f 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.4-r1
@@ -3,10 +3,11 @@ DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=6
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/
+INHERIT=toolchain-funcs
 IUSE=doc static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=1.1
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-1.1.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca725d4c0a62f6019c62d86fbd4bd7b2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e0c6cdaa16b602246bdb9ac1e4a03297
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.9999 b/metadata/md5-cache/dev-libs/libnl-1.1.9999
index 19875ce9de99..c19016076237 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.9999
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.9999
@@ -1,13 +1,12 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
 EAPI=7
 HOMEPAGE=https://www.infradead.org/~tgr/libnl/
-INHERIT=git-r3 multilib toolchain-funcs
+INHERIT=git-r3 toolchain-funcs
 IUSE=doc static-libs
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=1.1
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=751899fc69824481be2f264c58acab49
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d04db0328e46831a4782ca6431dc242a
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
index 55b6068d43c3..7c11b45871c5 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
@@ -1,13 +1,14 @@
+BDEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
-DESCRIPTION=library for building efficient parsers, written in C
+DESCRIPTION=Library for building efficient parsers, written in C
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
+INHERIT=flag-o-matic
 IUSE=iconv test
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=439f10fc73e8667f05fef0963ff151b1
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=d8eb66dabf7fb1dc304fc18a5925fd0f
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
index b5061688ab17..103df68e8ab2 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
@@ -1,5 +1,5 @@
+BDEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl )
 DESCRIPTION=C library for building efficient parsers
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	netsurf	af8fe1901b583a379a6a32af919cea05
-_md5_=57bcb1deb81c6a4cdac2806ff5fecdc3
+_md5_=a73f7f5bf781c249576259bb5ec07152
diff --git a/metadata/md5-cache/dev-libs/libserialport-0.1.1 b/metadata/md5-cache/dev-libs/libserialport-0.1.1
index 376143bade33..5372f56216f8 100644
--- a/metadata/md5-cache/dev-libs/libserialport-0.1.1
+++ b/metadata/md5-cache/dev-libs/libserialport-0.1.1
@@ -1,13 +1,11 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig
 DESCRIPTION=Cross platform serial port access library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sigrok.org/wiki/Libserialport
-INHERIT=eutils ltprune
 IUSE=static-libs
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/libserialport/libserialport-0.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=962b37d2c553e46c5d83025f1525e1e0
+_md5_=479726962020bc62acde9c82ad25f99d
diff --git a/metadata/md5-cache/dev-libs/libserialport-9999 b/metadata/md5-cache/dev-libs/libserialport-9999
index 69ee844c9709..a78679ac9b61 100644
--- a/metadata/md5-cache/dev-libs/libserialport-9999
+++ b/metadata/md5-cache/dev-libs/libserialport-9999
@@ -1,12 +1,12 @@
+BDEPEND=virtual/pkgconfig >=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=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=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=Cross platform serial port access library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sigrok.org/wiki/Libserialport
-INHERIT=eutils ltprune git-r3 autotools
+INHERIT=autotools git-r3
 IUSE=static-libs
 LICENSE=LGPL-3
 PROPERTIES=live
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=9ef6982be3aa06f74bf517614269eb0b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=6ab9ca5b5aabf78dd85a614dbc069b9c
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1 b/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1
index f2296fb2d67f..0f8cccc3fdfd 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.15.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=ASN.1 library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
-INHERIT=autotools multilib-minimal libtool
+INHERIT=autotools multilib-minimal
 IUSE=doc static-libs test valgrind 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=GPL-3 LGPL-2.1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.15.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=2b3c4a6dcbcdb599aa817c5ed56a71b1
+_md5_=242bd6f532876c6e753469148655b43d
diff --git a/metadata/md5-cache/dev-libs/libvformat-1.13-r2 b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
index b2c5f1ee557f..4c9e049a974e 100644
--- a/metadata/md5-cache/dev-libs/libvformat-1.13-r2
+++ b/metadata/md5-cache/dev-libs/libvformat-1.13-r2
@@ -1,13 +1,12 @@
+BDEPEND=>=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=>=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=Library to read and write vcard files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/vformat/
-INHERIT=eutils autotools ltprune
-IUSE=static-libs
+INHERIT=autotools
 KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libv/libvformat/libvformat_1.13.orig.tar.gz mirror://debian/pool/main/libv/libvformat/libvformat_1.13-10.debian.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=e8806e24bf1f7c1bf57d9a5d4e5652f2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=2a094b0c33cb0560be98690e86991d80
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
index cea9f361f19f..d4ccad130e0c 100644
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
@@ -1,13 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=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=Small library to access XDG Base Directories Specification paths
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/devnev/libxdg-basedir
-INHERIT=autotools eutils
-IUSE=doc static-libs
+INHERIT=autotools
+IUSE=doc
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=d0e208b0f5d5a1b3128df94f704cc56a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=192799c4f58b3f8fa6125c5870ea40af
diff --git a/metadata/md5-cache/dev-libs/libxls-1.6.2 b/metadata/md5-cache/dev-libs/libxls-1.6.2
index 275ee6811814..96e078c66d2e 100644
--- a/metadata/md5-cache/dev-libs/libxls-1.6.2
+++ b/metadata/md5-cache/dev-libs/libxls-1.6.2
@@ -8,5 +8,4 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0/8
 SRC_URI=https://github.com/libxls/libxls/releases/download/v1.6.2/libxls-1.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b469954a1129170b4efd5578969e616
+_md5_=d6a2d1721a2dbe12c24b1a54bff329b0
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
index 46aa0fa8c7a5..121aaf4f5c3f 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=libtool flag-o-matic python-r1 autotools prefix multilib-minimal
+INHERIT=autotools flag-o-matic prefix python-r1 multilib-minimal
 IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 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=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-patchset.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	autotools	6ff8412ccf96444868b310b0a28973ba	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=4c2bcda892639749c83a0a281e4d408b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=169f754d2734a4b5e1ee94a558566581
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5
index b9de8cd4a7a1..a6a7cb420e77 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r5
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=XML C parser and toolkit
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=autotools libtool flag-o-matic python-r1 prefix multilib-minimal
+INHERIT=autotools flag-o-matic prefix python-r1 multilib-minimal
 IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 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=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-patchset.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=78d747793c315f0081915257488e1504
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=1520a77beea10145f066c485a4a6e10a
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
index e95790c5c03b..e800772f0c6b 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=XSLT libraries and tools
 EAPI=7
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt
-INHERIT=libtool multilib-minimal toolchain-funcs
+INHERIT=libtool multilib-minimal
 IUSE=crypt debug examples static-libs elibc_Darwin 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=MIT
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=6d074ff0a4b7a4925bbf2981c8769f83
+_md5_=1866a968883c3ad33cdc5e9f019fccfe
diff --git a/metadata/md5-cache/dev-libs/log4sh-1.4.2 b/metadata/md5-cache/dev-libs/log4sh-1.4.2
index ebc36f528975..5d94ba4b4dfa 100644
--- a/metadata/md5-cache/dev-libs/log4sh-1.4.2
+++ b/metadata/md5-cache/dev-libs/log4sh-1.4.2
@@ -1,13 +1,11 @@
 DEFINED_PHASES=compile install postinst test
 DESCRIPTION=A flexible logging framework for shell scripts
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/log4sh
-INHERIT=eutils
 IUSE=examples
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=mirror://sourceforge/log4sh/log4sh-1.4.2.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=ed295665d602d4b8da9eea0981ba0c33
+_md5_=325b59cb94833044bd3a1503155fa6d3
diff --git a/metadata/md5-cache/dev-libs/maloc-1.5-r1 b/metadata/md5-cache/dev-libs/maloc-1.5-r1
index 74ce07a45fce..337d1d541c9e 100644
--- a/metadata/md5-cache/dev-libs/maloc-1.5-r1
+++ b/metadata/md5-cache/dev-libs/maloc-1.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
 EAPI=7
 HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
 INHERIT=autotools
-IUSE=doc mpi static-libs
+IUSE=doc mpi
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/maloc-1.5.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=9218f46978774e8f82aeb1da18cb1f89
+_md5_=82d228ad26492722ecfc89fef04455ed
diff --git a/metadata/md5-cache/dev-libs/mathjax-2.7.0 b/metadata/md5-cache/dev-libs/mathjax-2.7.0
index 6ea0d5a53da4..9e428f3481d9 100644
--- a/metadata/md5-cache/dev-libs/mathjax-2.7.0
+++ b/metadata/md5-cache/dev-libs/mathjax-2.7.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=JavaScript display engine for LaTeX, MathML and AsciiMath
 EAPI=6
 HOMEPAGE=https://www.mathjax.org/
-INHERIT=eutils vcs-clean
+INHERIT=vcs-clean
 IUSE=doc examples
 KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax/archive/2.7.0.tar.gz -> mathjax-2.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=dcb8a6671e1cd2fc34331e7c0f0932a6
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93063b7add57ea5a6b4936857420f888
diff --git a/metadata/md5-cache/dev-libs/mathjax-2.7.4 b/metadata/md5-cache/dev-libs/mathjax-2.7.4
index 8b442a713eca..0a7ecb08f40c 100644
--- a/metadata/md5-cache/dev-libs/mathjax-2.7.4
+++ b/metadata/md5-cache/dev-libs/mathjax-2.7.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=JavaScript display engine for LaTeX, MathML and AsciiMath
 EAPI=6
 HOMEPAGE=https://www.mathjax.org/
-INHERIT=eutils vcs-clean
+INHERIT=vcs-clean
 IUSE=doc examples
 KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax/archive/2.7.4.tar.gz -> mathjax-2.7.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=dcb8a6671e1cd2fc34331e7c0f0932a6
+_eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93063b7add57ea5a6b4936857420f888
diff --git a/metadata/md5-cache/dev-libs/mathjax-2.7.7 b/metadata/md5-cache/dev-libs/mathjax-2.7.7
index 6c83772bcb53..a9c778189915 100644
--- a/metadata/md5-cache/dev-libs/mathjax-2.7.7
+++ b/metadata/md5-cache/dev-libs/mathjax-2.7.7
@@ -2,6 +2,7 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=JavaScript display engine for LaTeX, MathML and AsciiMath
 EAPI=7
 HOMEPAGE=https://www.mathjax.org/
+INHERIT=vcs-clean
 IUSE=doc examples
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
@@ -10,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax/archive/2.7.7.tar.gz -> mathjax-2.7.7.tar.gz
 _eclasses_=vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af33fa58dddbeed5fd72c0c3326c9b72
+_md5_=960c1607b6700d0ad442e73471937835
diff --git a/metadata/md5-cache/dev-libs/popt-1.16-r2 b/metadata/md5-cache/dev-libs/popt-1.16-r2
index 8faa9edda7d0..5a4ed439950c 100644
--- a/metadata/md5-cache/dev-libs/popt-1.16-r2
+++ b/metadata/md5-cache/dev-libs/popt-1.16-r2
@@ -3,12 +3,12 @@ DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
 DESCRIPTION=Parse Options - Command line parser
 EAPI=5
 HOMEPAGE=http://rpm5.org/
-INHERIT=eutils multilib-minimal libtool ltprune
+INHERIT=epatch multilib-minimal libtool ltprune
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://rpm5.org/files/popt/popt-1.16.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	libtool	f143db5a74ccd9ca28c1234deffede96
-_md5_=0851861c88098b68917003d2c2b43953
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	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	libtool	f143db5a74ccd9ca28c1234deffede96
+_md5_=3411433a38450043dc001c02defd0046
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
index b5341dc460b9..afb171a74d96 100644
--- a/metadata/md5-cache/dev-libs/popt-1.18
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -12,4 +12,4 @@ RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	libtool	f143db5a74ccd9ca28c1234deffede96
-_md5_=e74f171e0f083f90b5b5500a6adddab1
+_md5_=e5e5283b55d1e4705f33e20004bcd6f2
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.7.1 b/metadata/md5-cache/dev-libs/simdjson-0.7.1
index d02174f3952a..cd91930a02ce 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.7.1
+++ b/metadata/md5-cache/dev-libs/simdjson-0.7.1
@@ -4,7 +4,7 @@ DEPEND=tools? ( dev-libs/cxxopts:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
 EAPI=7
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-INHERIT=toolchain-funcs cmake
+INHERIT=cmake
 IUSE=test tools
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/simdjson/simdjson/archive/v0.7.1.tar.gz -> simdjson-0.7.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	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=4b5c09d761e0dd99b30957c28dd51200
+_md5_=4e2dae7fb557f4f591bd2e232f316916
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.8.2 b/metadata/md5-cache/dev-libs/simdjson-0.8.2
index 9a242dd60a57..f2f06b2dd5b2 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.8.2
+++ b/metadata/md5-cache/dev-libs/simdjson-0.8.2
@@ -4,7 +4,7 @@ DEPEND=tools? ( dev-libs/cxxopts:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
 EAPI=7
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-INHERIT=toolchain-funcs cmake
+INHERIT=cmake
 IUSE=test tools
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/simdjson/simdjson/archive/v0.8.2.tar.gz -> simdjson-0.8.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	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=a7dfbc8484a3c30abf2e1cf32459198d
+_md5_=ce8f4a6a2bb1dc42a12f2d14b8658f7d
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.9.2 b/metadata/md5-cache/dev-libs/simdjson-0.9.2
index 538d41512441..2a20eb817e68 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.9.2
+++ b/metadata/md5-cache/dev-libs/simdjson-0.9.2
@@ -4,7 +4,7 @@ DEPEND=tools? ( dev-libs/cxxopts:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
 EAPI=7
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-INHERIT=toolchain-funcs cmake
+INHERIT=cmake
 IUSE=test tools
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/simdjson/simdjson/archive/v0.9.2.tar.gz -> simdjson-0.9.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	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=5b9095615d090e75bdd10f40c864f199
+_md5_=e7a2fc7d2aa5a37dc4ad77c89465446d
diff --git a/metadata/md5-cache/dev-libs/squareball-0.2.0 b/metadata/md5-cache/dev-libs/squareball-0.2.0
index f2e66ca18236..62ba9235c9ef 100644
--- a/metadata/md5-cache/dev-libs/squareball-0.2.0
+++ b/metadata/md5-cache/dev-libs/squareball-0.2.0
@@ -1,14 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/pkgconfig test? ( dev-util/cmocka ) doc? ( app-doc/doxygen )
+DEPEND=test? ( dev-util/cmocka )
 DESCRIPTION=A general-purpose library for C99
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/rafaelmartins/squareball
-INHERIT=eutils ltprune
 IUSE=doc test static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/squareball/releases/download/v0.2.0/squareball-0.2.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=c77674093a06963c69da0f02aac2fac2
+_md5_=86efb22f888a7aa14da55fd702a954e1
diff --git a/metadata/md5-cache/dev-libs/squareball-9999 b/metadata/md5-cache/dev-libs/squareball-9999
index 293efc2135a3..f3d3b1e65609 100644
--- a/metadata/md5-cache/dev-libs/squareball-9999
+++ b/metadata/md5-cache/dev-libs/squareball-9999
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/pkgconfig test? ( dev-util/cmocka ) doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] >=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=test? ( dev-util/cmocka )
 DESCRIPTION=A general-purpose library for C99
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/rafaelmartins/squareball
-INHERIT=git-r3 autotools eutils ltprune
+INHERIT=autotools git-r3
 IUSE=doc test static-libs
 LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=c77674093a06963c69da0f02aac2fac2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=0ce23fdc99f1102b65ca73f7dc1572b6
diff --git a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1 b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
index 33a337efd0cf..bf5ef0886266 100644
--- a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
+++ b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=prepare
+BDEPEND=sys-devel/libtool >=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 prepare
 DESCRIPTION=Library that supports Base64 (MIME), uuencode, xxencode and binhex coding
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
-INHERIT=eutils toolchain-funcs
+INHERIT=autotools toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=1c94ed77abc7423e3927b5b157ca42e4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=52cbbd8e45fc30ac01b55005b020e818
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.25 b/metadata/md5-cache/dev-libs/xapian-1.2.25
index 760ecca43ac0..42dadeac6333 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.25
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.25
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=https://www.xapian.org/
-INHERIT=eutils multilib-minimal
+INHERIT=multilib-minimal
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +brass +chert +inmemory 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 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/1.2.22
 SRC_URI=https://oligarchy.co.uk/xapian/1.2.25/xapian-core-1.2.25.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=3d07db5d0754eae5b4da59715d104ee3
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=83f9b157bb73cff6164123adace79d93
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.17 b/metadata/md5-cache/dev-libs/xapian-1.4.17
index 4e8c36181ffd..8e71f6d5f861 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.17
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.17
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=7
 HOMEPAGE=https://www.xapian.org/
-INHERIT=eutils multilib-minimal
+INHERIT=multilib-minimal
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote 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 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.17/xapian-core-1.4.17.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=ff3ef077137c94ba9f53e94481118386
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=66e3887a28a2c99d2db95b16d2be8acc
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.18 b/metadata/md5-cache/dev-libs/xapian-1.4.18
index c58a550ff334..11c926498a72 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.18
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.18
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=7
 HOMEPAGE=https://www.xapian.org/
-INHERIT=eutils multilib-minimal
+INHERIT=multilib-minimal
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote 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 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-core-1.4.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=9c0c0aaa749893ba6d8aabc123e2d4f9
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=2037a6d390a441284f7136dd3f7fe629
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
index 161474b95ff9..45a1daf2f4d7 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:= )
 DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=7
 HOMEPAGE=https://www.xapian.org/
-INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 IUSE=java lua mono perl php python ruby tcl elibc_FreeBSD java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_targets_python3_7 python_targets_python3_8 ruby_targets_ruby25 ruby_targets_ruby26
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targe
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.tar.xz
 _eclasses_=java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua	117840f7c4855d27ccde1c6cca990331	mono-env	1f24c032c78290b0d9a07d5b343051a7	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	estack	055c42df72f76a4f45ec92b35e83cd56	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd
-_md5_=41a7a2ac3b48bf90bbf38129c8d5d987
+_md5_=55de08a6aadcb1cba9f156002b828550
diff --git a/metadata/md5-cache/dev-libs/yaz-3.0.53 b/metadata/md5-cache/dev-libs/yaz-3.0.53
index 590f1cb709c8..31c64678efa1 100644
--- a/metadata/md5-cache/dev-libs/yaz-3.0.53
+++ b/metadata/md5-cache/dev-libs/yaz-3.0.53
@@ -1,14 +1,15 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxml2 dev-libs/libxslt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) virtual/pkgconfig dev-lang/tcl:0 >=sys-devel/libtool-2 >=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=dev-lang/tcl:0 sys-devel/bison >=sys-devel/libtool-2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libxml2 dev-libs/libxslt sys-libs/readline:= sys-libs/ncurses:= virtual/libintl !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 DESCRIPTION=C/C++ toolkit for Z39.50v3 clients and servers
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.indexdata.dk/yaz
-INHERIT=eutils autotools
-IUSE=debug icu libressl tcpd ziffy
+INHERIT=autotools
+IUSE=debug icu gnutls tcpd ziffy
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
 LICENSE=BSD GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt sys-libs/readline:= sys-libs/ncurses:= virtual/libintl !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) icu? ( dev-libs/icu:= ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=http://ftp.indexdata.dk/pub/yaz/yaz-3.0.53.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=720964f40f85453eae06bcf07f8c5038
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=9a08a19da65845a538336b28a318198d
diff --git a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4 b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
index 865e15af4803..7996ea4ddec5 100644
--- a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
+++ b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
@@ -1,13 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=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=platform-independent multi-threading and synchronization library for C++
-EAPI=6
+EAPI=7
 HOMEPAGE=http://zthread.sourceforge.net/
-INHERIT=autotools eutils ltprune
-IUSE=debug doc kernel_linux static-libs
+INHERIT=autotools
+IUSE=debug doc kernel_linux
 KEYWORDS=~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=1f747c35a91d7e84d5ac2b1234986a59
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=8c22a36547a7ac8140847802a16d470c
diff --git a/metadata/md5-cache/dev-ml/batteries-2.7.0 b/metadata/md5-cache/dev-ml/batteries-2.7.0
index d4ad32910a35..0bb2a2d23b73 100644
--- a/metadata/md5-cache/dev-ml/batteries-2.7.0
+++ b/metadata/md5-cache/dev-ml/batteries-2.7.0
@@ -3,7 +3,7 @@ DEPEND=dev-ml/camomile:= test? ( dev-ml/ounit dev-ml/iTeML ) >=dev-ml/findlib-1.
 DESCRIPTION=The community-maintained foundation library for your OCaml projects
 EAPI=5
 HOMEPAGE=https://github.com/ocaml-batteries-team/batteries-included/
-INHERIT=oasis eutils
+INHERIT=oasis
 IUSE=test +ocamlopt debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.7.0
 SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v2.7.0.tar.gz -> batteries-2.7.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=951448ab2ff88af375f944ee07a22905
+_md5_=8e814fc2dc9a0ea9d77c74a9bec54a95
diff --git a/metadata/md5-cache/dev-ml/calendar-2.04 b/metadata/md5-cache/dev-ml/calendar-2.04
index 27fad536c9c5..4169ade419b0 100644
--- a/metadata/md5-cache/dev-ml/calendar-2.04
+++ b/metadata/md5-cache/dev-ml/calendar-2.04
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=An Ocaml library to handle dates and time
-EAPI=5
+EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/calendar/
-INHERIT=findlib eutils
+INHERIT=findlib
 IUSE=doc
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/2.04
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=90f560df3cde1413499b2a5ec1fa6ea9
+_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_md5_=98a4ad1eb8a4730293a71476871017f0
diff --git a/metadata/md5-cache/dev-python/sarge-0.1.5 b/metadata/md5-cache/dev-python/sarge-0.1.5
index 9625acaf5e35..40f5237a8956 100644
--- a/metadata/md5-cache/dev-python/sarge-0.1.5
+++ b/metadata/md5-cache/dev-python/sarge-0.1.5
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sarge/sarge-0.1.5.post0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
-_md5_=6462e54a42fe4f65a788da2df51438f1
+_md5_=b9374a97bd975126ebfde4e2cf96a4dd
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615 b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
index bb97c20e716b..372ad87cdb91 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
+++ b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( d1x d2x ) flac? ( music ) midi? ( music ) mp3? ( music ) vorbi
 SLOT=0
 SRC_URI=https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/0c2fcf691ffb2a586991350d67f3efd1cca2a1f3 -> dxx-rebirth-0.61.0_pre20200615.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=a9e8d7348c58511308cdb772bf31d7a6
+_md5_=039d91e86aac319c164a5c65e38182ef
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-9999 b/metadata/md5-cache/games-action/dxx-rebirth-9999
index 090e8e5a9b6a..cef0cda7bf9b 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-9999
+++ b/metadata/md5-cache/games-action/dxx-rebirth-9999
@@ -12,4 +12,4 @@ RDEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png
 REQUIRED_USE=|| ( d1x d2x ) flac? ( music ) midi? ( music ) mp3? ( music ) vorbis? ( music ) opl3-musicpack? ( vorbis ) sc55-musicpack? ( vorbis ) sdl2? ( opengl )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=bde6d7739569975239102957ff370024
+_md5_=03e525ba9a0b5aa04024a05ba8cc3564
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.4.0 b/metadata/md5-cache/media-gfx/opentoonz-1.4.0
index 5ca7a3dfdc99..6a2883d8f9d9 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.4.0
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
 DESCRIPTION=An open-source full-featured 2D animation creation software
@@ -11,4 +11,4 @@ RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.4.0.tar.gz -> opentoonz-1.4.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	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=924f5f00dd783d3c07bda533be14fc92
+_md5_=87f5cc8867bcc1d3a12a343249519fff
diff --git a/metadata/md5-cache/media-gfx/slic3r-9999 b/metadata/md5-cache/media-gfx/slic3r-9999
index 6ec5d859d45f..8416376c286e 100644
--- a/metadata/md5-cache/media-gfx/slic3r-9999
+++ b/metadata/md5-cache/media-gfx/slic3r-9999
@@ -12,4 +12,4 @@ RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAc
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518
-_md5_=a56feed8b07c6247fd22201b222ea108
+_md5_=d43b9c339afbac10911722f8d9f695c8
diff --git a/metadata/md5-cache/media-libs/libao-1.2.2-r1 b/metadata/md5-cache/media-libs/libao-1.2.2-r1
index 52a518d94f8c..26d43696b963 100644
--- a/metadata/md5-cache/media-libs/libao-1.2.2-r1
+++ b/metadata/md5-cache/media-libs/libao-1.2.2-r1
@@ -4,12 +4,12 @@ DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 DESCRIPTION=The Audio Output library
 EAPI=7
 HOMEPAGE=https://www.xiph.org/ao/
-INHERIT=autotools libtool multilib multilib-minimal
-IUSE=alsa nas mmap pulseaudio 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
+INHERIT=autotools multilib multilib-minimal
+IUSE=alsa nas mmap pulseaudio 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 ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/xiph/libao/archive/1.2.2.tar.gz -> libao-1.2.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=5e8fc1cf9bddfe9779d6451844935274
+_md5_=95fa34e05a1616c1625ab3b8883f9ee9
diff --git a/metadata/md5-cache/media-libs/libmypaint-1.6.1 b/metadata/md5-cache/media-libs/libmypaint-1.6.1
index 3ab8e859774b..05eb0e3a9b52 100644
--- a/metadata/md5-cache/media-libs/libmypaint-1.6.1
+++ b/metadata/md5-cache/media-libs/libmypaint-1.6.1
@@ -1,15 +1,15 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) nls? ( dev-util/intltool ) >=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=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) nls? ( dev-util/intltool )
 DEFINED_PHASES=configure install setup
 DEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl >=media-libs/gegl-0.4.14:0.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( >sys-devel/gcc-5:*[openmp] ) nls? ( sys-devel/gettext )
 DESCRIPTION=Library for making brushstrokes
 EAPI=7
 HOMEPAGE=https://github.com/mypaint/libmypaint
-INHERIT=autotools python-any-r1 toolchain-funcs
+INHERIT=python-any-r1 toolchain-funcs
 IUSE=gegl introspection nls openmp
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl >=media-libs/gegl-0.4.14:0.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( >sys-devel/gcc-5:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.1
 SLOT=0/0.0.0
 SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.6.1/libmypaint-1.6.1.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
-_md5_=5ff9b443cbd4eda7305fd56d85774c4c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
+_md5_=2e4005bb8e8040d38114441475d7a233
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26
index c3c54f779b0e..cc691e52ab3a 100644
--- a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26
+++ b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26
@@ -4,11 +4,11 @@ DESCRIPTION=Graphics drawing primitives library for SDL
 EAPI=6
 HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
 INHERIT=autotools multilib-minimal
-IUSE=doc cpu_flags_x86_mmx 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
+IUSE=doc cpu_flags_x86_mmx 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 ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,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=http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.26.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=a4105d69734219086611b1cfa1592985
+_md5_=aa7c40e87c4145d3f8f5c12d0e312445
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
index 94e26148beeb..5eb1fa629d8b 100644
--- a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
+++ b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Graphics drawing primitives library for SDL
 EAPI=7
 HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
 INHERIT=autotools multilib-minimal
-IUSE=doc cpu_flags_x86_mmx 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
+IUSE=doc cpu_flags_x86_mmx 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 ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,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/16
 SRC_URI=http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.26.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=d91d0dd51cd8ce32d3fea5be634309d7
+_md5_=07abc1a74a0c1a50da241a00b0615898
diff --git a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4 b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
index 55f5b2ce44f1..4825b9052761 100644
--- a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
+++ b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Graphics drawing primitives library for SDL2
 EAPI=6
 HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
 INHERIT=autotools multilib-minimal
-IUSE=doc cpu_flags_x86_mmx 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
+IUSE=doc cpu_flags_x86_mmx 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 ~ppc64 x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.1-r1[video,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=http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.4.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=0e11693d970b9f8bef5de30ba43f4bd1
+_md5_=a75fd462f409aeb860792d0d5867a676
diff --git a/metadata/md5-cache/media-radio/cqrlog-2.4.0 b/metadata/md5-cache/media-radio/cqrlog-2.4.0
index 70cea58dedab..f236af452a9f 100644
--- a/metadata/md5-cache/media-radio/cqrlog-2.4.0
+++ b/metadata/md5-cache/media-radio/cqrlog-2.4.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.cqrlog.com/ https://github.com/ok2cqr/cqrlog
 INHERIT=optfeature
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 virtual/mysql[server] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
+RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 dev-libs/atk dev-libs/glib virtual/mysql[server] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.4.0.tar.gz -> cqrlog-2.4.0.tar.gz
 _eclasses_=optfeature	6a2add34e06e5a05d88471a33ccdd73e
-_md5_=1669382e5d2ffab49d9f23eca51b7c9f
+_md5_=40c1a82aeaeb987dc266112eda8dab12
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.3.3 b/metadata/md5-cache/media-sound/cmusfm-0.3.3
index 2e23270baa7a..6a2ea115eefb 100644
--- a/metadata/md5-cache/media-sound/cmusfm-0.3.3
+++ b/metadata/md5-cache/media-sound/cmusfm-0.3.3
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/pkgconfig >=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=net-misc/curl dev-libs/openssl:0= libnotify? ( >=x11-libs/libnotify-0.7 )
 DESCRIPTION=Last.fm scrobbler for cmus music player
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/Arkq/cmusfm
 INHERIT=autotools readme.gentoo-r1
 IUSE=libnotify
@@ -11,4 +12,4 @@ RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( >=x11-libs/libnotify-0.7
 SLOT=0
 SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.3.3.tar.gz -> cmusfm-0.3.3.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=f4df7693086be9d2bc4d9fa52aaadf04
+_md5_=aab2c0e10f4733ba896571de8b6ab21a
diff --git a/metadata/md5-cache/net-analyzer/bwbar-1.2.3 b/metadata/md5-cache/net-analyzer/bwbar-1.2.3
index 658d081a413f..e21a2000949e 100644
--- a/metadata/md5-cache/net-analyzer/bwbar-1.2.3
+++ b/metadata/md5-cache/net-analyzer/bwbar-1.2.3
@@ -1,13 +1,11 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install
 DEPEND=>=media-libs/libpng-1.2
 DESCRIPTION=The kernel.org "Current bandwidth utilization" bar
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/web/bwbar/
-INHERIT=eutils
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/web/bwbar/bwbar-1.2.3.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=8a59b76c084b01b52b7d543a4fa0e68c
+_md5_=a6458441c43976529b51dfe19b63d581
diff --git a/metadata/md5-cache/net-analyzer/bwmon-1.3-r2 b/metadata/md5-cache/net-analyzer/bwmon-1.3-r2
index 3e089c1af256..869b8d595543 100644
--- a/metadata/md5-cache/net-analyzer/bwmon-1.3-r2
+++ b/metadata/md5-cache/net-analyzer/bwmon-1.3-r2
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses
 DESCRIPTION=Simple ncurses bandwidth monitor
-EAPI=5
+EAPI=7
 HOMEPAGE=http://bwmon.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~hppa ppc sparc x86
 LICENSE=GPL-2 public-domain
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/bwmon/bwmon-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=d9ee60d7036a061a5f7fabcd85496c66
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=51b3011006c9d08697b4bde5d40612c2
diff --git a/metadata/md5-cache/net-analyzer/cnet-3.3.4 b/metadata/md5-cache/net-analyzer/cnet-3.3.4
index 5274720eb2ed..fdef32aba836 100644
--- a/metadata/md5-cache/net-analyzer/cnet-3.3.4
+++ b/metadata/md5-cache/net-analyzer/cnet-3.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=>=dev-lang/tk-8.5 dev-libs/elfutils x11-libs/libX11
 DESCRIPTION=Network simulation tool
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.csse.uwa.edu.au/cnet3/
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tk-8.5 dev-libs/elfutils x11-libs/libX11
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/cnet-3.3.4.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=066d53fd9bcaa42a0b44f8289eb86048
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=f9bd1d1f7f55c42fad3f9cbd03a2ae16
diff --git a/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2 b/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2
index 4922d6163168..ea93fab676b8 100644
--- a/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2
+++ b/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=netcat clone extended with twofish encryption
-EAPI=5
+EAPI=7
 HOMEPAGE=http://cryptcat.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptcat/cryptcat-unix-1.2.1.tar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=0b883ef79e85b893a48872eee58fb3f7
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=66f6e659d60d41bce882f6c094002241
diff --git a/metadata/md5-cache/net-analyzer/dhcpdump-1.8 b/metadata/md5-cache/net-analyzer/dhcpdump-1.8
index 25427475fd9f..da333a7e053b 100644
--- a/metadata/md5-cache/net-analyzer/dhcpdump-1.8
+++ b/metadata/md5-cache/net-analyzer/dhcpdump-1.8
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap dev-lang/perl
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile install
+DEPEND=net-libs/libpcap
 DESCRIPTION=DHCP Packet Analyzer/tcpdump postprocessor
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.mavetju.org/unix/general.php
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm ~mips x86
 LICENSE=BSD-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=https://www.mavetju.org/download/dhcpdump-1.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=ce913ef367293fb6b8d747a915502d40
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=21ed22039657cd17afe3fc866330aa9d
diff --git a/metadata/md5-cache/net-analyzer/driftnet-1.3.0 b/metadata/md5-cache/net-analyzer/driftnet-1.3.0
index f557d98fcd83..6a052dec5b18 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-1.3.0
+++ b/metadata/md5-cache/net-analyzer/driftnet-1.3.0
@@ -4,7 +4,7 @@ DEPEND=net-libs/libpcap net-libs/libwebsockets:=[client,http-proxy,socks5] gtk?
 DESCRIPTION=Watches network traffic and displays media from TCP streams observed
 EAPI=7
 HOMEPAGE=http://www.ex-parrot.com/~chris/driftnet/
-INHERIT=autotools fcaps toolchain-funcs
+INHERIT=autotools fcaps
 IUSE=debug gtk suid test +filecaps
 KEYWORDS=amd64 ~arm64 ppc -sparc x86
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/deiv/driftnet/archive/v1.3.0.tar.gz -> driftnet-1.3.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	fcaps	da689a8e04bbbb3518888ff668fee45b
-_md5_=49d3199b747fd9fc15324de277d0c4cc
+_md5_=f7a930bcb77126510c25bb86398d25ba
diff --git a/metadata/md5-cache/net-analyzer/egressor-1.0-r2 b/metadata/md5-cache/net-analyzer/egressor-1.0-r2
index 7d3fd38ef273..d3efc34d4316 100644
--- a/metadata/md5-cache/net-analyzer/egressor-1.0-r2
+++ b/metadata/md5-cache/net-analyzer/egressor-1.0-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
 DEPEND=<net-libs/libnet-1.1 >=net-libs/libnet-1.0.2a-r3
 DESCRIPTION=tool for checking router configuration
-EAPI=5
+EAPI=7
 HOMEPAGE=http://packetfactory.openwall.net/projects/egressor/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=egressor
 RDEPEND=net-libs/libpcap dev-perl/Net-RawIP dev-lang/perl
 SLOT=0
 SRC_URI=http://packetfactory.openwall.net/projects/egressor/egressor_release1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=d45a65b994fe38375655330508eddccb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a1f64a241facb7acdc25dedd38af84c3
diff --git a/metadata/md5-cache/net-analyzer/netcat-110-r9 b/metadata/md5-cache/net-analyzer/netcat-110-r9
index 4b9a821d9c5d..ea4222bf3f2c 100644
--- a/metadata/md5-cache/net-analyzer/netcat-110-r9
+++ b/metadata/md5-cache/net-analyzer/netcat-110-r9
@@ -3,12 +3,12 @@ DEPEND=!static? ( crypt? ( dev-libs/libmix ) ) static? ( crypt? ( dev-libs/libmi
 DESCRIPTION=The network swiss army knife
 EAPI=7
 HOMEPAGE=https://nc110.sourceforge.io
-INHERIT=toolchain-funcs flag-o-matic
+INHERIT=toolchain-funcs
 IUSE=crypt ipv6 static
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris
 LICENSE=netcat
 RDEPEND=!static? ( crypt? ( dev-libs/libmix ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/nc110/nc110.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz mirror://gentoo/netcat-110-patches-1.0.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=05cb4624fba751f4447ebee4820c94d1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=903c4ce0400555d012de9150fbda6b3d
diff --git a/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2 b/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
index cd0c42b92121..42d9fffa0eb7 100644
--- a/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
+++ b/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
@@ -1,13 +1,12 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Network performance benchmark
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.netperf.org/
-INHERIT=eutils flag-o-matic user
+INHERIT=flag-o-matic user
 IUSE=demo sctp
 KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=netperf
 SLOT=0
 SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.7.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=12b64d7960c681ff013dcd6a83ab67a2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=11a23a10d9e2b987f4c4862206e86b05
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r1 b/metadata/md5-cache/net-analyzer/netselect-0.4-r1
index f8f97cb4e441..e50987f1e8df 100644
--- a/metadata/md5-cache/net-analyzer/netselect-0.4-r1
+++ b/metadata/md5-cache/net-analyzer/netselect-0.4-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Ultrafast implementation of ping
 EAPI=6
 HOMEPAGE=http://apenwarr.ca/netselect/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=ipv6
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=10c54dd1e334be933602aef42397df64
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=89a4ac3e6a5b593880d40f3d93df26fa
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.80-r2 b/metadata/md5-cache/net-analyzer/nmap-7.80-r2
index 7684b06c0817..530e7b679c90 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.80-r2
+++ b/metadata/md5-cache/net-analyzer/nmap-7.80-r2
@@ -4,7 +4,7 @@ DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-lib
 DESCRIPTION=Network exploration tool and security / port scanner
 EAPI=7
 HOMEPAGE=https://nmap.org/
-INHERIT=autotools desktop flag-o-matic lua-single toolchain-funcs
+INHERIT=autotools lua-single toolchain-funcs
 IUSE=ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua +lua_single_target_lua5-3
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.80.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
-_md5_=7c82cd6593a421f4ba6a454fe265e211
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=5be45a059e62746ec7c5728310bc3e6f
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.91-r1 b/metadata/md5-cache/net-analyzer/nmap-7.91-r1
index 1449d3ac8408..e137737d985c 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.91-r1
+++ b/metadata/md5-cache/net-analyzer/nmap-7.91-r1
@@ -4,7 +4,7 @@ DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-lib
 DESCRIPTION=Network exploration tool and security / port scanner
 EAPI=7
 HOMEPAGE=https://nmap.org/
-INHERIT=autotools flag-o-matic lua-single toolchain-funcs
+INHERIT=autotools lua-single toolchain-funcs
 IUSE=ipv6 libressl libssh2 ncat nping +nse ssl +system-lua +lua_single_target_lua5-3
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( NPSL GPL-2 )
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.91.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
-_md5_=4a816fe29796a6941546232e0112d4df
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=4fdb9971b9718ba524ae60f9470ecd89
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.91-r2 b/metadata/md5-cache/net-analyzer/nmap-7.91-r2
index 39e6d8e3acd7..e24ae3f3e5ed 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.91-r2
+++ b/metadata/md5-cache/net-analyzer/nmap-7.91-r2
@@ -4,7 +4,7 @@ DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-lib
 DESCRIPTION=Network exploration tool and security / port scanner
 EAPI=7
 HOMEPAGE=https://nmap.org/
-INHERIT=autotools flag-o-matic lua-single toolchain-funcs
+INHERIT=autotools lua-single toolchain-funcs
 IUSE=ipv6 libressl libssh2 ncat nping +nse ssl +system-lua +lua_single_target_lua5-3
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( NPSL GPL-2 )
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.91.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
-_md5_=46427402da96e6b4b488a7e8351a6cc1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=8539249052f01701ab269dcdbab854ea
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index c2f5c0f15e4a..40cdce921490 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -4,12 +4,12 @@ DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-lib
 DESCRIPTION=Network exploration tool and security / port scanner
 EAPI=7
 HOMEPAGE=https://nmap.org/
-INHERIT=autotools flag-o-matic git-r3 lua-single toolchain-funcs
+INHERIT=autotools git-r3 lua-single toolchain-funcs
 IUSE=ipv6 libressl libssh2 ncat nping +nse ssl +system-lua +lua_single_target_lua5-3
 LICENSE=NPSL
 PROPERTIES=live
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
-_md5_=0a35c3ba52a003f2115eb8ad6c00928a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=556bdc92d8d8fb8a5493ce2ba958fcef
diff --git a/metadata/md5-cache/net-analyzer/nttcp-1.47-r3 b/metadata/md5-cache/net-analyzer/nttcp-1.47-r3
index 409ec69bc2ba..2a1ff03a921b 100644
--- a/metadata/md5-cache/net-analyzer/nttcp-1.47-r3
+++ b/metadata/md5-cache/net-analyzer/nttcp-1.47-r3
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=tool to test TCP and UDP throughput
-EAPI=5
+DEFINED_PHASES=compile install
+DESCRIPTION=Tool to test TCP and UDP throughput
+EAPI=7
 HOMEPAGE=http://www.leo.org/~elmar/nttcp/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~mips ~ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.leo.org/~elmar/nttcp/nttcp-1.47.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=3b1aeaac43b627f8b622da440fdb6754
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=ca00937c53d45e86409721fe36e4db59
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.105-r1 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.105-r1
index d5905fe01bee..99afa01c8639 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.105-r1
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.105-r1
@@ -3,12 +3,12 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=The OpenBSD network swiss army knife
 EAPI=6
 HOMEPAGE=http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs
 IUSE=elibc_Darwin
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105-7.debian.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=9595e9012361fbdc34020c73d88ccb62
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=ea7515eb13b5eff31915ecb79ba4c9b4
diff --git a/metadata/md5-cache/net-analyzer/pktstat-1.8.5-r1 b/metadata/md5-cache/net-analyzer/pktstat-1.8.5-r1
index 52c55399463c..b3bac311ed61 100644
--- a/metadata/md5-cache/net-analyzer/pktstat-1.8.5-r1
+++ b/metadata/md5-cache/net-analyzer/pktstat-1.8.5-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=net-libs/libpcap >=sys-libs/ncurses-5.3-r1 virtual/pkgconfig >=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=net-libs/libpcap >=sys-libs/ncurses-5.3-r1
 DESCRIPTION=A network monitoring tool with bandwidth tracking
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.adaptive-enterprises.com.au/~d/software/pktstat/
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=amd64 ~ppc x86
 LICENSE=public-domain
 RDEPEND=net-libs/libpcap >=sys-libs/ncurses-5.3-r1
 SLOT=0
 SRC_URI=http://www.adaptive-enterprises.com.au/~d/software/pktstat/pktstat-1.8.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=a77163d55caeac3966811f34059ae35d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=468d2e32ec25a93166125b0dc18a1b1c
diff --git a/metadata/md5-cache/net-analyzer/portsentry-1.2-r1 b/metadata/md5-cache/net-analyzer/portsentry-1.2-r1
index eba80a1a7d3e..1cd4b68bd812 100644
--- a/metadata/md5-cache/net-analyzer/portsentry-1.2-r1
+++ b/metadata/md5-cache/net-analyzer/portsentry-1.2-r1
@@ -1,11 +1,13 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
 DESCRIPTION=Automated port scan detector and response tool
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/sentrytools/
-INHERIT=eutils toolchain-funcs
-KEYWORDS=amd64 ppc x86
+INHERIT=toolchain-funcs
+IUSE=kernel_Darwin kernel_linux kernel_FreeBSD kernel_SunOS
+KEYWORDS=amd64 ppc x86 ~x64-macos
 LICENSE=GPL-2
+RDEPEND=kernel_Darwin? ( app-shells/tcsh )
 SLOT=0
 SRC_URI=mirror://sourceforge/sentrytools/portsentry-1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=1c81d97c724e40237a1faf4659443c53
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=ec9e88c9b89a6f93ef629d9b44ee7bce
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
index bc5e883e3a95..60e99eb5a991 100644
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install postinst preinst prepare
 DEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
-DESCRIPTION=a port scan detection tool
-EAPI=5
+DESCRIPTION=A port scan detection tool
+EAPI=7
 HOMEPAGE=http://www.openwall.com/scanlogd/
-INHERIT=eutils savedconfig toolchain-funcs user
+INHERIT=savedconfig toolchain-funcs user
 IUSE=+nids pcap savedconfig
 KEYWORDS=~amd64 ppc x86
 LICENSE=scanlogd GPL-2
@@ -11,5 +11,5 @@ RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
 REQUIRED_USE=?? ( nids pcap )
 SLOT=0
 SRC_URI=http://www.openwall.com/scanlogd/scanlogd-2.2.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=ab082d1aada0bf4a19f8131612862c31
+_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_md5_=6965d67671601b480b3f0f2cb7742328
diff --git a/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1 b/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
index ee5c72326fc4..0715ff692cbb 100644
--- a/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
+++ b/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
@@ -1,12 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Squid logfile analyzer and traffic grapher
-EAPI=5
+EAPI=7
 HOMEPAGE=http://squid-graph.sourceforge.net/
-INHERIT=eutils
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/GD[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/squid-graph/squid-graph-3.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=0a2e195c31e9a0ab1da0ef009ee70cfb
+_md5_=11c9eadb61e714bce2c44441a9c5a122
diff --git a/metadata/md5-cache/net-analyzer/squidsites-1.01-r2 b/metadata/md5-cache/net-analyzer/squidsites-1.01-r2
index d59764456bfc..d1d3822e91e7 100644
--- a/metadata/md5-cache/net-analyzer/squidsites-1.01-r2
+++ b/metadata/md5-cache/net-analyzer/squidsites-1.01-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A tool that parses Squid access log file and generates a report of the most visited sites
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.stefanopassiglia.com/misc.htm
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=1
 SRC_URI=http://www.stefanopassiglia.com/downloads/squidsites-1.01.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=17763486e563cca3d0d540d4807973c0
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=13706b880307ecd2d01674ea55d12be7
diff --git a/metadata/md5-cache/net-analyzer/ssldump-1.3-r1 b/metadata/md5-cache/net-analyzer/ssldump-1.3-r1
index 311e09be64e8..a82d74bd27f1 100644
--- a/metadata/md5-cache/net-analyzer/ssldump-1.3-r1
+++ b/metadata/md5-cache/net-analyzer/ssldump-1.3-r1
@@ -4,11 +4,11 @@ DEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap >=dev-libs/openssl
 DESCRIPTION=An SSLv3/TLS network protocol analyzer
 EAPI=7
 HOMEPAGE=https://github.com/adulau/ssldump/
-INHERIT=autotools toolchain-funcs
+INHERIT=autotools
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=openssl
 RDEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap >=dev-libs/openssl-1:0=
 SLOT=0
 SRC_URI=https://github.com/adulau/ssldump/archive/v1.3.tar.gz -> ssldump-1.3.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=1ab3d8b4d67a547f7b8bd5fddd143538
+_md5_=5cdbb09453c23e2bab747d3c57723333
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.6 b/metadata/md5-cache/net-analyzer/sslscan-2.0.6
index 7178cb9ea753..8291af21e2a0 100644
--- a/metadata/md5-cache/net-analyzer/sslscan-2.0.6
+++ b/metadata/md5-cache/net-analyzer/sslscan-2.0.6
@@ -7,5 +7,4 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.6.tar.gz -> sslscan-2.0.6.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1h.tar.gz -> sslscan-OpenSSL_1_1_1h.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dfd3c6314d817b3e3d61dbde961d637f
+_md5_=92fc0b314738f394443c075c4a242757
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.8 b/metadata/md5-cache/net-analyzer/sslscan-2.0.8
index cd319726d1fa..3554ebb164e3 100644
--- a/metadata/md5-cache/net-analyzer/sslscan-2.0.8
+++ b/metadata/md5-cache/net-analyzer/sslscan-2.0.8
@@ -7,5 +7,4 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.8.tar.gz -> sslscan-2.0.8.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz -> sslscan-OpenSSL_1_1_1j.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=edef0efae1ac16c1d6955a71bce20760
+_md5_=8c6b96230d7d23058f617b51be753a46
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.9 b/metadata/md5-cache/net-analyzer/sslscan-2.0.9
index ea0b873424fb..e5e4bf760d64 100644
--- a/metadata/md5-cache/net-analyzer/sslscan-2.0.9
+++ b/metadata/md5-cache/net-analyzer/sslscan-2.0.9
@@ -2,11 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Fast SSL configuration scanner
 EAPI=7
 HOMEPAGE=https://github.com/rbsec/sslscan
-INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.9.tar.gz -> sslscan-2.0.9.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz -> sslscan-OpenSSL_1_1_1k.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=c1931f4a436d830e7f975f4b83d922c2
+_md5_=591a415a7ae387e5fc85c41899f92bd8
diff --git a/metadata/md5-cache/net-analyzer/ssmping-0.9.1 b/metadata/md5-cache/net-analyzer/ssmping-0.9.1
index 24e19a1cb52f..45b596e9cd12 100644
--- a/metadata/md5-cache/net-analyzer/ssmping-0.9.1
+++ b/metadata/md5-cache/net-analyzer/ssmping-0.9.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Tool for testing multicast connectivity
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.venaas.no/multicast/ssmping/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.venaas.no/multicast/ssmping/ssmping-0.9.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=159928900373b217f784c637dc467790
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=9010a3cfd47c858d1eed798eb59c361e
diff --git a/metadata/md5-cache/net-analyzer/symon-2.88 b/metadata/md5-cache/net-analyzer/symon-2.88
index 9a2afdc5240e..45c9e672218c 100644
--- a/metadata/md5-cache/net-analyzer/symon-2.88
+++ b/metadata/md5-cache/net-analyzer/symon-2.88
@@ -1,9 +1,10 @@
+BDEPEND=sys-devel/pmake dev-lang/perl
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) sys-devel/pmake dev-lang/perl
+DEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) dev-lang/perl
 DESCRIPTION=Performance and information monitoring tool
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wpd.home.xs4all.nl/symon/
-INHERIT=eutils perl-module toolchain-funcs
+INHERIT=perl-module toolchain-funcs
 IUSE=perl +symon symux
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=BSD-2
@@ -11,5 +12,5 @@ RDEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) dev-lang/perl:=
 REQUIRED_USE=|| ( perl symon symux )
 SLOT=0
 SRC_URI=https://wpd.home.xs4all.nl/symon/philes/symon-2.88.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518
-_md5_=4481842479974fccf9a2bbbf8aae2606
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=7ebf191d6d8adbc11d30e8e0a139302a
diff --git a/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3_p4 b/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3_p4
index c83b2a02f66e..c749ca74fffb 100644
--- a/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3_p4
+++ b/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3_p4
@@ -4,11 +4,11 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=Extract and concatenate portions of pcap files
 EAPI=7
 HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice
-INHERIT=autotools flag-o-matic
+INHERIT=autotools
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://debian/pool/main/t/tcpslice/tcpslice_1.2a3.orig.tar.gz mirror://debian/pool/main/t/tcpslice/tcpslice_1.2a3-4.debian.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=8a46195ed4cb5a13b275431b385ced19
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=6413c56cad537b85c27cf62c1e8fa932
diff --git a/metadata/md5-cache/net-analyzer/tcptrack-1.4.2 b/metadata/md5-cache/net-analyzer/tcptrack-1.4.2
index 9c1443f71e26..8de6736970a2 100644
--- a/metadata/md5-cache/net-analyzer/tcptrack-1.4.2
+++ b/metadata/md5-cache/net-analyzer/tcptrack-1.4.2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses >=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=net-libs/libpcap sys-libs/ncurses
 DESCRIPTION=Passive per-connection tcp bandwidth monitor
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.rhythm.cx/~steve/devel/tcptrack/
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig
+RDEPEND=net-libs/libpcap sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.rhythm.cx/~steve/devel/tcptrack/release/1.4.2/source/tcptrack-1.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=18f3b53012933f6ca75953f9bad4704f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=7d5d29bb388a13b813b252167534bcb1
diff --git a/metadata/md5-cache/net-analyzer/tptest-3.1.7-r2 b/metadata/md5-cache/net-analyzer/tptest-3.1.7-r2
index 20a5dd789b75..2997bd91f82a 100644
--- a/metadata/md5-cache/net-analyzer/tptest-3.1.7-r2
+++ b/metadata/md5-cache/net-analyzer/tptest-3.1.7-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Internet bandwidth tester
-EAPI=5
+EAPI=7
 HOMEPAGE=http://tptest.sourceforge.net/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tptest/tptest-3.1.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=2b91fe90712031d587a39914824ffc21
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8ace6cbf888cb1eece7b53649fb0f729
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.1 b/metadata/md5-cache/net-im/pidgin-2.14.1
index c79c8666b7ce..7d9712cfc8f7 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.1
+++ b/metadata/md5-cache/net-im/pidgin-2.14.1
@@ -13,4 +13,4 @@ REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_7 python_single_target_py
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=ebdad2c7684110a96af59ab3bd7ab79a
+_md5_=896361fb4600984777ed1de5a0a9e0ba
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.2 b/metadata/md5-cache/net-im/pidgin-2.14.2
index 2de36c2316ed..60b5d518a417 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.2
+++ b/metadata/md5-cache/net-im/pidgin-2.14.2
@@ -13,4 +13,4 @@ REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_7 python_single_target_py
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=a57eb9b42652a8562ba3602b7424e72f
+_md5_=5fb48f2e6c9870a39650f3ddad78094f
diff --git a/metadata/md5-cache/net-libs/libtelnet-0.23 b/metadata/md5-cache/net-libs/libtelnet-0.23
index 31cf48cfe58f..32368aba425b 100644
--- a/metadata/md5-cache/net-libs/libtelnet-0.23
+++ b/metadata/md5-cache/net-libs/libtelnet-0.23
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DESCRIPTION=Simple RFC-complient TELNET implementation as a C library
+DESCRIPTION=Simple RFC-compliant TELNET implementation as a C library
 EAPI=7
 HOMEPAGE=https://github.com/seanmiddleditch/libtelnet
 INHERIT=autotools
@@ -9,4 +9,4 @@ LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/seanmiddleditch/libtelnet/archive/0.23.tar.gz -> libtelnet-0.23.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=d6abe7da7ab9ca8084f9b670a08a9aac
+_md5_=1665bde2d25e788a4f8f1dac0f0073f5
diff --git a/metadata/md5-cache/net-libs/libtelnet-9999 b/metadata/md5-cache/net-libs/libtelnet-9999
index 4f17e1032f29..c5722c40a0d7 100644
--- a/metadata/md5-cache/net-libs/libtelnet-9999
+++ b/metadata/md5-cache/net-libs/libtelnet-9999
@@ -1,6 +1,6 @@
 BDEPEND=app-doc/doxygen dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Simple RFC-complient TELNET implementation as a C library
+DESCRIPTION=Simple RFC-compliant TELNET implementation as a C library
 EAPI=7
 HOMEPAGE=https://github.com/seanmiddleditch/libtelnet
 INHERIT=cmake git-r3
@@ -8,4 +8,4 @@ LICENSE=public-domain
 PROPERTIES=live
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=af0133d6fc86481df8cbcc166af8b025
+_md5_=7d8bea90556ea78b3ff994a84c0ef5f7
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
index c78b9b9ffb13..b9fdc9c3d697 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare prerm setup
-DEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+DEPEND=net-mail/autorespond >=net-mail/vpopmail-5.4.33 virtual/qmail maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
 DESCRIPTION=A web interface for managing a qmail system with virtual domains
 EAPI=7
 HOMEPAGE=http://www.inter7.com/qmailadmin.html
-INHERIT=qmail webapp autotools
+INHERIT=autotools qmail webapp
 IUSE=maildrop vhosts
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
+RDEPEND=net-mail/autorespond >=net-mail/vpopmail-5.4.33 virtual/qmail maildrop? ( >=mail-filter/maildrop-2.0.1 ) >=app-admin/webapp-config-1.50.15
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fixheadtails	1721997ed44d035654efe12da50797ef	qmail	b35b6b912311fb36e8fff96eaeb6bcf7	webapp	990ad6a000cf18d1ef87117e8c7b0a54	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=ca593bcd1c31746ddde03c6df62c383b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fixheadtails	1721997ed44d035654efe12da50797ef	qmail	b35b6b912311fb36e8fff96eaeb6bcf7	webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_md5_=5ed92d3c9e3461b168afd528ddd24d49
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.3 b/metadata/md5-cache/net-print/cups-filters-1.28.3
index 69646d7902b6..51609d072e0e 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.28.3
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.3
@@ -5,7 +5,7 @@ DESCRIPTION=Cups filters
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 INHERIT=autotools perl-module systemd flag-o-matic
-IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
+IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.28.3.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=96d780009e9ba7e35f6fc152bed31e28
+_md5_=9d6300f9d3ec3c8dff75504623efdc5a
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.7 b/metadata/md5-cache/net-print/cups-filters-1.28.7
index 9543b25a7ece..28a2ce721e5d 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.28.7
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.7
@@ -5,7 +5,7 @@ DESCRIPTION=Cups filters
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 INHERIT=autotools perl-module systemd flag-o-matic
-IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
+IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.28.7.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=517b45c3670e685c51b0c754ee31ae05
+_md5_=9d6300f9d3ec3c8dff75504623efdc5a
diff --git a/metadata/md5-cache/net-print/cups-filters-9999 b/metadata/md5-cache/net-print/cups-filters-9999
index b2d5628538a5..bcc1c9ec589c 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999
+++ b/metadata/md5-cache/net-print/cups-filters-9999
@@ -5,11 +5,11 @@ DESCRIPTION=Cups filters
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 INHERIT=autotools perl-module systemd flag-o-matic git-r3
-IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
+IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
 LICENSE=MIT GPL-2
 PROPERTIES=live
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=2f24ca642c066d88d7986a00bf1fca8b
+_md5_=5d4db158b8fb607415d748fecf748223
diff --git a/metadata/md5-cache/sci-astronomy/pal-0.9.7 b/metadata/md5-cache/sci-astronomy/pal-0.9.7
index afb2a2c5e309..0ac7c4a92db8 100644
--- a/metadata/md5-cache/sci-astronomy/pal-0.9.7
+++ b/metadata/md5-cache/sci-astronomy/pal-0.9.7
@@ -11,4 +11,4 @@ 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	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=a3e142a518650e7562b85d2a5e231f89
+_md5_=351d5454c2f93bd81d47bc6f18334022
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.22 b/metadata/md5-cache/sys-apps/fakeroot-1.22
index f1e797122a0a..65a10401eea5 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.22
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.22
@@ -4,11 +4,11 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 INHERIT=autotools flag-o-matic
-IUSE=acl debug static-libs test
+IUSE=acl debug test
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.22.orig.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=3e5e97f293c2c070807423f4128a717f
+_md5_=9ab5e43c04e4fb9d5177125aef6252f5
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.23 b/metadata/md5-cache/sys-apps/fakeroot-1.23
index eccd05b6be64..b75d987b5cd4 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.23
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.23
@@ -4,11 +4,11 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 INHERIT=autotools flag-o-matic
-IUSE=acl debug static-libs test
+IUSE=acl debug test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.23.orig.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=6537f5d3b4bf9ffe05b690be073412e2
+_md5_=6cb7d962af604dcb188590ba21e85e4c
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.24 b/metadata/md5-cache/sys-apps/fakeroot-1.24
index 73808e5b6812..70d12c1dedc8 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.24
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.24
@@ -5,11 +5,11 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 INHERIT=autotools flag-o-matic
-IUSE=acl debug static-libs test
+IUSE=acl debug test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.24.orig.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=9a190580da5138424b51775fbcec5514
+_md5_=2f23d05b277f95d48c1488455e057d17
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.25.1 b/metadata/md5-cache/sys-apps/fakeroot-1.25.1
index 070c1f7d3de1..fd0990c8ddfe 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.25.1
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.25.1
@@ -5,11 +5,11 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 INHERIT=autotools flag-o-matic
-IUSE=acl debug static-libs test
+IUSE=acl debug test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.25.1.orig.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=132d576b275d83e7ce86d0ac3fa8a72f
+_md5_=8acfabccc8614266c3e41b88310c9759
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.25.2 b/metadata/md5-cache/sys-apps/fakeroot-1.25.2
index 7d663a3fb154..88149b5ba113 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.25.2
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.25.2
@@ -5,11 +5,11 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 INHERIT=autotools flag-o-matic
-IUSE=acl debug static-libs test
+IUSE=acl debug test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.25.2.orig.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=132d576b275d83e7ce86d0ac3fa8a72f
+_md5_=8acfabccc8614266c3e41b88310c9759
diff --git a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0 b/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
index 33cb1c91d9a4..643f423d7220 100644
--- a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
+++ b/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
@@ -3,13 +3,11 @@ DEPEND=x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango glade? ( gnome-base/libglad
 DESCRIPTION=Gtk+ Widgets for live display of large amounts of fluctuating numerical data
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/gtkdatabox/
-INHERIT=eutils ltprune
-IUSE=examples +glade static-libs test
+IUSE=examples +glade test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango glade? ( gnome-base/libglade )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkdatabox/gtkdatabox-0.9.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=d39837fc3929f5e9d5502ce2d49fc981
+_md5_=ab6fde3637ec161d7df6b122e0c37c4d
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 9d42e823badc..9db89dd414c7 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -613,7 +613,7 @@ app-accessibility/freetts 1.2.2: A speech synthesis system written entirely in J
 app-accessibility/julius 4.2.2: Large Vocabulary Continuous Speech Recognition Engine
 app-accessibility/kontrast 1.0.2 20.12.3: Tool to check contrast for colors to verify they are correctly accessible
 app-accessibility/mbrola 3.0.1h-r6: Speech synthesizer based on the concatenation of diphones. Includes samples
-app-accessibility/nfbtrans 7.74-r2: braille translator from the National Federation of the Blind
+app-accessibility/nfbtrans 7.74-r2: Braille translator from the National Federation of the Blind
 app-accessibility/orca 3.36.5 3.36.6: Extensible screen reader that provides access to the desktop
 app-accessibility/powiedz 1.0-r2: Polish speech synthesizer based on rsynth
 app-accessibility/sound-icons 0.1: a collection of Sound Icons for speech-dispatcher
@@ -779,7 +779,7 @@ app-admin/salt 3000.8 3001.6 3002.5 3003: Salt is a remote execution and configu
 app-admin/selint 1.1.0 1.2.0 9999: Policy Analysis Tools for SELinux
 app-admin/serf 0.8.1-r1 0.8.2 0.9.5: Service orchestration and management tool
 app-admin/setools 4.3.0 4.4.0 9999: Policy Analysis Tools for SELinux
-app-admin/socklog 2.1.0: small secure replacement for syslogd with automatic log rotation
+app-admin/socklog 2.1.0: Small secure replacement for syslogd with automatic log rotation
 app-admin/spectre-meltdown-checker 0.39 0.40 0.41 0.42 0.43 0.44 9999: Spectre & Meltdown vulnerability/mitigation checker for Linux
 app-admin/sshguard 2.4.1-r1 2.4.2 99999: protects hosts from brute force attacks against ssh
 app-admin/stow 2.3.1: GNU Stow is a symlink farm manager
@@ -809,7 +809,7 @@ app-admin/undertaker-scripts 1: Scripts to help retiring Gentoo developers
 app-admin/usbview 2.0: Display the topology of devices on the USB bus
 app-admin/vault 1.5.6 1.5.7 1.6.1 1.6.3: A tool for managing secrets
 app-admin/verynice 1.1-r3: A tool for dynamically adjusting the nice-level of processes
-app-admin/watchfolder 0.3.3-r1: watches directories and processes files
+app-admin/watchfolder 0.3.3-r1: Watches directories and processes files
 app-admin/webalizer 2.23.08: Webserver log file analyzer
 app-admin/webapp-config 1.55-r1 9999: Gentoo's installer for web-based applications
 app-admin/whowatch 1.8.6 99999: Displays information about users currently logged on in real time
@@ -862,7 +862,7 @@ app-arch/lziprecover 1.22: Lziprecover is a data recovery tool and decompressor
 app-arch/lzlib 1.11 1.12: Library for lzip compression
 app-arch/lzma 9.20-r1 19.00: LZMA Stream Compressor from the SDK
 app-arch/lzop 1.04: Utility for fast (even real-time) compression/decompression
-app-arch/makeself 2.2.0-r2: shell script that generates a self-extractible tar.gz
+app-arch/makeself 2.2.0-r2: Shell script that generates a self-extractible tar.gz
 app-arch/mscompress 0.3-r1: Microsoft compress.exe/expand.exe compatible (de)compressor
 app-arch/mt-st 1.3 1.4 9999: control magnetic tape drive operation
 app-arch/ncompress 4.2.4.5 4.2.4.6 5.0: Classic compress & uncompress programs for .Z (LZW) files
@@ -5558,7 +5558,7 @@ dev-libs/libjcat 0.1.4 0.1.5 0.1.6: Library and tool for reading and writing Jca
 dev-libs/libkpass 6-r1: Libkpass is a C implementation to access KeePass 1.x format password databases
 dev-libs/libksba 1.3.5-r1 1.3.5-r2 1.4.0 1.5.0: X.509 and CMS (PKCS#7) library
 dev-libs/liblinear 242 243: A Library for Large Linear Classification
-dev-libs/liblist 2.4: Generic linked-list manipulation routines, plus queues and stacks
+dev-libs/liblist 2.4-r1: Generic linked-list manipulation routines, plus queues and stacks
 dev-libs/liblogging 1.0.6: Liblogging is an easy to use, portable, open source library for system logging
 dev-libs/liblognorm 2.0.6: Fast samples-based log normalization library
 dev-libs/liblouis 3.13.0: An open-source braille translator and back-translator
@@ -14523,7 +14523,7 @@ net-analyzer/nsat 1.5-r5: Network Security Analysis Tool, an application-level n
 net-analyzer/nsca 2.7.2-r103: Nagios Service Check Acceptor
 net-analyzer/nstats 0.4-r3: Displays statistics about ethernet traffic including protocol breakdown
 net-analyzer/ntopng 3.8.1-r4 4.0: Network traffic analyzer with web interface
-net-analyzer/nttcp 1.47-r3: tool to test TCP and UDP throughput
+net-analyzer/nttcp 1.47-r3: Tool to test TCP and UDP throughput
 net-analyzer/nuttcp 8.1.4: Network performance measurement tool
 net-analyzer/odhcploc 20111021-r1: Open DHCP Locator
 net-analyzer/oinkmaster 2.0: Rule management for SNORT
@@ -14560,7 +14560,7 @@ net-analyzer/rtpbreak 1.3a-r1: Analyze any RTP session through heuristics over U
 net-analyzer/sancp 1.6.1-r6: collect network traffic statistics and store them in pcap format
 net-analyzer/sarg 2.4.0: Squid Analysis Report Generator
 net-analyzer/sbd 1.37-r1: Netcat-clone, designed to be portable and offer strong encryption
-net-analyzer/scanlogd 2.2.7: a port scan detection tool
+net-analyzer/scanlogd 2.2.7: A port scan detection tool
 net-analyzer/scanssh 2.1.2: network scanner that gathers info on SSH protocols and versions
 net-analyzer/scapy 2.4.4-r1 9999: A Python interactive packet manipulation program for mastering the network
 net-analyzer/scli 0.4.0-r1: SNMP Command Line Interface
@@ -15020,7 +15020,7 @@ net-libs/libsrsirc 0.0.14-r1: A lightweight, cross-platform IRC library
 net-libs/libsrtp 1.6.0-r1 2.2.0 2.3.0-r1: Open-source implementation of the Secure Real-time Transport Protocol (SRTP)
 net-libs/libssh 0.9.5 9999: Access a working SSH implementation by means of a library
 net-libs/libssh2 1.9.0_p20200614-r1 9999: Library implementing the SSH2 protocol
-net-libs/libtelnet 0.23 9999: Simple RFC-complient TELNET implementation as a C library
+net-libs/libtelnet 0.23 9999: Simple RFC-compliant TELNET implementation as a C library
 net-libs/libtirpc 1.2.6 1.3.1: Transport Independent RPC library (SunRPC replacement)
 net-libs/libtorrent 0.13.7 0.13.7-r1 0.13.8-r1: BitTorrent library written in C++ for *nix
 net-libs/libtorrent-rasterbar 1.2.6 1.2.9 1.2.10 1.2.11 1.2.12: C++ BitTorrent implementation focusing on efficiency and scalability
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5fa7f64cdb94..dcc98942fb46 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Apr 2021 15:50:49 +0000
+Sat, 03 Apr 2021 16:06:05 +0000
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-03 16:06:07 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-03 16:06:07 +0000
commit	e2f78f63c97bec9626fe364aac1af5f5155422f6 (patch)
tree	62d3982f0b3792a744eb6b77d4c9645b48ddb058 /metadata
parent	Merge updates from master (diff)
download	gentoo-e2f78f63c97bec9626fe364aac1af5f5155422f6.tar.gz gentoo-e2f78f63c97bec9626fe364aac1af5f5155422f6.tar.bz2 gentoo-e2f78f63c97bec9626fe364aac1af5f5155422f6.zip