2021-05-20 02:56:45 UTC

49 files changed, 84 insertions, 36 deletions

diff --git a/metadata/md5-cache/dev-util/bdelta-0.3.1-r1 b/metadata/md5-cache/dev-util/bdelta-0.3.1-r1
index d17fb6075c81..bf7ba0ce5f6f 100644
--- a/metadata/md5-cache/dev-util/bdelta-0.3.1-r1
+++ b/metadata/md5-cache/dev-util/bdelta-0.3.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Binary Delta - Efficient difference algorithm and format
 EAPI=7
 HOMEPAGE=https://github.com/jjwhitney/BDelta
+INHERIT=toolchain-funcs vcs-snapshot
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/jjwhitney/BDelta/archive/v0.3.1.tar.gz -> bdelta-0.3.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=9c3a94c963fc1a81662985159901b73a
diff --git a/metadata/md5-cache/dev-util/bloaty-0_p20170420 b/metadata/md5-cache/dev-util/bloaty-0_p20170420
index 0379df2eec39..a3e3b0b09332 100644
--- a/metadata/md5-cache/dev-util/bloaty-0_p20170420
+++ b/metadata/md5-cache/dev-util/bloaty-0_p20170420
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/re2-0.2017.03.01
 DESCRIPTION=A size profiler for binaries
 EAPI=6
 HOMEPAGE=https://github.com/google/bloaty
+INHERIT=vcs-snapshot toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/re2-0.2017.03.01
 SLOT=0
 SRC_URI=https://github.com/google/bloaty/archive/73594cde8c9a52a102c4341c244c833aa61b9c06.tar.gz -> bloaty-0_p20170420.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=81ff8352ce80f7c828031f67b0bdf9bb
diff --git a/metadata/md5-cache/dev-util/btyacc-3.0-r3 b/metadata/md5-cache/dev-util/btyacc-3.0-r3
index b21a97ea083e..a3d4d2fc389f 100644
--- a/metadata/md5-cache/dev-util/btyacc-3.0-r3
+++ b/metadata/md5-cache/dev-util/btyacc-3.0-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Backtracking YACC - modified from Berkeley YACC
 EAPI=7
 HOMEPAGE=https://www.siber.com/btyacc
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.siber.com/btyacc/btyacc-3-0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=ebf84f2c1716ae5cd5c769de7fa40806
diff --git a/metadata/md5-cache/dev-util/build-0.3.10 b/metadata/md5-cache/dev-util/build-0.3.10
index 7a847cef7a32..3501141a5d38 100644
--- a/metadata/md5-cache/dev-util/build-0.3.10
+++ b/metadata/md5-cache/dev-util/build-0.3.10
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
 DESCRIPTION=A massively-parallel software build system implemented on top of GNU make
 EAPI=6
 HOMEPAGE=https://www.codesynthesis.com/projects/build/
+INHERIT=versionator
 IUSE=examples
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
diff --git a/metadata/md5-cache/dev-util/build2-0.13.0 b/metadata/md5-cache/dev-util/build2-0.13.0
index 78fc04bd8347..9fa76f11394a 100644
--- a/metadata/md5-cache/dev-util/build2-0.13.0
+++ b/metadata/md5-cache/dev-util/build2-0.13.0
@@ -4,6 +4,7 @@ DEPEND=~dev-cpp/libodb-2.5.0_beta19 ~dev-cpp/libodb-sqlite-2.5.0_beta19 dev-db/s
 DESCRIPTION=cross-platform toolchain for building and packaging C++ code
 EAPI=7
 HOMEPAGE=https://build2.org
