2021-04-03 22:05:45 UTC

33 files changed, 104 insertions, 126 deletions

diff --git a/metadata/md5-cache/app-admin/abrt-2.14.2 b/metadata/md5-cache/app-admin/abrt-2.14.2
index f7446175f2c2..b68594df63f8 100644
--- a/metadata/md5-cache/app-admin/abrt-2.14.2
+++ b/metadata/md5-cache/app-admin/abrt-2.14.2
@@ -1,10 +1,10 @@
-BDEPEND=test? ( python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) ) app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=test? ( python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) ) app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=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 postrm prepare setup
 DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.13.0[gtk,python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-libs/libcap sys-fs/inotify-tools x11-libs/gtk+:3
 DESCRIPTION=Automatic bug detection and reporting tool
 EAPI=7
 HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-INHERIT=autotools python-single-r1 systemd xdg-utils
+INHERIT=autotools python-single-r1 xdg-utils
 IUSE=selinux test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abrt/abrt/archive/2.14.2.tar.gz -> abrt-2.14.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=859e434cb710475acb56229aa84c28ee
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10bdaa17961eb8240fb54509d5dc7e40
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.2 b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
index 81b68daa1af0..9da41d5bd332 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.2
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
-INHERIT=eutils haskell-cabal
+INHERIT=haskell-cabal
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.2/haskell-updater-1.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	multiprocessing	cac3169468f893670dac3e7cb940e045	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b
-_md5_=f53408c56ee73d38527be085e81899a8
+_md5_=8e340ece875242ca88b9352f03bcfd05
diff --git a/metadata/md5-cache/app-cdr/plextor-tool-0.5.0 b/metadata/md5-cache/app-cdr/plextor-tool-0.5.0
index c826af018ee7..537494949986 100644
--- a/metadata/md5-cache/app-cdr/plextor-tool-0.5.0
+++ b/metadata/md5-cache/app-cdr/plextor-tool-0.5.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Tool to change the parameters of a Plextor CD-ROM drive
-EAPI=5
+EAPI=7
 HOMEPAGE=http://plextor-tool.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=static
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/plextor-tool/plextor-tool-0.5.0.src.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_=d445be44729fea85becb55815a1753f2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=053f8632c7c0a14111ff3024cc106be7
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
deleted file mode 100644
index fad991e54498..000000000000
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-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=Xbox xdvdfs ISO extraction utility
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/xbiso/
-INHERIT=autotools eutils flag-o-matic
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.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_=e788b7bde652641cb3b598bd1290c689
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r3 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r3
index 9fccfabf07d3..a3fe577b3024 100644
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r3
+++ b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r3
@@ -4,9 +4,9 @@ DESCRIPTION=Xbox xdvdfs ISO extraction utility
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xbiso/
 INHERIT=autotools flag-o-matic
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.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_=773b087e82576c89211577a2aa388fba
+_md5_=b83e97b0d28c573cfe59e351018e5f83
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
index 0e15d3f9bdd5..4f1ae05ac920 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
@@ -3,7 +3,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
 EAPI=7
 HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt
-INHERIT=eutils qmake-utils python-single-r1 desktop
+INHERIT=qmake-utils python-single-r1 desktop
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=BSD-2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-1.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=3315ebe7765e757074bae98fb11c2461
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=252e3edd91381c54603692fa2a6ebd99
diff --git a/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523 b/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
index 59c8df9a1d14..3c91b6e48ac8 100644
--- a/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
+++ b/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
@@ -3,11 +3,11 @@ DEPEND=dev-util/promu >=dev-lang/go-1.10
 DESCRIPTION=A tool to scrape a Prometheus client and dump the result as JSON
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/prom2json
-INHERIT=user golang-build golang-vcs-snapshot
+INHERIT=golang-build golang-vcs-snapshot
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/prom2json/archive/4a7436442837da72f9e211d99f0145dff3246b66.tar.gz -> prom2json-0.1.0_p20170523.tar.gz
-_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec
-_md5_=699f93213d211f4afbfd735d1264a53d
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec
+_md5_=f2e651a7fc1ba8c87fc1f61d90d038c9
diff --git a/metadata/md5-cache/app-misc/cdctl-0.16 b/metadata/md5-cache/app-misc/cdctl-0.16
index 8131e931040f..f2d75df80e17 100644
--- a/metadata/md5-cache/app-misc/cdctl-0.16
+++ b/metadata/md5-cache/app-misc/cdctl-0.16
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile 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
+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=prepare
 DESCRIPTION=Utility to control your cd/dvd drive
-EAPI=5
+EAPI=7
 HOMEPAGE=http://cdctl.sourceforge.net/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=autotools
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=mirror://sourceforge/cdctl/cdctl-0.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	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=04de3602b34d596055e6e53b3ae99669
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=3866f661adc33e181aa19ba2d329bf7c
diff --git a/metadata/md5-cache/app-misc/color-1.2-r2 b/metadata/md5-cache/app-misc/color-1.2-r2
index f235466f5148..d4dc3e2577b1 100644
--- a/metadata/md5-cache/app-misc/color-1.2-r2
+++ b/metadata/md5-cache/app-misc/color-1.2-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Easily add ANSI colouring to shell scripts
 EAPI=6
 HOMEPAGE=http://www.runslinux.net/?page_id=10
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://runslinux.net/projects/color/color-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_=8b6794131142299d3b09e4b7ce06bc12
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=78b59c72c679c6e879a2ef15a94c87c9
diff --git a/metadata/md5-cache/app-misc/crunch-3.6 b/metadata/md5-cache/app-misc/crunch-3.6
index 41b22e636dcf..1cefc3d2030b 100644
--- a/metadata/md5-cache/app-misc/crunch-3.6
+++ b/metadata/md5-cache/app-misc/crunch-3.6
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
 DESCRIPTION=A wordlist generator
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/crunch-wordlist/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~mips ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/crunch-wordlist/crunch-wordlist/crunch-3.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_=f67eb82d01e67656433c5256f3b9b081
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a71b0af6f955011d258a5e859389601c
diff --git a/metadata/md5-cache/app-misc/cw-1.0.16-r3 b/metadata/md5-cache/app-misc/cw-1.0.16-r3
index 9ebc46a1b22c..c448c2d0e09a 100644
--- a/metadata/md5-cache/app-misc/cw-1.0.16-r3
+++ b/metadata/md5-cache/app-misc/cw-1.0.16-r3
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install postinst prepare
+DEFINED_PHASES=compile configure install postinst
 DESCRIPTION=A non-intrusive real-time ANSI color wrapper for common unix-based commands
-EAPI=5
+EAPI=7
 HOMEPAGE=http://cwrapper.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cwrapper/cw-1.0.16.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_=b6531f6fd5b3078c20c1a4b09e70bbbb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=46880fe6db0da4ba6a73c0d6d2e46095
diff --git a/metadata/md5-cache/app-misc/esekeyd-1.2.7 b/metadata/md5-cache/app-misc/esekeyd-1.2.7
index 9905b4d2d61e..961cd20b53c4 100644
--- a/metadata/md5-cache/app-misc/esekeyd-1.2.7
+++ b/metadata/md5-cache/app-misc/esekeyd-1.2.7
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Multimedia key daemon that uses the Linux event interface
-EAPI=5
+EAPI=7
 HOMEPAGE=http://freshmeat.net/projects/esekeyd/
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.burghardt.pl/files/esekeyd-1.2.7.tar.gz
-_md5_=0863931284ef7a97e4b76f61304b8ccc
+_md5_=26e9ce000b2d66b500bdbc36d2eb476a
diff --git a/metadata/md5-cache/app-misc/figlet-2.2.5-r1 b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
index 983aecb6f1ba..7857348cfa6f 100644
--- a/metadata/md5-cache/app-misc/figlet-2.2.5-r1
+++ b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=program for making large letters out of ordinary text
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.figlet.org/
-INHERIT=eutils bash-completion-r1 toolchain-funcs
+INHERIT=bash-completion-r1 toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.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	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
-_md5_=eccbc5d1d4bbeb901114cac3abd49195
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
+_md5_=5b23ae985e959a0941d702931de7744d
diff --git a/metadata/md5-cache/app-misc/jot-9.0-r1 b/metadata/md5-cache/app-misc/jot-9.0-r1
index 449465a2d8bc..705111a0a73c 100644
--- a/metadata/md5-cache/app-misc/jot-9.0-r1
+++ b/metadata/md5-cache/app-misc/jot-9.0-r1
@@ -1,12 +1,12 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DEFINED_PHASES=prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=Print out increasing, decreasing, random, or redundant data
-EAPI=5
+EAPI=7
 HOMEPAGE=http://freshmeat.net/projects/bsd-jot/
 INHERIT=rpm toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.mit.edu/afs/athena/system/rhlinux/athena-9.0/free/SRPMS/athena-jot-9.0-3.src.rpm
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	rpm	760ff223c2c4299b68ea901e24c4cabd
-_md5_=361537c1db8665bded9fa252ef3c6033
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=fa46262220f62440518b7749b359653e
diff --git a/metadata/md5-cache/app-misc/nut-20.1 b/metadata/md5-cache/app-misc/nut-20.1
index 6d478f7ba4b2..9998303bd1c9 100644
--- a/metadata/md5-cache/app-misc/nut-20.1
+++ b/metadata/md5-cache/app-misc/nut-20.1
@@ -1,10 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Record what you eat and analyze your nutrient levels
-EAPI=5
+EAPI=7
 HOMEPAGE=http://nut.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~arm ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/nut/nut-20.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9f63b455b7e1b29b0390fbab69215ecf
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=7ef176a46aae9c01b4b73e3f8ae6fd50
diff --git a/metadata/md5-cache/app-misc/regionset-0.2 b/metadata/md5-cache/app-misc/regionset-0.2
index a71850911951..07399b9ed183 100644
--- a/metadata/md5-cache/app-misc/regionset-0.2
+++ b/metadata/md5-cache/app-misc/regionset-0.2
@@ -1,10 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Sets the region on DVD drives
-EAPI=5
+EAPI=7
 HOMEPAGE=http://linvdr.org/projects/regionset/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linvdr.org/download/regionset/regionset-0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bba51414748da224b96644a088178a59
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e00e87a4a26e0f82804869fb9488c9fe
diff --git a/metadata/md5-cache/app-misc/tprint-1.1.0-r1 b/metadata/md5-cache/app-misc/tprint-1.1.0-r1
index faa5824834ee..7d938c8fb8ef 100644
--- a/metadata/md5-cache/app-misc/tprint-1.1.0-r1
+++ b/metadata/md5-cache/app-misc/tprint-1.1.0-r1
@@ -1,10 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Transparent Print Utility for terminals
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/tprint/
+INHERIT=toolchain-funcs
 KEYWORDS=~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tprint/tprint-1.1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b9ecc26b2f2535c76bb17b647d156eb5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a71cd2743289a7e0f46a363b153ecca2
diff --git a/metadata/md5-cache/dev-libs/cxxtools-2.2.1 b/metadata/md5-cache/dev-libs/cxxtools-2.2.1
index 3265df420a02..cc1eda91b8a4 100644
--- a/metadata/md5-cache/dev-libs/cxxtools-2.2.1
+++ b/metadata/md5-cache/dev-libs/cxxtools-2.2.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure
 DEPEND=virtual/libiconv
 DESCRIPTION=Collection of general purpose C++-classes
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.tntnet.org/cxxtools.html
 KEYWORDS=amd64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libiconv
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/cxxtools-2.2.1.tar.gz
-_md5_=0b0d5983de030f4ae101475f744ac61a
+_md5_=4bc31459e40db96cec171d61e534169c
diff --git a/metadata/md5-cache/dev-libs/libmba-0.9.1-r3 b/metadata/md5-cache/dev-libs/libmba-0.9.1-r3
index 81b5c428dc34..519e68ab7146 100644
--- a/metadata/md5-cache/dev-libs/libmba-0.9.1-r3
+++ b/metadata/md5-cache/dev-libs/libmba-0.9.1-r3
@@ -1,12 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A library of generic C modules
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.ioplex.com/~miallen/libmba/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs
-IUSE=static-libs
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.ioplex.com/~miallen/libmba/dl/libmba-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	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=7eef9d82a4fa7988f716966bc6a1ca58
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=e71bc4ca9d8aa06d48f5f483ae67b178
diff --git a/metadata/md5-cache/dev-libs/rapidxml-1.13 b/metadata/md5-cache/dev-libs/rapidxml-1.13
deleted file mode 100644
index ced4eac5aa7d..000000000000
--- a/metadata/md5-cache/dev-libs/rapidxml-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Fast XML parser
-EAPI=5
-HOMEPAGE=http://rapidxml.sourceforge.net/
-INHERIT=eutils
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0 MIT
-SLOT=0
-SRC_URI=mirror://sourceforge/rapidxml/rapidxml-1.13.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_=836655c6d64e5967cb17cada66f4bb15
diff --git a/metadata/md5-cache/dev-libs/rapidxml-1.13-r1 b/metadata/md5-cache/dev-libs/rapidxml-1.13-r1
index 30d88f3f52d3..3d4121843f06 100644
--- a/metadata/md5-cache/dev-libs/rapidxml-1.13-r1
+++ b/metadata/md5-cache/dev-libs/rapidxml-1.13-r1
@@ -1,11 +1,10 @@
-DEFINED_PHASES=install prepare
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
 DESCRIPTION=Fast XML parser
-EAPI=5
+EAPI=7
 HOMEPAGE=http://rapidxml.sourceforge.net/
-INHERIT=eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0 MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/rapidxml/rapidxml-1.13.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_=935e9e4d8e2271ec91d0b23cad005230
+_md5_=ead8f958c0cc5d25de045b869b698399
diff --git a/metadata/md5-cache/dev-vcs/git-crypt-0.6.0 b/metadata/md5-cache/dev-vcs/git-crypt-0.6.0
index 7b55738712e2..84d6fab9b68b 100644
--- a/metadata/md5-cache/dev-vcs/git-crypt-0.6.0
+++ b/metadata/md5-cache/dev-vcs/git-crypt-0.6.0
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DEPEND=dev-vcs/git
 DESCRIPTION=transparent file encryption in git
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.agwa.name/projects/git-crypt/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/AGWA/git-crypt/archive/0.6.0.tar.gz -> git-crypt-0.6.0.tar.gz
-_md5_=942ea9c7245b8be9afacd427e9e3fc7e
+_md5_=1645e930b0a8706b3378dcde160b8ec9
diff --git a/metadata/md5-cache/media-libs/fidlib-0.9.10-r1 b/metadata/md5-cache/media-libs/fidlib-0.9.10-r1
index 004003a9b132..7a12ebfb75bf 100644
--- a/metadata/md5-cache/media-libs/fidlib-0.9.10-r1
+++ b/metadata/md5-cache/media-libs/fidlib-0.9.10-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Run-time filter design and execution library
-EAPI=5
+EAPI=7
 HOMEPAGE=http://uazu.net/fidlib/
-INHERIT=toolchain-funcs flag-o-matic eutils multilib
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=http://uazu.net/fidlib/fidlib-0.9.10.tgz
-_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	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
-_md5_=19dd60d2d5e25b32446a51ad9fb98085
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=9c468d4a918b9849da98281680cc9924
diff --git a/metadata/md5-cache/net-analyzer/nettop-0.2.3-r2 b/metadata/md5-cache/net-analyzer/nettop-0.2.3-r2
index 4ba1530833ab..56fe61081dc3 100644
--- a/metadata/md5-cache/net-analyzer/nettop-0.2.3-r2
+++ b/metadata/md5-cache/net-analyzer/nettop-0.2.3-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
 DEPEND=sys-libs/slang net-libs/libpcap
 DESCRIPTION=top-like program for network activity
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=epatch toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm ppc x86
 LICENSE=BSD
 RDEPEND=sys-libs/slang net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://gentoo/nettop-0.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=288c2f81a29b479a2404d0a11d0f289c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=fc3d52e2eb84e472ddc9edc5fda3214a
diff --git a/metadata/md5-cache/net-mail/libdbx-1.0.3 b/metadata/md5-cache/net-mail/libdbx-1.0.3
index d36042d5cd5b..13c483b7dff5 100644
--- a/metadata/md5-cache/net-mail/libdbx-1.0.3
+++ b/metadata/md5-cache/net-mail/libdbx-1.0.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Tools and library for reading Outlook Express mailboxes (.dbx format)
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/ol2mbox
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ol2mbox/libdbx_1.0.3.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_=d1699701cb09c32978aea9eeedfa0624
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=66d966bcda34cf8a3317c53caa5879de
diff --git a/metadata/md5-cache/net-mail/pop2imap-1.21 b/metadata/md5-cache/net-mail/pop2imap-1.21
index 780b99644aab..5a962e04f070 100644
--- a/metadata/md5-cache/net-mail/pop2imap-1.21
+++ b/metadata/md5-cache/net-mail/pop2imap-1.21
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Synchronize mailboxes between a pop and an imap servers
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.linux-france.org/prj/pop2imap/
 KEYWORDS=~amd64 x86
 LICENSE=public-domain
 RDEPEND=dev-lang/perl dev-perl/Mail-POP3Client dev-perl/Mail-IMAPClient dev-perl/Email-Simple dev-perl/Date-Manip dev-perl/IO-Socket-SSL
 SLOT=0
 SRC_URI=http://www.linux-france.org/prj/pop2imap/dist/pop2imap-1.21.tgz
-_md5_=1f696ee28a432d3a0c415c489b28370a
+_md5_=d4a0218bf6aab60f621bce9a1cd122d2
diff --git a/metadata/md5-cache/net-mail/renattach-1.2.4-r1 b/metadata/md5-cache/net-mail/renattach-1.2.4-r1
index 45d2cd40eccf..ae0e365191df 100644
--- a/metadata/md5-cache/net-mail/renattach-1.2.4-r1
+++ b/metadata/md5-cache/net-mail/renattach-1.2.4-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Filter that renames/deletes dangerous email attachments
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.pc-tools.net/unix/renattach/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.pc-tools.net/files/unix/renattach-1.2.4.tar.gz
-_md5_=bae305d452e537175745c9f93200b667
+_md5_=3aced7e1413b3ea5d7bf0d38a58eeb61
diff --git a/metadata/md5-cache/net-misc/dhcping-1.2 b/metadata/md5-cache/net-misc/dhcping-1.2
index cf972c97d180..666426b3a8d1 100644
--- a/metadata/md5-cache/net-misc/dhcping-1.2
+++ b/metadata/md5-cache/net-misc/dhcping-1.2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DESCRIPTION=Utility for sending a dhcp request to a dhcp server to see if it is responding
-EAPI=5
+DESCRIPTION=Utility to send DHCP requests to DHCP servers to see if responding
+EAPI=7
 HOMEPAGE=http://www.mavetju.org/unix/general.php
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.mavetju.org/download/dhcping-1.2.tar.gz
-_md5_=3cefc23198805d5affffa039bb74812e
+_md5_=cf06675ed3b3b49fa713ca63e1cdd254
diff --git a/metadata/md5-cache/net-misc/netstat-nat-1.4.10 b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
index 8428e5464512..0b4b3e291617 100644
--- a/metadata/md5-cache/net-misc/netstat-nat-1.4.10
+++ b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
@@ -1,12 +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=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=Display NAT connections
-EAPI=5
+EAPI=7
 HOMEPAGE=http://tweegy.nl/projects/netstat-nat/index.html
-INHERIT=autotools eutils
+INHERIT=autotools
 KEYWORDS=amd64 ~arm ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tweegy.nl/download/netstat-nat-1.4.10.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_=a63418259851d62c567b3d986d87dedc
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_md5_=1a53930bcda0beb356679915cc26e9b2
diff --git a/metadata/md5-cache/net-misc/sipcalc-1.1.6 b/metadata/md5-cache/net-misc/sipcalc-1.1.6
index 78692fb6e039..3ee4b7a05ee3 100644
--- a/metadata/md5-cache/net-misc/sipcalc-1.1.6
+++ b/metadata/md5-cache/net-misc/sipcalc-1.1.6
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Sipcalc is an advanced console-based IP subnet calculator
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.routemeister.net/projects/sipcalc/
 KEYWORDS=amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.routemeister.net/projects/sipcalc/files/sipcalc-1.1.6.tar.gz
-_md5_=edf7a717e1a7b4a053f63678e2d55b9c
+_md5_=6e9a3afebd9fd0f2f6048d05b6664a4c
diff --git a/metadata/md5-cache/net-news/yydecode-0.2.10-r1 b/metadata/md5-cache/net-news/yydecode-0.2.10-r1
index c1462c10e159..26402038687b 100644
--- a/metadata/md5-cache/net-news/yydecode-0.2.10-r1
+++ b/metadata/md5-cache/net-news/yydecode-0.2.10-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=prepare
 DESCRIPTION=A decoder for yENC format, popular on Usenet
-EAPI=5
+EAPI=7
 HOMEPAGE=http://yydecode.sourceforge.net/
 KEYWORDS=~alpha amd64 arm ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/yydecode/yydecode-0.2.10.tar.gz
-_md5_=d09d339356f0ebefaf2d6663b57fcc50
+_md5_=a0ece2fd2e19304f3e0a8d540249fca7
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 5c9d9b70e5fc..270e1430d51d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1038,7 +1038,7 @@ app-cdr/nrg2iso 0.4-r2: Convert CD images from nrg (Nero) to iso
 app-cdr/plextor-tool 0.5.0: Tool to change the parameters of a Plextor CD-ROM drive
 app-cdr/tkdvd 4.0.9-r1: A Tcl/Tk GUI for writing DVDs and CDs
 app-cdr/uif2iso 0.1.7c-r1: Convert CD images from uif (MagicISO) to iso
-app-cdr/xbiso 0.6.1-r2 0.6.1-r3: Xbox xdvdfs ISO extraction utility
+app-cdr/xbiso 0.6.1-r3: Xbox xdvdfs ISO extraction utility
 app-cdr/xcdroast 0.98_alpha16-r3: Lightweight cdrtools front-end for CD and DVD writing
 app-cdr/xfburn 0.6.2: GTK+ based CD and DVD burning application
 app-crypt/WiRouterKeyRec 1.1.2: Recovery tool for wpa passphrase
@@ -5751,7 +5751,7 @@ dev-libs/qtkeychain 0.10.0 0.11.1: Qt API for storing passwords securely
 dev-libs/quazip 0.9.1 1.1-r1: Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 dev-libs/raft 0.9.25 0.10.0: C implementation of the Raft consensus protocol
 dev-libs/rapidjson 1.1.0-r2 1.1.0-r3 9999: A fast JSON parser/generator for C++ with both SAX/DOM style API
-dev-libs/rapidxml 1.13 1.13-r1: Fast XML parser
+dev-libs/rapidxml 1.13-r1: Fast XML parser
 dev-libs/rasqal 0.9.33: Library that handles Resource Description Framework (RDF)
 dev-libs/rccl 4.0.0-r2: ROCm Communication Collectives Library (RCCL)
 dev-libs/re2 0.2020.11.01 0.2021.02.02 0.2021.04.01: An efficient, principled regular expression library
@@ -15240,7 +15240,7 @@ net-misc/dhcdrop 0.5-r1: Effectively suppresses illegal DHCP servers on the LAN
 net-misc/dhcp 4.4.2-r3: ISC Dynamic Host Configuration Protocol (DHCP) client/server
 net-misc/dhcpcd 8.1.9-r1 9.3.4 9.4.0 9.4.0-r1 9999: A fully featured, yet light weight RFC2131 compliant DHCP client
 net-misc/dhcpcd-ui 0.7.8: Desktop notification and configuration for dhcpcd
-net-misc/dhcping 1.2: Utility for sending a dhcp request to a dhcp server to see if it is responding
+net-misc/dhcping 1.2: Utility to send DHCP requests to DHCP servers to see if responding
 net-misc/dibbler 1.0.1 1.0.1-r2 1.0.1-r3: Portable DHCPv6 implementation (server, client and relay)
 net-misc/dleyna-server 0.6.0: Service that allows to discover and manipulate DLNA Digital Media servers (DMS)
 net-misc/drive 0.3.9.1 0.3.9.1-r1: Google Drive client for the commandline
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a84d697f594e..245536bc7824 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Apr 2021 21:20:49 +0000
+Sat, 03 Apr 2021 22:05:45 +0000