2021-04-13 00:35:09 UTC

50 files changed, 104 insertions, 81 deletions

diff --git a/metadata/md5-cache/app-arch/xar-1.8-r2 b/metadata/md5-cache/app-arch/xar-1.8-r2
index 70d9fda3c7ae..371f510166ad 100644
--- a/metadata/md5-cache/app-arch/xar-1.8-r2
+++ b/metadata/md5-cache/app-arch/xar-1.8-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 DESCRIPTION=An easily extensible archive format
 EAPI=6
 HOMEPAGE=https://opensource.apple.com/source/xar/
@@ -11,4 +11,4 @@ RDEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/o
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-400.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=f27bcba113be2037d641ed331c536348
+_md5_=dceb3062698f87286e03f2dd95daf6aa
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r3 b/metadata/md5-cache/app-arch/xar-1.8-r3
index cf6ef1d672f7..1150faaedd2a 100644
--- a/metadata/md5-cache/app-arch/xar-1.8-r3
+++ b/metadata/md5-cache/app-arch/xar-1.8-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 DESCRIPTION=An easily extensible archive format
 EAPI=6
 HOMEPAGE=https://opensource.apple.com/source/xar/
@@ -11,4 +11,4 @@ RDEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/o
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-417.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=ac675e2a75f053e81d101ea3993f9662
+_md5_=ee4a0bff6d00e20760e68578516653c9
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r4 b/metadata/md5-cache/app-arch/xar-1.8-r4
index dd2f5ade151a..1837d5c71391 100644
--- a/metadata/md5-cache/app-arch/xar-1.8-r4
+++ b/metadata/md5-cache/app-arch/xar-1.8-r4
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=An easily extensible archive format
@@ -11,4 +12,4 @@ RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) !l
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-417.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=195c7f2e734ac4f192b0e8f62850c218
+_md5_=c123036fd0653d875379f3ccf74aa0a5
diff --git a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3 b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
index 8476415640cb..72be8ae8174a 100644
--- a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
+++ b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
@@ -11,4 +11,4 @@ RDEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	cannadic	6d8054590c0aef2c11c567e1a815c052
-_md5_=fbb27efe5a0b208fb1a32552f6475a4f
+_md5_=556e73e86b70ecb3ea972c494f032c16
diff --git a/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23 b/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23
index 3ea227f119cf..ed80c7c22172 100644
--- a/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23
+++ b/metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23
@@ -3,10 +3,12 @@ DEPEND=uum? ( sys-libs/ncurses:= ) uum? ( virtual/pkgconfig )
 DESCRIPTION=Network-Extensible Kana-to-Kanji Conversion System
 EAPI=6
 HOMEPAGE=http://freewnn.sourceforge.jp/ http://www.freewnn.org/