+INHERIT=toolchain-funcs multiprocessing
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=~dev-cpp/libodb-2.5.0_beta19 ~dev-cpp/libodb-sqlite-2.5.0_beta19 dev-db/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=e316a75e700b3cbe3fecf59a6f37daa3
diff --git a/metadata/md5-cache/dev-util/clair-2.1.3 b/metadata/md5-cache/dev-util/clair-2.1.3
index 706ac700afe3..286391d28fec 100644
--- a/metadata/md5-cache/dev-util/clair-2.1.3
+++ b/metadata/md5-cache/dev-util/clair-2.1.3
@@ -4,6 +4,7 @@ DEPEND=acct-group/clair acct-user/clair
 DESCRIPTION=Vulnerability Static Analysis for Containers
 EAPI=7
 HOMEPAGE=https://github.com/coreos/clair
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git acct-group/clair acct-user/clair !!sci-visualization/xd3d
diff --git a/metadata/md5-cache/dev-util/clair-2.1.4 b/metadata/md5-cache/dev-util/clair-2.1.4
index 6555b1dc02c8..c2ca48cc65f3 100644
--- a/metadata/md5-cache/dev-util/clair-2.1.4
+++ b/metadata/md5-cache/dev-util/clair-2.1.4
@@ -4,6 +4,7 @@ DEPEND=acct-group/clair acct-user/clair
 DESCRIPTION=Vulnerability Static Analysis for Containers
 EAPI=7
 HOMEPAGE=https://github.com/coreos/clair
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git acct-group/clair acct-user/clair !!sci-visualization/xd3d
diff --git a/metadata/md5-cache/dev-util/crash-7.2.9 b/metadata/md5-cache/dev-util/crash-7.2.9
index c8e876bb4429..9e3ddde1266d 100644
--- a/metadata/md5-cache/dev-util/crash-7.2.9
+++ b/metadata/md5-cache/dev-util/crash-7.2.9
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile prepare
 DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
 EAPI=7
 HOMEPAGE=https://crash-utility.github.io/
+INHERIT=toolchain-funcs
 KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crash-utility/crash/archive/7.2.9.tar.gz -> crash-7.2.9.tar.gz mirror://gnu/gdb/gdb-7.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=31a6d48e7c8a30471696096e789ae707
diff --git a/metadata/md5-cache/dev-util/csup-20060318-r1 b/metadata/md5-cache/dev-util/csup-20060318-r1
index 8c1bb6f94231..d3418740c1cb 100644
--- a/metadata/md5-cache/dev-util/csup-20060318-r1
+++ b/metadata/md5-cache/dev-util/csup-20060318-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/zlib:0= dev-libs/openssl:0=
 DESCRIPTION=A rewrite of CVSup
 EAPI=7
 HOMEPAGE=http://www.mu.org/~mux/csup.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib:0= dev-libs/openssl:0=
 SLOT=0
 SRC_URI=http://mu.org/~mux/csup-snap-20060318.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=7ef886a418963ac93ffbe1dda655b876
diff --git a/metadata/md5-cache/dev-util/cutils-1.6-r4 b/metadata/md5-cache/dev-util/cutils-1.6-r4
index 205701d261d6..f0cb08f1979f 100644
--- a/metadata/md5-cache/dev-util/cutils-1.6-r4
+++ b/metadata/md5-cache/dev-util/cutils-1.6-r4
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=C language utilities
 EAPI=7
 HOMEPAGE=http://www.sigala.it/sandro/software.php#cutils
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.sigala.it/sandro/files/cutils-1.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=a2e28a9c69d5e658a479a8366a84a46b
diff --git a/metadata/md5-cache/dev-util/dissembler-0.9-r1 b/metadata/md5-cache/dev-util/dissembler-0.9-r1
index 347e064516b9..faccd7e3c192 100644
--- a/metadata/md5-cache/dev-util/dissembler-0.9-r1
+++ b/metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=polymorphs bytecode to a printable ASCII string
 EAPI=6
 HOMEPAGE=http://www.securiteam.com/tools/5MP0L2KFPA.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://repo.palkeo.com/repositories/mirror7.meh.or.id/Tools/OTHER_TOOLS/ShellCode/dissembler_0.9.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=ca4137327bf77994da13e8c8d4c45aea
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.2.1 b/metadata/md5-cache/dev-util/drone-cli-1.2.1
index a9261a469cd8..1050ac158566 100644
--- a/metadata/md5-cache/dev-util/drone-cli-1.2.1
+++ b/metadata/md5-cache/dev-util/drone-cli-1.2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Command-line interface for Drone
 EAPI=7
 HOMEPAGE=https://github.com/drone/drone-cli
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-util/duma-2.5.15-r2 b/metadata/md5-cache/dev-util/duma-2.5.15-r2
index ec59f15bc1e2..cd14e05718ae 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r2
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install postinst test
 DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
 EAPI=6
 HOMEPAGE=http://duma.sourceforge.net
+INHERIT=toolchain-funcs versionator
 IUSE=examples
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=f90b4a92c41b53cb5ed956806d6b29ed
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.3 b/metadata/md5-cache/dev-util/dwdiff-2.1.3
index bb84c1212caa..a2977f60e778 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.3
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.3
@@ -4,11 +4,12 @@ DEPEND=dev-libs/icu:= sys-apps/diffutils
 DESCRIPTION=diff-like program operating at word level instead of line level
 EAPI=7
 HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
