2021-04-03 23:20:57 UTC

17 files changed, 47 insertions, 50 deletions

diff --git a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7 b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
index 7077bbdd7103..e4c5bf8b9589 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
+++ b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
@@ -1,14 +1,13 @@
-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
+BDEPEND=sys-apps/texinfo >=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 test
-DEPEND=sys-apps/texinfo
 DESCRIPTION=A Debug Malloc Library
 EAPI=7
 HOMEPAGE=https://dmalloc.com
-INHERIT=autotools multilib toolchain-funcs
-IUSE=static-libs threads
+INHERIT=autotools toolchain-funcs
+IUSE=threads
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://dmalloc.com/releases/dmalloc-5.5.2.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=56731595791de05284be659349b04627
+_md5_=dd5b1447fb439515572d6e0bdbe781f0
diff --git a/metadata/md5-cache/dev-libs/dmalloc-999999 b/metadata/md5-cache/dev-libs/dmalloc-999999
index f3cbb19fd2e8..a1f58987c931 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-999999
+++ b/metadata/md5-cache/dev-libs/dmalloc-999999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A Debug Malloc Library
 EAPI=7
 HOMEPAGE=https://dmalloc.com
-INHERIT=autotools git-r3 multilib toolchain-funcs
-IUSE=static-libs threads
+INHERIT=autotools git-r3 toolchain-funcs
+IUSE=threads
 LICENSE=ISC
 PROPERTIES=live
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=07303ad5a2e641b30bf8bf44d14020fc
+_md5_=bcba3397768bf275458f7ebcf4784f43
diff --git a/metadata/md5-cache/dev-libs/luise-0.1.1-r1 b/metadata/md5-cache/dev-libs/luise-0.1.1-r1
index a34c931bf12b..4f896879138a 100644
--- a/metadata/md5-cache/dev-libs/luise-0.1.1-r1
+++ b/metadata/md5-cache/dev-libs/luise-0.1.1-r1
@@ -8,5 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~conikost/files/LUIse_0.1.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=73127d4cde76de8d5afb4d51d2d53e73
+_md5_=b4eeeeb459edae31dfa67e87db28cd85
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1 b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
index 82ae909bdeaf..432a9303aad0 100644
--- a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
+++ b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
@@ -4,7 +4,7 @@ DEPEND=tpm? ( app-crypt/trousers ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) li
 DESCRIPTION=PKCS#11 provider cryptographic hardware
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/opencryptoki
-INHERIT=autotools multilib flag-o-matic user
+INHERIT=autotools flag-o-matic user
 IUSE=debug libressl +tpm
 KEYWORDS=~amd64 ~arm ~arm64 ~s390 ~x86
 LICENSE=CPL-0.5
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencryptoki/3.6.1/opencryptoki-3.6.1.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=ff5817c66ec7e5138f34090667795981
+_md5_=2210fa1edc34a9d072b0c91172d83327
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
index 45a51a67384a..dfeae1cce7d4 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
@@ -4,12 +4,12 @@ DEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 )
 DESCRIPTION=library for accessing smart card terminals
 EAPI=7
 HOMEPAGE=https://github.com/OpenSC/openct/wiki
-INHERIT=flag-o-matic multilib udev user
-IUSE=doc pcsc-lite usb debug
+INHERIT=flag-o-matic udev user
+IUSE=doc debug pcsc-lite usb
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	udev	452708c3f55cf6e918b045adb949a9e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=aa8a8c22a80f42ce715e0276f7328184
+_md5_=fc7fcdb7b79ce6e898910a1042ca7258
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0 b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
index 7f1c09cd576e..cc593bbf2637 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
+++ b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
@@ -1,11 +1,9 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=compile
 DESCRIPTION=pcc compiler support libs
 EAPI=5
 HOMEPAGE=http://pcc.ludd.ltu.se