+INHERIT=toolchain-funcs
 IUSE=ipv6 uum
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=uum? ( sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/freewnn/63271/FreeWnn-1.1.1-a023.tar.bz2
-_md5_=cd3ba0f7e5b474a070bb8683ad20b72b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=c989c9d3c6ec1085a5cb817ac67a6842
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1 b/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
index 275c84f063c4..7c0006b4fe9d 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
@@ -3,11 +3,11 @@ DEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl virtual/pkgconfig sys-
 DESCRIPTION=GTK+ 2 Hangul Input Modules
 EAPI=6
 HOMEPAGE=https://github.com/libhangul/imhangul
-INHERIT=gnome2-utils
+INHERIT=gnome2-utils toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-2.1.0.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=869389251db11a18845ff114f39bd79d
+_md5_=7a6ad52f75ff87b1302341c734cc88c0
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.1 b/metadata/md5-cache/app-i18n/imhangul-2.1.1
index 7d3ce3851a4e..c9a7070bcd81 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.1
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.1
@@ -3,11 +3,11 @@ DEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl virtual/pkgconfig sys-
 DESCRIPTION=GTK+ 2 Hangul Input Modules
 EAPI=6
 HOMEPAGE=https://github.com/libhangul/imhangul
-INHERIT=gnome2-utils
+INHERIT=gnome2-utils toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-i18n/libhangul x11-libs/gtk+:2 virtual/libintl
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-2.1.1.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=2a90de88886315e25ff37c9aea3fb2f6
+_md5_=e4db362135f8ccaa34cdf349c71e588a
diff --git a/metadata/md5-cache/app-i18n/imhangul-3.1.1 b/metadata/md5-cache/app-i18n/imhangul-3.1.1
index c6ef050cd247..478d4d8c6106 100644
--- a/metadata/md5-cache/app-i18n/imhangul-3.1.1
+++ b/metadata/md5-cache/app-i18n/imhangul-3.1.1
@@ -3,11 +3,11 @@ DEPEND=app-i18n/libhangul x11-libs/gtk+:3 virtual/libintl virtual/pkgconfig sys-
 DESCRIPTION=GTK+ 3 Hangul Input Modules
 EAPI=6
 HOMEPAGE=https://github.com/libhangul/imhangul
-INHERIT=gnome2-utils
+INHERIT=gnome2-utils toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-i18n/libhangul x11-libs/gtk+:3 virtual/libintl
 SLOT=3
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/imhangul/imhangul-3.1.1.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=d6d2403dd75d2eae7e387f944b1e2137
+_md5_=ec0faf1a5b42ef1c6453e45d8bb8904f
diff --git a/metadata/md5-cache/app-misc/cdircmp-0.3-r2 b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
index 96ff3f57fbff..d4fd5507be1c 100644
--- a/metadata/md5-cache/app-misc/cdircmp-0.3-r2
+++ b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
@@ -3,10 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.4:0= virtual/pkgconfig
 DESCRIPTION=Compare directories and select files to copy
 EAPI=7
 HOMEPAGE=http://home.hccnet.nl/paul.schuurmans/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.4:0=
 SLOT=0
 SRC_URI=http://home.hccnet.nl/paul.schuurmans/linux/download/cdircmp-0.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c221bebbd9b665b21459aec1d59afa2e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=f3d736345cf9946a0385e6a12789c54d
diff --git a/metadata/md5-cache/dev-db/tora-3.2-r1 b/metadata/md5-cache/dev-db/tora-3.2-r1
index e698a74c96be..750dfe01d933 100644
--- a/metadata/md5-cache/dev-db/tora-3.2-r1
+++ b/metadata/md5-cache/dev-db/tora-3.2-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( mysql oracle postgres )
 SLOT=0
 SRC_URI=https://github.com/tora-tool/tora/archive/v3.2.tar.gz -> tora-3.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8
-_md5_=4cf718a4af1b015b20c10969bc744abe
+_md5_=2977e8a3869bc3c555a8582579034fc4
diff --git a/metadata/md5-cache/dev-db/tora-9999 b/metadata/md5-cache/dev-db/tora-9999
index f8914002db6b..7affc48aea67 100644
--- a/metadata/md5-cache/dev-db/tora-9999
+++ b/metadata/md5-cache/dev-db/tora-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/ferrisloki dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 de
 REQUIRED_USE=|| ( mysql oracle postgres )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	12008d68ebfd61f49a377c49f83558a8	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=f0b12facc93395b945a61b09ef6ee933
+_md5_=e3ff0b396b90cddf24bd24be26bfecbb
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index 9dfaeba95695..288a4e673a7b 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:
 DESCRIPTION=An extremely small and specification-compliant virtual machine
 EAPI=5
 HOMEPAGE=http://jamvm.sourceforge.net/
-INHERIT=eutils flag-o-matic multilib java-vm-2 autotools
+INHERIT=eutils flag-o-matic multilib java-vm-2 autotools toolchain-funcs
 IUSE=debug libffi
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=a256dd5de4ec70d22fb031e3b922ba99
+_md5_=c79f341798f5101427d0c68d076d21da
diff --git a/metadata/md5-cache/dev-lang/mercury-extras-20.06 b/metadata/md5-cache/dev-lang/mercury-extras-20.06
index 6a80d17d7e76..99b68914fe7b 100644
--- a/metadata/md5-cache/dev-lang/mercury-extras-20.06
+++ b/metadata/md5-cache/dev-lang/mercury-extras-20.06
@@ -3,6 +3,7 @@ DEPEND=~dev-lang/mercury-20.06 cairo? ( >=x11-libs/cairo-1.10.0 ) gmp? ( dev-lib
 DESCRIPTION=Additional libraries and tools that are not part of the Mercury standard library
 EAPI=7
 HOMEPAGE=https://www.mercurylang.org/index.html
+INHERIT=eutils multilib toolchain-funcs vcs-clean
 IUSE=cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
@@ -10,5 +11,5 @@ RDEPEND=~dev-lang/mercury-20.06 cairo? ( >=x11-libs/cairo-1.10.0 ) gmp? ( dev-li
 REQUIRED_USE=?? ( odbc iodbc )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury-extras/mercury-extras-20.06-gentoo-patchset-0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd27beed09c67d77ec4d56b31b2f0f08
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=73f33e44fad93b6fac2c762858dc82b2
diff --git a/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1 b/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1
index 0d43583984a5..8dd204715fff 100644
--- a/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1
+++ b/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1
@@ -10,4 +10,4 @@ RDEPEND=acct-group/gamestat sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://m.seehuhn.de/programs/moon-buggy-1.0.51.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=a12cdba5ec8dab5035e783a9c839b1c3
+_md5_=95a437d176fe45659efcbd61298db895
diff --git a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1 b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
index 9c7b7119d568..6559e5951907 100644
--- a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
+++ b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
@@ -3,9 +3,11 @@ DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
 DESCRIPTION=Space invaders clone, using ncurses library
 EAPI=6
 HOMEPAGE=https://packages.gentoo.org/package/games-arcade/ascii-invaders
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~mips ~ppc64 ~x86 ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0
 SLOT=0
 SRC_URI=mirror://gentoo/invaders0.1b.tgz
-_md5_=9edf13f559e6b089dc7673fb8e561797
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8624c7b41ee46fa904a9c197a21bd81d
diff --git a/metadata/md5-cache/games-arcade/gnake-0.94b-r1 b/metadata/md5-cache/games-arcade/gnake-0.94b-r1
index 4c8fba0fa8f6..667aa54d1a70 100644
--- a/metadata/md5-cache/games-arcade/gnake-0.94b-r1
+++ b/metadata/md5-cache/games-arcade/gnake-0.94b-r1
@@ -3,9 +3,11 @@ DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
 DESCRIPTION=An ncurses-based Nibbles clone
 EAPI=6
 HOMEPAGE=http://lightless.org/gnake
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0
 SLOT=0
 SRC_URI=mirror://gentoo/Gnake.0.94b.tar.gz
-_md5_=50c943d46eb09850ac3c715536a2ec93
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=aa1011fbf566d720b22ca4f29f1efef8
diff --git a/metadata/md5-cache/games-arcade/stardork-0.7-r1 b/metadata/md5-cache/games-arcade/stardork-0.7-r1
index ce0829f63f74..0e5e547d1315 100644
--- a/metadata/md5-cache/games-arcade/stardork-0.7-r1
+++ b/metadata/md5-cache/games-arcade/stardork-0.7-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=An ncurses-based space shooter
 EAPI=6
 HOMEPAGE=http://stardork.sourceforge.net/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/stardork/stardork-0.7.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=13094b5bf3c82a83bca7e3766ec94508
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=222e5c54a29a82323f6bcf73cb5a24b8
diff --git a/metadata/md5-cache/games-fps/darkplaces-20140513-r1 b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
index 78da597a1336..690cd7235bfd 100644
--- a/metadata/md5-cache/games-fps/darkplaces-20140513-r1
+++ b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
@@ -11,4 +11,4 @@ RDEPEND=net-misc/curl cdinstall? ( games-fps/quake1-data ) demo? ( games-fps/qua
 SLOT=0
 SRC_URI=http://icculus.org/twilight/darkplaces/files/darkplacesengine20140513.zip lights? ( http://www.fuhquake.net/files/extras/fuhquake-lits.rar http://www.kgbsyndicate.com/romi/id1.pk3 )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=4abef158208be99ef6fe60c6411e1b6a
+_md5_=14b3f338d31ce3a0d6cdc690db1c796a
diff --git a/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1 b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
index 6bc095e419e4..d3243368057c 100644
--- a/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
+++ b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sd
 DESCRIPTION=A puzzle game where the player has to arrange balls in triplets
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/zaz/
-INHERIT=autotools flag-o-matic xdg
+INHERIT=autotools flag-o-matic xdg toolchain-funcs
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 GPL-3+ CC-BY-SA-3.0 OFL
@@ -11,4 +11,4 @@ RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/s
 SLOT=0
 SRC_URI=mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=57669272ecffed770419055b505537a3
+_md5_=81580d909f2a9c948d930aa6a32ea258
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0 b/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0
index a491b00459a6..b342b05bcdcf 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.27.0
@@ -3,7 +3,7 @@ DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep
 DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
 EAPI=7
 HOMEPAGE=http://www.gnustep.org
-INHERIT=eutils gnustep-base
+INHERIT=eutils gnustep-base toolchain-funcs
 IUSE=+gnutls +icu +libffi zeroconf debug doc
 KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnuste
 SLOT=0/1.27
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.27.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a
-_md5_=7cb28f9349861037aed243fae93456f6
+_md5_=b35f280911f082857451cd99507ce55a
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0 b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
index 0dcfde753178..66db5baa79ce 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
@@ -3,7 +3,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=Store, Sync and Share Files Online
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-INHERIT=mate python-single-r1 linux-info user
+INHERIT=mate python-single-r1 linux-info toolchain-funcs user
 IUSE=debug +python_single_target_python3_7 kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=CC-BY-ND-3.0 GPL-3+ public-domain
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-dropbox-1.24.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	autotools	9e63f92c2a5d867fea55ecb160c7d354	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	mate	0746707eb54b01af9c594947527af4eb	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=8c50675501d8da0ea0e74ae61028e423
+_md5_=5a2c08f3971e35b6083e47a961090a43
diff --git a/metadata/md5-cache/media-gfx/dcraw-9.28.0-r2 b/metadata/md5-cache/media-gfx/dcraw-9.28.0-r2
index 51a10bc6c448..1172a3597ea1 100644
--- a/metadata/md5-cache/media-gfx/dcraw-9.28.0-r2
+++ b/metadata/md5-cache/media-gfx/dcraw-9.28.0-r2
@@ -4,11 +4,12 @@ DEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) gimp? ( media-gfx/gi
 DESCRIPTION=Command-line decoder for raw digital photos
 EAPI=7
 HOMEPAGE=https://www.cybercom.net/~dcoffin/dcraw/
+INHERIT=readme.gentoo-r1 toolchain-funcs
 IUSE=nls gimp jpeg lcms
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) gimp? ( media-gfx/gimp:0/2 ) media-libs/netpbm
 SLOT=0
 SRC_URI=https://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.28.0.tar.gz mirror://gentoo/parse-1.73.tar.bz2 gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f66503b57bed70b04ad4ed15dbe810ca
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=e66a9afb3e7f1910c65cbda9f7ae88bf
diff --git a/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1 b/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
index 5600e61a18a2..1f180f7bc5e0 100644
--- a/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
+++ b/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
 DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
 EAPI=5
 HOMEPAGE=http://freewrl.sourceforge.net/
-INHERIT=autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+INHERIT=autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib toolchain-funcs
 IUSE=curl debug java libeai motif +nsplugin opencl osc +sox static-libs elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-3.0.0.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	mozextension	02419f8d0c6b57fd23bb4e875a37996a	nsplugins	2049586e425364a1c5bdb004205d1758	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
-_md5_=025fc352c104cc74a5996f05f850defc
+_md5_=464c993a5dd609352a5f674c375c9558
diff --git a/metadata/md5-cache/media-gfx/freewrl-9999 b/metadata/md5-cache/media-gfx/freewrl-9999
index d29e4c7fd3bb..a1e28984bbd8 100644
--- a/metadata/md5-cache/media-gfx/freewrl-9999
+++ b/metadata/md5-cache/media-gfx/freewrl-9999
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
 DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
 EAPI=5
 HOMEPAGE=http://freewrl.sourceforge.net/
-INHERIT=autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib git-r3
+INHERIT=autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib toolchain-funcs git-r3
 IUSE=curl debug java libeai motif +nsplugin opencl osc rbp +sox static-libs elibc_FreeBSD java
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) rbp? ( dev-games/ode:0=[double-precision] ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	mozextension	02419f8d0c6b57fd23bb4e875a37996a	nsplugins	2049586e425364a1c5bdb004205d1758	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=8688836f91e4baa9a3ac96b4d7611ae1
+_md5_=5971d154ca40f7379cbc0c1726699846
diff --git a/metadata/md5-cache/media-plugins/live-2020.03.06 b/metadata/md5-cache/media-plugins/live-2020.03.06
index 749a94abb6df..775a9666bea3 100644
--- a/metadata/md5-cache/media-plugins/live-2020.03.06
+++ b/metadata/md5-cache/media-plugins/live-2020.03.06
@@ -4,11 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=7
 HOMEPAGE=http://www.live555.com/
+INHERIT=toolchain-funcs
 IUSE=libressl ssl
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0/8
 SRC_URI=https://cmpct.info/~sam/gentoo/distfiles/media-plugins/live/live.2020.03.06.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bb51e183dc0e602f932d201e5ccea2dc
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8d1c513c83938728043cb98c6c8bdcf0
diff --git a/metadata/md5-cache/media-plugins/live-2020.05.15 b/metadata/md5-cache/media-plugins/live-2020.05.15
index 6e9a4e8b5701..95111262eb39 100644
--- a/metadata/md5-cache/media-plugins/live-2020.05.15
+++ b/metadata/md5-cache/media-plugins/live-2020.05.15
@@ -4,11 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=7
 HOMEPAGE=http://www.live555.com/
+INHERIT=toolchain-funcs
 IUSE=libressl ssl
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0/9
 SRC_URI=http://www.live555.com/liveMedia/public/live.2020.05.15.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1d4bbee8ee950449839d9c67911600ec
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=1e0af26f10250af07cbf4e5103a25d08
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
index d591a1e2f396..c77a06657056 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f
-_md5_=0719b31306648c3a577289101d66d939
+_md5_=3752d33fbaf15f05157aa2da1532e9fd
diff --git a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0 b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
index 83d40545488b..0a79b200aab7 100644
--- a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
+++ b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
@@ -3,10 +3,11 @@ DEPEND=media-sound/pulseaudio:=
 DESCRIPTION=Linux Fleetsync / MDC1200 decoder
 EAPI=7
 HOMEPAGE=https://github.com/russinnes/fsync-mdc1200-decode
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=media-sound/pulseaudio:=
 SLOT=0
 SRC_URI=https://github.com/russinnes/fsync-mdc1200-decode/archive/1.0.tar.gz -> fsync-mdc1200-decode-1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=acf6498009dde50f3dbc74a0c5cecc61
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=f715211ba1eedf80c5e5129edf787734
diff --git a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999 b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
index 4627316e5c22..150801806808 100644
--- a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
+++ b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=media-sound/pulseaudio:=
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=acf6498009dde50f3dbc74a0c5cecc61
+_md5_=f715211ba1eedf80c5e5129edf787734
diff --git a/metadata/md5-cache/media-sound/horgand-1.14-r2 b/metadata/md5-cache/media-sound/horgand-1.14-r2
index 92018e5813d8..0bd74f075883 100644
--- a/metadata/md5-cache/media-sound/horgand-1.14-r2
+++ b/metadata/md5-cache/media-sound/horgand-1.14-r2
@@ -4,10 +4,11 @@ DEPEND=media-libs/alsa-lib media-libs/libsndfile media-sound/alsa-utils virtual/
 DESCRIPTION=Opensource software organ
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/horgand.berlios/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-libs/libsndfile media-sound/alsa-utils virtual/jack x11-libs/fltk:1 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://download.sourceforge.net/horgand.berlios/horgand-1.14.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5b61c3641738c0dca6f61a202f3d9716
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=6bb3c96a1e184681118a02a01a958d3c
diff --git a/metadata/md5-cache/media-sound/solfege-3.23.4 b/metadata/md5-cache/media-sound/solfege-3.23.4
index dfe51c45079d..71255feba89b 100644
--- a/metadata/md5-cache/media-sound/solfege-3.23.4
+++ b/metadata/md5-cache/media-sound/solfege-3.23.4
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/solfege/solfege-3.23.4.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=316a762cd1d4390cfbe03ff6ca243e96
+_md5_=3e4d6f3ecdc3ddb6a521f2d91e8193f0
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.20.0 b/metadata/md5-cache/media-tv/v4l-utils-1.20.0
index ee94a1178f5d..f2d42dc6c094 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.20.0
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.20.0
@@ -12,4 +12,4 @@ RDEPEND=>=media-libs/libv4l-1.20.0[dvb?,jpeg] >=virtual/jpeg-0-r2:0= bpf? ( virt
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=145ae8bc33990f66cdf82558b3dd9f66
+_md5_=19d853c6702218e1ef02733ecb171aab
diff --git a/metadata/md5-cache/net-news/rsstail-2.1 b/metadata/md5-cache/net-news/rsstail-2.1
index 74ce92dd2d3e..234ff53b0048 100644
--- a/metadata/md5-cache/net-news/rsstail-2.1
+++ b/metadata/md5-cache/net-news/rsstail-2.1
@@ -4,10 +4,11 @@ DEPEND=>=net-libs/libmrss-0.17.1
 DESCRIPTION=A tail-like RSS-reader
 EAPI=7
 HOMEPAGE=http://www.vanheusden.com/rsstail/ https://github.com/flok99/rsstail
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmrss-0.17.1
 SLOT=0
 SRC_URI=http://www.vanheusden.com/rsstail/rsstail-2.1.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d5c0d8c9daee8bbfeb55b5c0f48a87c5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=28a7f2ccc824c75b79ba62657b008482
diff --git a/metadata/md5-cache/net-news/rsstail-2.1_p20200310 b/metadata/md5-cache/net-news/rsstail-2.1_p20200310
index 949dea061307..dfd88b77f576 100644
--- a/metadata/md5-cache/net-news/rsstail-2.1_p20200310
+++ b/metadata/md5-cache/net-news/rsstail-2.1_p20200310
@@ -4,10 +4,11 @@ DEPEND=>=net-libs/libmrss-0.17.1
 DESCRIPTION=A tail-like RSS-reader
 EAPI=7
 HOMEPAGE=http://www.vanheusden.com/rsstail/ https://github.com/flok99/rsstail
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmrss-0.17.1
 SLOT=0
 SRC_URI=https://github.com/flok99/rsstail/archive/0b23b367c98de8882b58a451742a3f2e385c4ba0.tar.gz -> rsstail-2.1_p20200310.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bc2224a014bf8bf1d03c01c4b98246fc
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=685998652e2847be998b8579f289ea64
diff --git a/metadata/md5-cache/sci-chemistry/theseus-3.3.0 b/metadata/md5-cache/sci-chemistry/theseus-3.3.0
index fbab9d91c4be..05b1f7adb0b6 100644
--- a/metadata/md5-cache/sci-chemistry/theseus-3.3.0
+++ b/metadata/md5-cache/sci-chemistry/theseus-3.3.0
@@ -3,6 +3,7 @@ DEPEND=sci-libs/gsl || ( sci-biology/muscle sci-biology/probcons sci-biology/maf
 DESCRIPTION=Maximum likelihood superpositioning and analysis of macromolecular structures
 EAPI=5
 HOMEPAGE=http://www.theseus3d.org/
+INHERIT=multilib toolchain-funcs
 IUSE=examples
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -10,4 +11,4 @@ RDEPEND=sci-libs/gsl || ( sci-biology/muscle sci-biology/probcons sci-biology/ma
 SLOT=0
 SRC_URI=http://www.theseus3d.org/src/theseus_3.3.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=29583bbf0f951fff5fba627c1939f76e
+_md5_=8ed1ecf72e75b90d3f11fd91788f8430
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.4.0 b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
index 19d7790e7695..efc8350cb9e0 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.4.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
@@ -14,4 +14,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.4.0.tar.gz -> tensorflow-2.4.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.4.0.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	cuda	c2f1b334711bbbf2130f339636dc7515	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=6c6e5030a4936f5558aecabb8c7a4547
+_md5_=eec9c712a48dbc727a73dbad71a79a72
diff --git a/metadata/md5-cache/sci-mathematics/calc-2.12.5.4 b/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
index 471a7a3ecce0..37adef22e46f 100644
--- a/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
+++ b/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig
 DESCRIPTION=Arbitrary precision C-like arithmetic system
 EAPI=6
 HOMEPAGE=http://www.isthe.com/chongo/tech/comp/calc/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=http://www.isthe.com/chongo/src/calc/calc-2.12.5.4.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=59cddbb61c3b17043428276610f0273a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=dbb4705bc7d12e66602cebc51bf5abf3
diff --git a/metadata/md5-cache/sys-apps/ifd-gempc-1.0.7 b/metadata/md5-cache/sys-apps/ifd-gempc-1.0.7
index aa152da1506c..6ce746409426 100644
--- a/metadata/md5-cache/sys-apps/ifd-gempc-1.0.7
+++ b/metadata/md5-cache/sys-apps/ifd-gempc-1.0.7
@@ -4,10 +4,11 @@ DEPEND=>=sys-apps/pcsc-lite-1.2.9_beta7 virtual/libusb:0
 DESCRIPTION=GemCore based PC/SC reader drivers for pcsc-lite
 EAPI=7
 HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/ifd-GemPC
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=>=sys-apps/pcsc-lite-1.2.9_beta7 virtual/libusb:0
 SLOT=0
 SRC_URI=http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/ifd-gempc-1.0.7.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ee5ac06e68a04fd200f60bfae89082bf
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=c1d64d08ff3102463e6ebe8b1cb817db
diff --git a/metadata/md5-cache/sys-apps/minijail-9 b/metadata/md5-cache/sys-apps/minijail-9
index 923e6981b681..d4893c1f196a 100644
--- a/metadata/md5-cache/sys-apps/minijail-9
+++ b/metadata/md5-cache/sys-apps/minijail-9
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/minijail/archive/linux-v9.tar.gz -> minijail-9.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=d674f55d033b892ec0af64e7ce8769e9
+_md5_=58d434101ed13409ae1af7d18b023d4f
diff --git a/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2 b/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
index 2491f44e4fc0..df64ae3cc194 100644
--- a/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
+++ b/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
@@ -4,10 +4,11 @@ DEPEND=sys-apps/pcsc-lite dev-libs/openct
 DESCRIPTION=Schlumberger Reflex 72 Serial Smartcard Reader
 EAPI=7
 HOMEPAGE=http://www.linuxnet.com/sourcedrivers.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved BSD LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite dev-libs/openct
 SLOT=0
 SRC_URI=mirror://gentoo/slb_rf72-drv-1.1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3fa569fdbbd67ee95ecb16b2f8329457
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8f27e72dcf0fb076134240cb501bbd91
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
index f0537459ce58..2433a57f3621 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.27.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=608dc770ecd515864a2a991b23a4863e
+_md5_=0a7b41af5f4f42fa5600d71eb0e8c806
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.28 b/metadata/md5-cache/sys-cluster/ipvsadm-1.28
index d9fad3a12b0c..3ff816a651bd 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.28
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.28
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.28.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=2561f135b1bf51808fa9d696b6abde4a
+_md5_=82d0b691f8ab3ab37b2275b138021509
diff --git a/metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.8 b/metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.8
index 57c2b6fe015b..04ad05c7bb6f 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.8
+++ b/metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.8
@@ -3,10 +3,11 @@ DEPEND=net-im/pidgin[gtk] virtual/pkgconfig
 DESCRIPTION=Implementation of xmpp message delivery receipts (XEP-0184) for Pidgin
 EAPI=5
 HOMEPAGE=https://github.com/noonien-d/pidgin-xmpp-receipts
+INHERIT=vcs-snapshot toolchain-funcs
 KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=net-im/pidgin[gtk]
 SLOT=0
 SRC_URI=https://github.com/noonien-d/pidgin-xmpp-receipts/archive/release_0.8.tar.gz -> pidgin-xmpp-receipts-0.8.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=b1b31c85a33a442e8dcd1ff88f600a81
+_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=b31379c645ebd14313cff315e7eda6ef
diff --git a/metadata/md5-cache/x11-terms/xterm-351 b/metadata/md5-cache/x11-terms/xterm-351
index db9e32d2aed7..a32b63d45190 100644
--- a/metadata/md5-cache/x11-terms/xterm-351
+++ b/metadata/md5-cache/x11-terms/xterm-351
@@ -4,7 +4,7 @@ DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libutem
 DESCRIPTION=Terminal Emulator for X Windows
 EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic multilib
+INHERIT=desktop flag-o-matic multilib toolchain-funcs
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-351.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=a68a851e66a9937fa455499f513f08ee
+_md5_=92d39c311a60af4dafc5640960f91309
diff --git a/metadata/md5-cache/x11-terms/xterm-363 b/metadata/md5-cache/x11-terms/xterm-363
index a000c69d1adc..a395b1f2d4cf 100644
--- a/metadata/md5-cache/x11-terms/xterm-363
+++ b/metadata/md5-cache/x11-terms/xterm-363
@@ -4,7 +4,7 @@ DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libutem
 DESCRIPTION=Terminal Emulator for X Windows
 EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic
+INHERIT=desktop flag-o-matic toolchain-funcs
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-363.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=24a3c25643d88f613d224f3c3fba66e0
+_md5_=6593846400f6abccc98ae1bb036966b5
diff --git a/metadata/md5-cache/x11-terms/xterm-365 b/metadata/md5-cache/x11-terms/xterm-365
index 12fdeb4298b8..c0e78fab60d9 100644
--- a/metadata/md5-cache/x11-terms/xterm-365
+++ b/metadata/md5-cache/x11-terms/xterm-365
@@ -4,7 +4,7 @@ DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libutem
 DESCRIPTION=Terminal Emulator for X Windows
 EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic
+INHERIT=desktop flag-o-matic toolchain-funcs
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-365.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=24a3c25643d88f613d224f3c3fba66e0
+_md5_=6593846400f6abccc98ae1bb036966b5
diff --git a/metadata/md5-cache/x11-terms/xterm-366 b/metadata/md5-cache/x11-terms/xterm-366
index 62c77055c5c5..c684e433c1cf 100644
--- a/metadata/md5-cache/x11-terms/xterm-366
+++ b/metadata/md5-cache/x11-terms/xterm-366
@@ -4,7 +4,7 @@ DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libutem
 DESCRIPTION=Terminal Emulator for X Windows
 EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic
+INHERIT=desktop flag-o-matic toolchain-funcs
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-366.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=1b368715f8561cf952462bd86c465dff
+_md5_=1e986defc74cf7ff7351555e6f7d77ea
diff --git a/metadata/md5-cache/x11-terms/xterm-367 b/metadata/md5-cache/x11-terms/xterm-367
index 45d567f3ab6d..64cfbbd02a35 100644
--- a/metadata/md5-cache/x11-terms/xterm-367
+++ b/metadata/md5-cache/x11-terms/xterm-367
@@ -4,7 +4,7 @@ DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libutem
 DESCRIPTION=Terminal Emulator for X Windows
 EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic
+INHERIT=desktop flag-o-matic toolchain-funcs
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-367.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=24a3c25643d88f613d224f3c3fba66e0
+_md5_=6593846400f6abccc98ae1bb036966b5
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.40-r1 b/metadata/md5-cache/x11-wm/windowlab-1.40-r1
index 2cdbf7cb0dc1..31c691666c30 100644
--- a/metadata/md5-cache/x11-wm/windowlab-1.40-r1
+++ b/metadata/md5-cache/x11-wm/windowlab-1.40-r1
@@ -3,11 +3,12 @@ DEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext virtual/pkgconfig x11-base
 DESCRIPTION=small and simple window manager of novel design
 EAPI=6
 HOMEPAGE=http://www.nickgravgaard.com/windowlab/
+INHERIT=toolchain-funcs
 IUSE=truetype
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.40.tar
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=197f787714a415f955c9e4782c3e1476
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3dc3e5c99555070b14594201fc517dec
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1630c9b67700..4403e5613fc5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Apr 2021 00:20:08 +0000
+Tue, 13 Apr 2021 00:35:09 +0000