+INHERIT=toolchain-funcs
 IUSE=nls
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= sys-apps/diffutils
 SLOT=0
 SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.3.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=ecd213be1179f81eda18009f07dc843f
diff --git a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2 b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
index 93c623a6c989..2a91579b4f6d 100644
--- a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
+++ b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A 100% compatible, enhanced implementation of the make alternative Jam
 EAPI=7
 HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=perforce GPL-2
 SLOT=0
 SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=f1675ce890c02f1b9bf60e3cd3b4ab2f
diff --git a/metadata/md5-cache/dev-util/fuzz-0.6-r1 b/metadata/md5-cache/dev-util/fuzz-0.6-r1
index bdeff191a140..a0130eac8374 100644
--- a/metadata/md5-cache/dev-util/fuzz-0.6-r1
+++ b/metadata/md5-cache/dev-util/fuzz-0.6-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Stress-tests programs by giving them random input
 EAPI=5
 HOMEPAGE=http://fuzz.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=76e57cd7cc7fec8e7a0e52a7f98e7845
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101 b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
index f583100ccc5a..264dc8ad2f1a 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? (
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=7
 HOMEPAGE=https://plugins.geany.org
+INHERIT=lua-single
 IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
 KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? (
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.37.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
 _md5_=4c4ca24c9df264fccae2617ff7015858
diff --git a/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0 b/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0
index b2be9f23d30e..366d3a389c0b 100644
--- a/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0
+++ b/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=linter for .gitlab-ci.yml files
 EAPI=7
 HOMEPAGE=https://gitlab.com/orobardet/gitlab-ci-linter
+INHERIT=go-module
 KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=strip
diff --git a/metadata/md5-cache/dev-util/huc-0.1-r1 b/metadata/md5-cache/dev-util/huc-0.1-r1
index 14787373f886..6c6126b65cc3 100644
--- a/metadata/md5-cache/dev-util/huc-0.1-r1
+++ b/metadata/md5-cache/dev-util/huc-0.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=HTML umlaut conversion tool
 EAPI=6
 HOMEPAGE=http://www.int21.de/huc
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc sparc x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.int21.de/huc/huc-0.1.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=ce5e4a1a78b6937f0b6f2ac56d4fbe96
diff --git a/metadata/md5-cache/dev-util/jfrog-cli-1.35.3 b/metadata/md5-cache/dev-util/jfrog-cli-1.35.3
index e188c57b5099..9221be09913d 100644
--- a/metadata/md5-cache/dev-util/jfrog-cli-1.35.3
+++ b/metadata/md5-cache/dev-util/jfrog-cli-1.35.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Command line utility foroperations on container images and image repositories
 EAPI=7
 HOMEPAGE=https://github.com/jfrog/jfrog-cli
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=strip
diff --git a/metadata/md5-cache/dev-util/kubebuilder-2.3.1 b/metadata/md5-cache/dev-util/kubebuilder-2.3.1
index 231021197bc2..f4150d521db8 100644
--- a/metadata/md5-cache/dev-util/kubebuilder-2.3.1
+++ b/metadata/md5-cache/dev-util/kubebuilder-2.3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=SDK for building Kubernetes APIs using CRDs
 EAPI=7
 HOMEPAGE=https://book.kubebuilder.io
+INHERIT=go-module
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD-4 ECL-2.0 JSON MIT
 RESTRICT=strip
diff --git a/metadata/md5-cache/dev-util/leaktracer-2.4-r3 b/metadata/md5-cache/dev-util/leaktracer-2.4-r3
index 4368c7c327ab..941288006170 100644
--- a/metadata/md5-cache/dev-util/leaktracer-2.4-r3
+++ b/metadata/md5-cache/dev-util/leaktracer-2.4-r3
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl sys-devel/gdb
 DESCRIPTION=trace and analyze memory leaks in C++ programs
 EAPI=6
 HOMEPAGE=http://www.andreasen.org/LeakTracer/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=dev-lang/perl sys-devel/gdb
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/leaktracer-2.4-gentoo_p2.tbz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=ea1e2f1463df9bcb931aa1dd42d80259
diff --git a/metadata/md5-cache/dev-util/lockrun-20120508-r1 b/metadata/md5-cache/dev-util/lockrun-20120508-r1
index d14c2dc4bf7e..ef2e9f626b4b 100644
--- a/metadata/md5-cache/dev-util/lockrun-20120508-r1
+++ b/metadata/md5-cache/dev-util/lockrun-20120508-r1
@@ -2,8 +2,9 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Lockrun - runs cronjobs with overrun protection
 EAPI=6
 HOMEPAGE=http://www.unixwiz.net/tools/lockrun.html
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~hppa x86
 LICENSE=public-domain
 SLOT=0
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=a92dd76b4bd9e858ea6fdd059dd2c876
diff --git a/metadata/md5-cache/dev-util/makeheaders-0_p4 b/metadata/md5-cache/dev-util/makeheaders-0_p4
index 7804a962eea1..af02c9511f36 100644
--- a/metadata/md5-cache/dev-util/makeheaders-0_p4
+++ b/metadata/md5-cache/dev-util/makeheaders-0_p4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=simple utility that will automatically generate header files
 EAPI=6
 HOMEPAGE=http://www.hwaci.com/sw/mkhdr/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.hwaci.com/sw/mkhdr/makeheaders.c -> makeheaders-0_p4.c http://www.hwaci.com/sw/mkhdr/makeheaders.html -> makeheaders-0_p4.html
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=2f7cf0c64c8492ab06e2b6533c6b54ca
diff --git a/metadata/md5-cache/dev-util/mdds-9999 b/metadata/md5-cache/dev-util/mdds-9999
index a116d7749c7c..7dfda9afebbf 100644
--- a/metadata/md5-cache/dev-util/mdds-9999
+++ b/metadata/md5-cache/dev-util/mdds-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=1/9999
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
 _md5_=f3416eb924c8a5b8af3fc8025034c220
diff --git a/metadata/md5-cache/dev-util/peg-0.1.18 b/metadata/md5-cache/dev-util/peg-0.1.18
index c771444d8237..967ae3dbc9c9 100644
--- a/metadata/md5-cache/dev-util/peg-0.1.18
+++ b/metadata/md5-cache/dev-util/peg-0.1.18
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Recursive-descent parser generators for C
 EAPI=7
 HOMEPAGE=http://piumarta.com/software/peg/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://piumarta.com/software/peg/peg-0.1.18.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=a052fb4b4fd4e30343af474ab8338016
diff --git a/metadata/md5-cache/dev-util/plan9port-0_pre20200526 b/metadata/md5-cache/dev-util/plan9port-0_pre20200526
index 837c4d81b69c..f0d8141dab1f 100644
--- a/metadata/md5-cache/dev-util/plan9port-0_pre20200526
+++ b/metadata/md5-cache/dev-util/plan9port-0_pre20200526
@@ -3,6 +3,7 @@ DEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconf
 DESCRIPTION=Port of many Plan 9 programs and libraries
 EAPI=7
 HOMEPAGE=https://9fans.github.io/plan9port/ https://github.com/9fans/plan9port
+INHERIT=multiprocessing toolchain-funcs readme.gentoo-r1
 IUSE=X aqua truetype
 KEYWORDS=~amd64 ~x86
 LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
@@ -10,5 +11,5 @@ RDEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontcon
 REQUIRED_USE=?? ( X aqua )
 SLOT=0
 SRC_URI=https://github.com/9fans/plan9port/archive/a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz -> plan9port-a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=ee0fc545a5eb9f3d78ff575aea97b64f
diff --git a/metadata/md5-cache/dev-util/premake-3.7 b/metadata/md5-cache/dev-util/premake-3.7
index 29b8573ade3f..f0e28fdd5864 100644
--- a/metadata/md5-cache/dev-util/premake-3.7
+++ b/metadata/md5-cache/dev-util/premake-3.7
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=A makefile generation tool
 EAPI=5
 HOMEPAGE=http://industriousone.com/premake
+INHERIT=versionator
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=3
diff --git a/metadata/md5-cache/dev-util/premake-4.4_beta5 b/metadata/md5-cache/dev-util/premake-4.4_beta5
index d83840aa9a64..2c596cf74342 100644
--- a/metadata/md5-cache/dev-util/premake-4.4_beta5
+++ b/metadata/md5-cache/dev-util/premake-4.4_beta5
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=A makefile generation tool
 EAPI=6
 HOMEPAGE=https://premake.github.io/
+INHERIT=versionator
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=4
diff --git a/metadata/md5-cache/dev-util/premake-5.0.0_alpha12 b/metadata/md5-cache/dev-util/premake-5.0.0_alpha12
index 3ca69d744a3a..f3ecff907a31 100644
--- a/metadata/md5-cache/dev-util/premake-5.0.0_alpha12
+++ b/metadata/md5-cache/dev-util/premake-5.0.0_alpha12
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=A makefile generation tool
 EAPI=6
 HOMEPAGE=https://premake.github.io/
+INHERIT=versionator
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=5
diff --git a/metadata/md5-cache/dev-util/pretrace-0.4-r2 b/metadata/md5-cache/dev-util/pretrace-0.4-r2
index 826a863dc143..1a2863bd3175 100644
--- a/metadata/md5-cache/dev-util/pretrace-0.4-r2
+++ b/metadata/md5-cache/dev-util/pretrace-0.4-r2
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=start dynamically linked applications under debugging environment
 EAPI=7
 HOMEPAGE=https://github.com/robholland/pretrace
+INHERIT=readme.gentoo-r1
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
diff --git a/metadata/md5-cache/dev-util/promu-0.5.0 b/metadata/md5-cache/dev-util/promu-0.5.0
index 8cfea2352ac4..318bf0eca5d9 100644
--- a/metadata/md5-cache/dev-util/promu-0.5.0
+++ b/metadata/md5-cache/dev-util/promu-0.5.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Prometheus Utility Tool
 EAPI=7
 HOMEPAGE=https://github.com/prometheus/promu
+INHERIT=go-module
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-util/promu-0.7.0 b/metadata/md5-cache/dev-util/promu-0.7.0
index b5a57461c172..e9bfcb6e8bce 100644
--- a/metadata/md5-cache/dev-util/promu-0.7.0
+++ b/metadata/md5-cache/dev-util/promu-0.7.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Prometheus Utility Tool
 EAPI=7
 HOMEPAGE=https://github.com/prometheus/promu
+INHERIT=go-module
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-util/pscan-20000721-r1 b/metadata/md5-cache/dev-util/pscan-20000721-r1
index 073fda9d785e..6bc6bb6cea74 100644
--- a/metadata/md5-cache/dev-util/pscan-20000721-r1
+++ b/metadata/md5-cache/dev-util/pscan-20000721-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A limited problem scanner for C source files
 EAPI=7
 HOMEPAGE=http://www.striker.ottawa.on.ca/~aland/pscan/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/pscan-20000721.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=b5bede2168cced5a9649d93a46793312
diff --git a/metadata/md5-cache/dev-util/qbs-1.16.0 b/metadata/md5-cache/dev-util/qbs-1.16.0
index 374ac08eb5b9..c15f0c25289c 100644
--- a/metadata/md5-cache/dev-util/qbs-1.16.0
+++ b/metadata/md5-cache/dev-util/qbs-1.16.0
@@ -3,6 +3,7 @@ DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-
 DESCRIPTION=Modern build tool for software projects
 EAPI=7
 HOMEPAGE=https://doc.qt.io/qbs/
+INHERIT=qmake-utils toolchain-funcs
 IUSE=doc examples test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qbs/1.16.0/qbs-src-1.16.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
 _md5_=552439f3551f29ea88655228d465ba49
diff --git a/metadata/md5-cache/dev-util/qbs-1.18.0 b/metadata/md5-cache/dev-util/qbs-1.18.0
index af8f5ae126a9..38577eea35a2 100644
--- a/metadata/md5-cache/dev-util/qbs-1.18.0
+++ b/metadata/md5-cache/dev-util/qbs-1.18.0
@@ -3,6 +3,7 @@ DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-
 DESCRIPTION=Modern build tool for software projects
 EAPI=7
 HOMEPAGE=https://doc.qt.io/qbs/
+INHERIT=qmake-utils toolchain-funcs
 IUSE=doc examples test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qbs/1.18.0/qbs-src-1.18.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
 _md5_=57e3cbd6c2a5b60e750ab1bec875a9cf
diff --git a/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2 b/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2
index 8b75f31a7158..a7e845b568f8 100644
--- a/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2
+++ b/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2
@@ -3,10 +3,11 @@ DEPEND=app-pda/usbmuxd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-uti
 DESCRIPTION=Crossplatform log viewer for Android, iOS and text files
 EAPI=7
 HOMEPAGE=https://github.com/alopatindev/qdevicemonitor
+INHERIT=desktop qmake-utils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-pda/usbmuxd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-util/android-tools
 SLOT=0
 SRC_URI=https://github.com/alopatindev/qdevicemonitor/archive/1.0.1.tar.gz -> qdevicemonitor-1.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
 _md5_=0ab772b115cbe655ed995313f4db0c5a
diff --git a/metadata/md5-cache/dev-util/qstlink2-1.2.3 b/metadata/md5-cache/dev-util/qstlink2-1.2.3
index 7b60966f9366..42fc3d076a93 100644
--- a/metadata/md5-cache/dev-util/qstlink2-1.2.3
+++ b/metadata/md5-cache/dev-util/qstlink2-1.2.3
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/
 DESCRIPTION=GUI and CLI ST-Link V2(Debugger/Programmer) client
 EAPI=7
 HOMEPAGE=https://github.com/fpoussin/QStlink2/
+INHERIT=qmake-utils udev
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/fpoussin/QStlink2/archive/v1.2.3.tar.gz -> qstlink2-1.2.3.tar.gz https://github.com/fpoussin/QtUsb/archive/v0.2.1.tar.gz -> qtusb-0.2.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=5d46d4414aa4776e3db45b9bcbe14c2e
diff --git a/metadata/md5-cache/dev-util/sasm-3.10.1 b/metadata/md5-cache/dev-util/sasm-3.10.1
index ce1fe4df8d8c..8866f9e365ac 100644
--- a/metadata/md5-cache/dev-util/sasm-3.10.1
+++ b/metadata/md5-cache/dev-util/sasm-3.10.1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication dev-qt/qtwidget
 DESCRIPTION=Simple crossplatform IDE for NASM assembly language
 EAPI=7
 HOMEPAGE=http://dman95.github.io/SASM/
+INHERIT=qmake-utils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication dev-qt/qtwidgets:5 dev-lang/nasm sys-devel/gdb
 SLOT=0
 SRC_URI=https://github.com/Dman95/SASM/archive/v3.10.1.tar.gz -> sasm-3.10.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
 _md5_=c43474bb9e4a4f6315de8b34dba79543
diff --git a/metadata/md5-cache/dev-util/shards-0.14.1 b/metadata/md5-cache/dev-util/shards-0.14.1
index c1b356d01418..38b8f5ecefb9 100644
--- a/metadata/md5-cache/dev-util/shards-0.14.1
+++ b/metadata/md5-cache/dev-util/shards-0.14.1
@@ -3,11 +3,12 @@ DEPEND=>dev-lang/crystal-0.11.1[yaml]
 DESCRIPTION=Dependency manager for the Crystal language
 EAPI=7
 HOMEPAGE=https://github.com/crystal-lang/shards
+INHERIT=multiprocessing toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>dev-lang/crystal-0.11.1[yaml]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/shards/archive/v0.14.1.tar.gz -> shards-0.14.1.tar.gz https://github.com/crystal-lang/crystal-molinillo/archive/v0.1.0.tar.gz -> crystal-molinillo-0.1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=7cfc734149f7ab5a07e2676813ccf6c5
diff --git a/metadata/md5-cache/dev-util/stubgen-2.08 b/metadata/md5-cache/dev-util/stubgen-2.08
index 410d26c3279f..70428a3abe7a 100644
--- a/metadata/md5-cache/dev-util/stubgen-2.08
+++ b/metadata/md5-cache/dev-util/stubgen-2.08
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A member function stub generator for C++
 EAPI=7
 HOMEPAGE=http://www.radwin.org/michael/projects/stubgen/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.radwin.org/michael/projects/stubgen/dist/stubgen-2.08.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=a6ded097abd8f29b3c877da05d02965a
diff --git a/metadata/md5-cache/dev-util/tinlink-1.0.0-r1 b/metadata/md5-cache/dev-util/tinlink-1.0.0-r1
index 38f37ab477dd..a9ebf98a3667 100644
--- a/metadata/md5-cache/dev-util/tinlink-1.0.0-r1
+++ b/metadata/md5-cache/dev-util/tinlink-1.0.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Tool to create very small elf binary from pure binary files
 EAPI=7
 HOMEPAGE=http://sed.free.fr/tinlink/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://sed.free.fr/tinlink/tinlink-1.0.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=0e9c00a3c2a045d597b57f1f713e7116
diff --git a/metadata/md5-cache/dev-util/trinity-1.9 b/metadata/md5-cache/dev-util/trinity-1.9
index 69c52f9f5c27..7118ba56d3de 100644
--- a/metadata/md5-cache/dev-util/trinity-1.9
+++ b/metadata/md5-cache/dev-util/trinity-1.9
@@ -3,10 +3,11 @@ DEPEND=>=sys-kernel/linux-headers-4.8
 DESCRIPTION=A Linux system call fuzz tester
 EAPI=7
 HOMEPAGE=http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/
+INHERIT=toolchain-funcs
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://codemonkey.org.uk/projects/trinity/trinity-1.9.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=961f2787ddbaafe1e121fcd74b15d09e
diff --git a/metadata/md5-cache/dev-util/usb-robot-0.2.0 b/metadata/md5-cache/dev-util/usb-robot-0.2.0
index 02bd4d65fc65..3695c7290a44 100644
--- a/metadata/md5-cache/dev-util/usb-robot-0.2.0
+++ b/metadata/md5-cache/dev-util/usb-robot-0.2.0
@@ -3,10 +3,11 @@ DEPEND=virtual/libusb:0 sys-libs/readline
 DESCRIPTION=USB Reverse engineering tools
 EAPI=6
 HOMEPAGE=http://usb-robot.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 sys-libs/readline
 SLOT=0
 SRC_URI=mirror://sourceforge/usb-robot/usb-robot-0.2.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=6e36676381414a902a78a3b6b77dc1d6
diff --git a/metadata/md5-cache/dev-util/vmtouch-1.3.0 b/metadata/md5-cache/dev-util/vmtouch-1.3.0
index c1049a5e3ee9..2b97ed3cff48 100644
--- a/metadata/md5-cache/dev-util/vmtouch-1.3.0
+++ b/metadata/md5-cache/dev-util/vmtouch-1.3.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
 EAPI=6
 HOMEPAGE=https://hoytech.com/vmtouch/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/hoytech/vmtouch/archive/v1.3.0.tar.gz -> vmtouch-1.3.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=99585f3a73d71f9e74e76d196477bedd
diff --git a/metadata/md5-cache/dev-util/vmtouch-1.3.1 b/metadata/md5-cache/dev-util/vmtouch-1.3.1
index 20851e56009d..f8a06cb5ba39 100644
--- a/metadata/md5-cache/dev-util/vmtouch-1.3.1
+++ b/metadata/md5-cache/dev-util/vmtouch-1.3.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
 EAPI=7
 HOMEPAGE=https://hoytech.com/vmtouch/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/hoytech/vmtouch/archive/v1.3.1.tar.gz -> vmtouch-1.3.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=a9190ddbe15a3199fe7a91df4930a849
diff --git a/metadata/md5-cache/dev-util/vtable-dumper-1.2 b/metadata/md5-cache/dev-util/vtable-dumper-1.2
index a141f9354210..61bda2c86548 100644
--- a/metadata/md5-cache/dev-util/vtable-dumper-1.2
+++ b/metadata/md5-cache/dev-util/vtable-dumper-1.2
@@ -3,10 +3,11 @@ DEPEND=dev-libs/elfutils:0=
 DESCRIPTION=A tool to list content of virtual tables in a shared library
 EAPI=6
 HOMEPAGE=https://github.com/lvc/vtable-dumper
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/elfutils:0=
 SLOT=0
 SRC_URI=https://github.com/lvc/vtable-dumper/archive/1.2.tar.gz -> vtable-dumper-1.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=aa68e15bfc2897b9b65617efee65f0ca
diff --git a/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2 b/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
index 94a6e4c631f8..4a8e91aede46 100644
--- a/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
+++ b/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
@@ -3,9 +3,10 @@ DEPEND=sys-devel/flex
 DESCRIPTION=XML stream reformatter for ASCII text, but not UTF-8, written in ANSI C
 EAPI=6
 HOMEPAGE=http://xmlindent.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlindent/xmlindent-0.2.17.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=a5b455f07743e2f3acd2e63a58b6a399
diff --git a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1 b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
index 34265289923b..cd07191143bc 100644
--- a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
+++ b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/yacc
 DESCRIPTION=A graphical file and directories comparator and merge tool
 EAPI=7
 HOMEPAGE=http://furius.ca/xxdiff/
+INHERIT=qmake-utils
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xxdiff-4.0.1_p20170622.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
 _md5_=557f3fc9c7bdc2cec87c6f2930ba5331