-INHERIT=eutils versionator
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-1.1.0.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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d67af51e9e5e36e88b5d767b2313663e
+_md5_=de097444e874a8e47fa96d46fc634d52
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-9999 b/metadata/md5-cache/dev-libs/pcc-libs-9999
index c4c0ff4cbd08..2740b67a18ba 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-9999
+++ b/metadata/md5-cache/dev-libs/pcc-libs-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile unpack
 DEPEND=dev-vcs/cvs
 DESCRIPTION=pcc compiler support libs
 EAPI=5
 HOMEPAGE=http://pcc.ludd.ltu.se
-INHERIT=eutils versionator cvs
+INHERIT=cvs
 LICENSE=BSD
 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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	cvs	8f8740beb4ce1deaae8393cfc28d2ed1
-_md5_=f62045d654c8fd764faf1906ea7f683f
+_eclasses_=cvs	8f8740beb4ce1deaae8393cfc28d2ed1
+_md5_=fa94f9728bf1258945bc8a668e5625e7
diff --git a/metadata/md5-cache/dev-libs/qqwing-1.3.3 b/metadata/md5-cache/dev-libs/qqwing-1.3.3
index 419b9536d12f..2ccc53991b65 100644
--- a/metadata/md5-cache/dev-libs/qqwing-1.3.3
+++ b/metadata/md5-cache/dev-libs/qqwing-1.3.3
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.
 DESCRIPTION=Sudoku puzzle generator and solver
 EAPI=5
 HOMEPAGE=https://qqwing.com
-INHERIT=autotools eutils
+INHERIT=autotools epatch
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/stephenostermiller/qqwing/archive/v1.3.3.tar.gz -> qqwing-1.3.3.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_=be983c930cb1b60ccc6e2b96c00b2b95
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347
+_md5_=900b503abbc2dc1b823710d698c12588
diff --git a/metadata/md5-cache/dev-libs/qqwing-1.3.4 b/metadata/md5-cache/dev-libs/qqwing-1.3.4
index 3f902655f8c4..8dd52bd77220 100644
--- a/metadata/md5-cache/dev-libs/qqwing-1.3.4
+++ b/metadata/md5-cache/dev-libs/qqwing-1.3.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Sudoku puzzle generator and solver
 EAPI=5
 HOMEPAGE=https://qqwing.com
-INHERIT=eutils ltprune
+INHERIT=ltprune
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=GPL-2+
 SLOT=0/2
 SRC_URI=https://qqwing.com/qqwing-1.3.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_=f9c4c39a481bec1eb374dbcda3a9a198
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=16898f691439fb80e03d24d41ddb7e46
diff --git a/metadata/md5-cache/dev-libs/quazip-0.9.1 b/metadata/md5-cache/dev-libs/quazip-0.9.1
index 9017e503a546..14cf23a9a8fc 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.9.1
+++ b/metadata/md5-cache/dev-libs/quazip-0.9.1
@@ -4,11 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=7
 HOMEPAGE=https://stachenov.github.io/quazip/
-INHERIT=cmake flag-o-matic qmake-utils
+INHERIT=cmake qmake-utils
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=https://github.com/stachenov/quazip/archive/v0.9.1.tar.gz -> quazip-0.9.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	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
-_md5_=acf222271a92f173a10660beef25ae6e
+_md5_=a56e18f8f06abcf525b096d37809c3f1
diff --git a/metadata/md5-cache/dev-libs/quazip-1.1-r1 b/metadata/md5-cache/dev-libs/quazip-1.1-r1
index 5d1cf043a17b..e4d62c218400 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.1-r1
+++ b/metadata/md5-cache/dev-libs/quazip-1.1-r1
@@ -4,7 +4,7 @@ DEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] test? ( dev-qt/qtnetwork:5 dev-qt/
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=7
 HOMEPAGE=https://stachenov.github.io/quazip/
-INHERIT=cmake flag-o-matic
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.1.tar.gz -> quazip-1.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_=5ded02a22be9043c37bf1dea65a95d7b
+_md5_=99f147e6cb3367be390629f859ade6d5
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24-r3 b/metadata/md5-cache/dev-libs/stfl-0.24-r3
index 9a6302cb4d86..40e08464796d 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24-r3
+++ b/metadata/md5-cache/dev-libs/stfl-0.24-r3
@@ -3,7 +3,7 @@ DEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/r
 DESCRIPTION=A library which implements a curses-based widget set for text terminals
 EAPI=7
 HOMEPAGE=http://www.clifford.at/stfl/
-INHERIT=eutils multilib perl-module python-r1 toolchain-funcs
+INHERIT=perl-module python-r1 toolchain-funcs
 IUSE=examples perl python ruby static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ppc ~ppc64 x86
 LICENSE=LGPL-3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e
-_md5_=79382f8a9bb4bce495aeaed033fbb79c
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	ae176ff49e02bcbe576f6436b031c518	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e
+_md5_=24da50f81897046e40771f54d60467b4
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
index fa87565b768c..6089b51b30fc 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r3
@@ -3,11 +3,11 @@ DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Simple and small C++ XML parser
 EAPI=6
 HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
-INHERIT=flag-o-matic toolchain-funcs eutils multilib versionator
+INHERIT=flag-o-matic toolchain-funcs multilib versionator
 IUSE=debug doc static-libs +stl
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
 _eclasses_=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	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=a044141273e2f48394320abb1ff818d3
+_md5_=e0260ee2cc2bc1031d2a186343fb2972
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
index 45ca78b078be..fbef18e7ee19 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
@@ -3,10 +3,11 @@ DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=Simple and small C++ XML parser
 EAPI=7
 HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
+INHERIT=flag-o-matic toolchain-funcs multilib
 IUSE=debug doc static-libs +stl
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3268dd3d145f29018d59c89de8e92759
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=5bfb9c3ccf34be4639739b2636f225be
diff --git a/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2 b/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
index 501204045993..f453eacd45de 100644
--- a/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
+++ b/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
@@ -3,12 +3,12 @@ DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=Tiny Vector Matrix library using Expression Templates
 EAPI=5
 HOMEPAGE=http://tvmet.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
 IUSE=debug doc test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvmet/tvmet-1.7.2.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_=3d981cb91c2e718c2db9dc7f3a192dbe
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347
+_md5_=af7ed50c55302300f9c82f5959fb90c5
diff --git a/metadata/md5-cache/dev-libs/ucl-1.03-r1 b/metadata/md5-cache/dev-libs/ucl-1.03-r1
index 678d0beeba83..d9e3128c3a26 100644
--- a/metadata/md5-cache/dev-libs/ucl-1.03-r1
+++ b/metadata/md5-cache/dev-libs/ucl-1.03-r1
@@ -3,11 +3,11 @@ DEPEND=!!dev-libs/libucl >=app-portage/elt-patches-20170815 || ( >=sys-devel/aut
 DESCRIPTION=the UCL Compression Library
 EAPI=5
 HOMEPAGE=http://www.oberhumer.com/opensource/ucl/
-INHERIT=autotools eutils flag-o-matic ltprune
+INHERIT=autotools epatch flag-o-matic ltprune
 IUSE=static-libs
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.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_=0ba01b88eb83842fb972b977ef2af2d9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=afbd64e5c5c3d7f466164f88189a5586
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 bf5ef0886266..161ff672fd13 100644
--- a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
+++ b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
@@ -1,12 +1,12 @@
-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
+BDEPEND=sys-devel/libtool
 DEFINED_PHASES=compile configure prepare
 DESCRIPTION=Library that supports Base64 (MIME), uuencode, xxencode and binhex coding
 EAPI=7
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
-INHERIT=autotools toolchain-funcs
+INHERIT=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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
-_md5_=52cbbd8e45fc30ac01b55005b020e818
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=9d9728d751e5d84b4588daa3555b4ec4