2020-04-01 21:37:35 UTC

50 files changed, 129 insertions, 383 deletions

diff --git a/metadata/md5-cache/app-crypt/hashcat-4.1.0 b/metadata/md5-cache/app-crypt/hashcat-4.1.0
index 73d74887c30d..38e5e31b54cf 100644
--- a/metadata/md5-cache/app-crypt/hashcat-4.1.0
+++ b/metadata/md5-cache/app-crypt/hashcat-4.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=World's fastest and most advanced password recovery utility
 EAPI=6
 HOMEPAGE=https://github.com/hashcat/hashcat
 IUSE=custom-cflags video_cards_nvidia
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v4.1.0.tar.gz -> hashcat-4.1.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=adfe992a356b0c90f73658bc714a3509
+_md5_=b5f46f67e37317d94ccfea759aedad76
diff --git a/metadata/md5-cache/app-crypt/hashcat-4.2.0 b/metadata/md5-cache/app-crypt/hashcat-4.2.0
index 24874267285c..8fab2f523e56 100644
--- a/metadata/md5-cache/app-crypt/hashcat-4.2.0
+++ b/metadata/md5-cache/app-crypt/hashcat-4.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=World's fastest and most advanced password recovery utility
 EAPI=6
 HOMEPAGE=https://github.com/hashcat/hashcat
 IUSE=video_cards_nvidia
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=virtual/opencl video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v4.2.0.tar.gz -> hashcat-4.2.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5e2288379b9003da70fb4b11e3f0d78
+_md5_=70157c41f27400ad974234899d0e0a94
diff --git a/metadata/md5-cache/app-crypt/hashcat-4.2.1 b/metadata/md5-cache/app-crypt/hashcat-4.2.1
index 769dff514320..1ca2c76ea584 100644
--- a/metadata/md5-cache/app-crypt/hashcat-4.2.1
+++ b/metadata/md5-cache/app-crypt/hashcat-4.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=World's fastest and most advanced password recovery utility
 EAPI=6
 HOMEPAGE=https://github.com/hashcat/hashcat
 IUSE=video_cards_nvidia
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=virtual/opencl video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v4.2.1.tar.gz -> hashcat-4.2.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1012bd76f0cfab9e03e6e144020b5e13
+_md5_=0889a9cf54ce0270ca4ba1d145b13a2e
diff --git a/metadata/md5-cache/app-crypt/hashcat-5.0.0 b/metadata/md5-cache/app-crypt/hashcat-5.0.0
index 4c44fe8fff15..69df059dbb41 100644
--- a/metadata/md5-cache/app-crypt/hashcat-5.0.0
+++ b/metadata/md5-cache/app-crypt/hashcat-5.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=World's fastest and most advanced password recovery utility
 EAPI=6
 HOMEPAGE=https://github.com/hashcat/hashcat
 IUSE=video_cards_nvidia
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=virtual/opencl app-arch/lzma video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v5.0.0.tar.gz -> hashcat-5.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8e32f1616b78a20656abb4ff107ad2e
+_md5_=2a52f40f55bb0ba059bd6d8d6060fda3
diff --git a/metadata/md5-cache/app-crypt/hashcat-5.1.0 b/metadata/md5-cache/app-crypt/hashcat-5.1.0
index 1fe32e9e38f7..d9c019fadc3d 100644
--- a/metadata/md5-cache/app-crypt/hashcat-5.1.0
+++ b/metadata/md5-cache/app-crypt/hashcat-5.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=World's fastest and most advanced password recovery utility
 EAPI=6
 HOMEPAGE=https://github.com/hashcat/hashcat
 IUSE=brain video_cards_nvidia
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=virtual/opencl app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
 SLOT=0
 SRC_URI=https://github.com/hashcat/hashcat/archive/v5.1.0.tar.gz -> hashcat-5.1.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=27929bc3c84d4b26d06af61760f9a09f
+_md5_=27cf35f40da07bd41039902f2f5acb99
diff --git a/metadata/md5-cache/app-crypt/hashcat-9999 b/metadata/md5-cache/app-crypt/hashcat-9999
index 97a2ab1874ea..d0e9debf2f67 100644
--- a/metadata/md5-cache/app-crypt/hashcat-9999
+++ b/metadata/md5-cache/app-crypt/hashcat-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=virtual/opencl app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a4e6dd620705ca3849a5987dbf6becf
+_md5_=27cf35f40da07bd41039902f2f5acb99
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.4-r1 b/metadata/md5-cache/app-misc/pax-utils-1.2.4-r1
deleted file mode 100644
index 15b9e14bc00f..000000000000
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.6:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.2:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-IUSE=caps debug python seccomp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.6:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.2:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.2.4.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.4.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	151046e8d2ffc8cffc8329bbc50a686b	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=142beeae9948cf4b69155c4395135c9e
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
deleted file mode 100644
index 69b311c7000f..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C client library for MariaDB/MySQL
-EAPI=6
-HOMEPAGE=https://mariadb.org/
-IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 hppa ia64 ppc64 s390 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.6/mariadb-connector-c-3.0.6-src.tar.gz?serve -> mariadb-connector-c-3.0.6-src.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85ffc71f45230fa406e45163e1e3f585
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.6 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.6
index 186cf3105f56..66d57ce3d600 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.6
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.6
@@ -5,11 +5,11 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+curl gnutls kerberos libressl +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 hppa ia64 ~ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ia64 ~ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.org/f/connector-c-3.1.6/mariadb-connector-c-3.1.6-src.tar.gz?serve -> mariadb-connector-c-3.1.6-src.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53e37df8962b130f5a9cd5379f8f68f0
+_md5_=1d2445e3e0626f72235ad4836e1bb4f5
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-9999 b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
index 42bc38b7c397..96b599d789ce 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-9999
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20de332825d65c6aae8b4c76f8c10618
+_md5_=48a9bd4599c0d1746737b598189db9b8
diff --git a/metadata/md5-cache/dev-lang/crystal-0.31.1 b/metadata/md5-cache/dev-lang/crystal-0.31.1
deleted file mode 100644
index e332762374b6..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-0.31.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-devel/llvm:8 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=7
-HOMEPAGE=https://crystal-lang.org
-IUSE=doc debug examples blocking-stdio-hack +xml +yaml
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:8 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/0.31.1.tar.gz -> crystal-0.31.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.31.1/crystal-0.31.1-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.31.1/crystal-0.31.1-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm	11596869538b5e2be887810f05390a21	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=372dcc396795417de3fb3ed4bc3b1032
diff --git a/metadata/md5-cache/dev-libs/cloog-0.18.1 b/metadata/md5-cache/dev-libs/cloog-0.18.1
index 802af119067b..5aa9034fa9bb 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.18.1
+++ b/metadata/md5-cache/dev-libs/cloog-0.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=A loop generator for scanning polyhedra
 EAPI=5
 HOMEPAGE=http://www.bastoul.net/cloog/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/isl-0.12.2:0/10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/4
 SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.18.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4215acf11b1503bb86e67347366e0b08
+_md5_=23acf23fb00fc19c68ca6be41d9bbd1e
diff --git a/metadata/md5-cache/dev-libs/ppl-1.1 b/metadata/md5-cache/dev-libs/ppl-1.1
deleted file mode 100644
index 521a4945995e..000000000000
--- a/metadata/md5-cache/dev-libs/ppl-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk ) app-arch/xz-utils sys-devel/m4
-DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex systems
-EAPI=5
-HOMEPAGE=http://bugseng.com/products/ppl
-IUSE=+cxx doc lpsol pch static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk )
-RESTRICT=!test? ( test )
-SLOT=0/4.13
-SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.1/ppl-1.1.tar.xz
-_md5_=1d48fe06dcbba789cf8bdcc8ea375cd0
diff --git a/metadata/md5-cache/dev-python/joblib-0.14.1 b/metadata/md5-cache/dev-python/joblib-0.14.1
new file mode 100644
index 000000000000..429ee52b25bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/joblib-0.14.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/threadpoolctl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( >=dev-lang/python-3.8.2:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/numpy[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/matplotlib[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pillow[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-gallery[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/numpydoc[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pandas[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/lz4[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/distributed[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( >=dev-lang/python-3.7.6:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/numpy[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/matplotlib[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pillow[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-gallery[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/numpydoc[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pandas[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/lz4[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/distributed[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( >=dev-lang/python-3.6.10:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/numpy[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/matplotlib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pillow[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-gallery[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/numpydoc[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pandas[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/lz4[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/distributed[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools to provide lightweight pipelining in Python
+EAPI=7
+HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
+IUSE=test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/joblib/joblib/archive/0.14.1.tar.gz -> joblib-0.14.1.tar.gz
+_eclasses_=distutils-r1	577e2308f7b36e26062d464f59a5ee6c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=41653dddfe1e89e0394f0cb8b62f91e3
diff --git a/metadata/md5-cache/dev-python/scikit-learn-0.22.2_p1 b/metadata/md5-cache/dev-python/scikit-learn-0.22.2_p1
new file mode 100644
index 000000000000..2341a1fac104
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scikit-learn-0.22.2_p1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/joblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Machine learning library for Python
+EAPI=7
+HOMEPAGE=https://scikit-learn.org/stable/ https://github.com/scikit-learn/scikit-learn
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz -> scikit-learn-0.22.2_p1.tar.gz
+_eclasses_=distutils-r1	577e2308f7b36e26062d464f59a5ee6c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ed7103b3cf731774f03032513be4064d
diff --git a/metadata/md5-cache/dev-python/threadpoolctl-2.0.0 b/metadata/md5-cache/dev-python/threadpoolctl-2.0.0
new file mode 100644
index 000000000000..c2eb5a6ae472
--- /dev/null
+++ b/metadata/md5-cache/dev-python/threadpoolctl-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyproject2setuppy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Limit the number of threads used in native libs that have their own threadpool
+EAPI=7
+HOMEPAGE=https://github.com/joblib/threadpoolctl
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.6:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/joblib/threadpoolctl/archive/2.0.0.tar.gz -> threadpoolctl-2.0.0.tar.gz
+_eclasses_=distutils-r1	577e2308f7b36e26062d464f59a5ee6c	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=778e9a9d91e39cba4359959697182a01
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-7.0 b/metadata/md5-cache/dev-util/include-what-you-use-7.0
deleted file mode 100644
index 0770b653c6b5..000000000000
--- a/metadata/md5-cache/dev-util/include-what-you-use-7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:7 sys-devel/clang:7 python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Find unused include directives in C/C++ programs
-EAPI=6
-HOMEPAGE=https://include-what-you-use.org/
-IUSE=+python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/llvm:7 sys-devel/clang:7 python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_7.0.tar.gz -> include-what-you-use-7.0.src.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	11596869538b5e2be887810f05390a21	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	151046e8d2ffc8cffc8329bbc50a686b	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a8cf4049f22c75d49cfa19c86682825
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-8.0 b/metadata/md5-cache/dev-util/include-what-you-use-8.0
deleted file mode 100644
index 9b3a707cbac5..000000000000
--- a/metadata/md5-cache/dev-util/include-what-you-use-8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:8 sys-devel/clang:8 python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Find unused include directives in C/C++ programs
-EAPI=6
-HOMEPAGE=https://include-what-you-use.org/
-IUSE=+python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/llvm:8 sys-devel/clang:8 python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz -> include-what-you-use-8.0.src.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	11596869538b5e2be887810f05390a21	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	151046e8d2ffc8cffc8329bbc50a686b	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42fd3b4b1d2e9f43bbcc7d3b4183b5dd
diff --git a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605 b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
new file mode 100644
index 000000000000..3e20b5443ab2
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cute game where you cultivate slimes on a distant planet
+EAPI=7
+HOMEPAGE=http://www.slimerancher.com/
+KEYWORDS=-* ~amd64
+LICENSE=GOG-EULA
+RDEPEND=sys-libs/glibc virtual/opengl
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=slime_rancher_1_4_1c_34605.sh
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bbba890681391a101eaede1b8ff09645
diff --git a/metadata/md5-cache/media-libs/lv2-1.16.0-r1 b/metadata/md5-cache/media-libs/lv2-1.16.0-r1
index 6cb22a3f8209..890e5333a11e 100644
--- a/metadata/md5-cache/media-libs/lv2-1.16.0-r1
+++ b/metadata/md5-cache/media-libs/lv2-1.16.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=6
 HOMEPAGE=http://lv2plug.in/
 IUSE=doc plugins python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( >=dev-lang/python-3.6.10:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.6:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/rdflib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/rdflib[python_targets_python3_7(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=http://lv2plug.in/spec/lv2-1.16.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	151046e8d2ffc8cffc8329bbc50a686b	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=b97d5c032796493304f26e5dfbbb4c9c
+_md5_=6f58763758ed3f850951b8d8015182ee
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.4 b/metadata/md5-cache/media-libs/sratom-0.6.4
index 8585ae971dfb..61e1e47d09b0 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.4
+++ b/metadata/md5-cache/media-libs/sratom-0.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turt
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sratom/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.16.0 >=dev-libs/serd-0.30.0 >=dev-libs/sord-0.14.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.4.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=a7b98895c61c398fa12ac463d7b22c5b
+_md5_=4c83bbe2071560f97026b345e57f9045
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.8 b/metadata/md5-cache/net-dialup/ppp-2.4.8
index d835df982b11..b264a77f0150 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.8
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=Point-to-Point Protocol (PPP)
 EAPI=7
 HOMEPAGE=https://ppp.samba.org/
 IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
 PDEPEND=net-dialup/ppp-scripts
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( sys-libs/pam ) gtk? ( x11-libs/gtk+:2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) !<net-misc/netifrc-0.7.1
 SLOT=0/2.4.8
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.8.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.8-patches-02.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=03e841dd07c648f8cbd78d3819d4e61d
+_md5_=617e4c410d7fbce5c6e7f4c26c7ba83a
diff --git a/metadata/md5-cache/net-fs/smbnetfs-0.6.1-r1 b/metadata/md5-cache/net-fs/smbnetfs-0.6.1-r1
deleted file mode 100644
index 98449c006725..000000000000
--- a/metadata/md5-cache/net-fs/smbnetfs-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-fs/fuse-2.3:0= >=net-fs/samba-4.2 >=dev-libs/glib-2.30 gnome-keyring? ( app-crypt/libsecret ) virtual/pkgconfig
-DESCRIPTION=FUSE filesystem for SMB shares
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/smbnetfs
-IUSE=gnome-keyring
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-fs/fuse-2.3:0= >=net-fs/samba-4.2 >=dev-libs/glib-2.30 gnome-keyring? ( app-crypt/libsecret )
-SLOT=0
-SRC_URI=mirror://sourceforge/smbnetfs/smbnetfs-0.6.1.tar.bz2
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=b7c9f3cbad0b562963cb77266eb4907b
diff --git a/metadata/md5-cache/net-misc/netifrc-0.7.1 b/metadata/md5-cache/net-misc/netifrc-0.7.1
index e608a070392d..ddffaded87ac 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.7.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.7.1
@@ -3,10 +3,10 @@ DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig v
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.7.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20524ec6e67000a8a11ed347f2f398dc
+_md5_=72e8a33357fbf3434cf2bc9d0bfc19bc
diff --git a/metadata/md5-cache/sys-boot/elilo-3.16-r2 b/metadata/md5-cache/sys-boot/elilo-3.16-r2
deleted file mode 100644
index 6d0180376ecd..000000000000
--- a/metadata/md5-cache/sys-boot/elilo-3.16-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=sys-boot/gnu-efi-3.0g dev-util/patchutils
-DESCRIPTION=Linux boot loader for EFI-based systems such as IA-64
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/elilo/
-KEYWORDS=~amd64 ia64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-boot/efibootmgr sys-fs/dosfstools[compat]
-SLOT=0
-SRC_URI=mirror://sourceforge/elilo/elilo-3.16-all.tar.gz mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de577b799b6f6adb941517f3ac81137c
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.3 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.3
deleted file mode 100644
index 6503418fa754..000000000000
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/pciutils
-DESCRIPTION=Library for build EFI Applications
-EAPI=5
-HOMEPAGE=http://gnu-efi.sourceforge.net/
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=-* amd64 ~arm ~arm64 -ia64 x86
-LICENSE=GPL-2+ BSD BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0fa14471c3f7fef9a6eea3fd3f624135
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.6-r2 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.6-r2
deleted file mode 100644
index 9074caf0c171..000000000000
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/pciutils
-DESCRIPTION=Library for build EFI Applications
-EAPI=6
-HOMEPAGE=http://gnu-efi.sourceforge.net/
-IUSE=abi_x86_32 abi_x86_64 -custom-cflags
-KEYWORDS=-* ~amd64 ~arm ~arm64 ia64 ~x86
-LICENSE=GPL-2+ BSD BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.6.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=088c5080f32dd85048db5a214819daaa
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.9 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.9
deleted file mode 100644
index 89f772df1986..000000000000
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Library for build EFI Applications
-EAPI=7
-HOMEPAGE=http://gnu-efi.sourceforge.net/
-IUSE=abi_x86_32 abi_x86_64 custom-cflags
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ia64 ~x86
-LICENSE=GPL-2+ BSD BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.9.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=614202709bc2114e84985e7714bd221e
diff --git a/metadata/md5-cache/sys-devel/prelink-20130503 b/metadata/md5-cache/sys-devel/prelink-20130503
deleted file mode 100644
index cdc06df4cae4..000000000000
--- a/metadata/md5-cache/sys-devel/prelink-20130503
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] selinux? ( sys-libs/libselinux[static-libs(+)] ) !dev-libs/libelf >=sys-libs/glibc-2.8 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
-EAPI=4
-HOMEPAGE=https://people.redhat.com/jakub/prelink
-IUSE=selinux
-KEYWORDS=amd64 -arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] selinux? ( sys-libs/libselinux[static-libs(+)] ) !dev-libs/libelf >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.18
-SLOT=0
-SRC_URI=mirror://gentoo/prelink-20130503.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e38c5fc3ef705a04eb3b654ea70793a8
diff --git a/metadata/md5-cache/sys-devel/prelink-20130503-r1 b/metadata/md5-cache/sys-devel/prelink-20130503-r1
deleted file mode 100644
index 7abaa2fc9e28..000000000000
--- a/metadata/md5-cache/sys-devel/prelink-20130503-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] selinux? ( sys-libs/libselinux[static-libs(+)] ) !dev-libs/libelf >=sys-libs/glibc-2.8 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
-EAPI=5
-HOMEPAGE=https://people.redhat.com/jakub/prelink
-IUSE=selinux
-KEYWORDS=~amd64 -arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] selinux? ( sys-libs/libselinux[static-libs(+)] ) !dev-libs/libelf >=sys-libs/glibc-2.8 >=sys-devel/binutils-2.18
-SLOT=0
-SRC_URI=mirror://gentoo/prelink-20130503.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=148c95dc483033b176cf5c419ceb3c3b
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
new file mode 100644
index 000000000000..f1088a680ee1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/openssl
+DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
+EAPI=7
+HOMEPAGE=http://opendarwin.org
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=APSL-2
+RDEPEND=dev-libs/openssl
+SLOT=0
+SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
+_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=861321a36318d3f13b70d265c645e659
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.13 b/metadata/md5-cache/sys-kernel/linux-headers-4.13
deleted file mode 100644
index 93a7359f6253..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ee247bd56de48e1390ce977034e46a61
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
deleted file mode 100644
index 2c738552e5e1..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.15.tar.xz mirror://gentoo/gentoo-headers-4.15-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=754bbb7e3f174c37b15ec35b3128facd
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16 b/metadata/md5-cache/sys-kernel/linux-headers-4.16
deleted file mode 100644
index 5556f8546e48..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.16.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6d6aac2dbc30f47a265d8303fde7c1b2
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2 b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
deleted file mode 100644
index 7c0fafa3273a..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.16-r1.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16-r1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7964c19ccb365e1e6f8fe7b4b2a26c28
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.17 b/metadata/md5-cache/sys-kernel/linux-headers-4.17
deleted file mode 100644
index f9ba367ef7de..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.17.tar.xz mirror://gentoo/gentoo-headers-4.17-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2f98fad962d066739d9184559b3abee4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.18 b/metadata/md5-cache/sys-kernel/linux-headers-4.18
deleted file mode 100644
index 5c25dac25237..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.18.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.18.tar.xz mirror://gentoo/gentoo-headers-4.18-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.18-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0461bbd9f668eca1192d84668f74220e
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.20 b/metadata/md5-cache/sys-kernel/linux-headers-4.20
deleted file mode 100644
index a69f3ed206ad..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-4.20.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.20.tar.xz mirror://gentoo/gentoo-headers-4.20-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.20-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0461bbd9f668eca1192d84668f74220e
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.0 b/metadata/md5-cache/sys-kernel/linux-headers-5.0
deleted file mode 100644
index 703154f9fe1c..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-5.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-5.0.tar.xz mirror://gentoo/gentoo-headers-5.0-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.0-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0461bbd9f668eca1192d84668f74220e
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
deleted file mode 100644
index 53d577c9f43e..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-5.0-bug-679630.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-5.0-bug-679630.tar.xz mirror://gentoo/gentoo-headers-5.0-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.0-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ec55c5f123b901dc726b1adecea30857
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.1 b/metadata/md5-cache/sys-kernel/linux-headers-5.1
deleted file mode 100644
index f62b3ec04a5b..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.1.tar.xz mirror://gentoo/gentoo-headers-5.1-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.1-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=186d39ef6b8f024c15278129e755d498
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.2 b/metadata/md5-cache/sys-kernel/linux-headers-5.2
deleted file mode 100644
index 738d1f83eabd..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/gentoo-headers-5.2-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.2-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=186d39ef6b8f024c15278129e755d498
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.3 b/metadata/md5-cache/sys-kernel/linux-headers-5.3
deleted file mode 100644
index 4849798e94b2..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz mirror://gentoo/gentoo-headers-5.3-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.3-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=43073e52c56e53058762822750e7dd2a
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.3-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.3-r1
deleted file mode 100644
index 0aec24611146..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils dev-lang/perl
-DESCRIPTION=Linux system headers
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
-IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz mirror://gentoo/gentoo-headers-5.3-2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.3-2.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cdc23bf224bac9e6eef28d32f0d13942
diff --git a/metadata/md5-cache/virtual/libc-1-r1 b/metadata/md5-cache/virtual/libc-1-r1
new file mode 100644
index 000000000000..38f6ee137a6f
--- /dev/null
+++ b/metadata/md5-cache/virtual/libc-1-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for the C library
+EAPI=7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) !sys-libs/glibc !sys-libs/musl !sys-libs/uclibc-ng !sys-libs/uclibc !sys-freebsd/freebsd-lib )
+SLOT=0
+_md5_=176970e1fc16ed3c9d0381526049b8c1
diff --git a/metadata/md5-cache/virtual/opencl-2 b/metadata/md5-cache/virtual/opencl-2
index b652978beac8..3dc4a4b4ebc3 100644
--- a/metadata/md5-cache/virtual/opencl-2
+++ b/metadata/md5-cache/virtual/opencl-2
@@ -3,7 +3,7 @@ DESCRIPTION=Virtual for OpenCL implementations
 EAPI=6
 IUSE=video_cards_amdgpu video_cards_i965 video_cards_nvidia video_cards_r600 video_cards_radeonsi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
-RDEPEND=app-eselect/eselect-opencl || ( video_cards_i965? ( abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) ) ) video_cards_amdgpu? ( || ( dev-libs/rocm-opencl-runtime dev-libs/amdgpu-pro-opencl ) ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-290.10-r2[uvm(-)] >=media-libs/mesa-9.1.6[opencl,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( >=media-libs/mesa-9.1.6[opencl,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( >=media-libs/mesa-9.1.6[opencl,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_64? ( !abi_x86_32? ( dev-util/intel-ocl-sdk ) ) )
+RDEPEND=app-eselect/eselect-opencl || ( video_cards_i965? ( abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) ) ) video_cards_amdgpu? ( || ( abi_x86_64? ( !abi_x86_32? ( dev-libs/rocm-opencl-runtime ) ) dev-libs/amdgpu-pro-opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-290.10-r2[uvm(-)] >=media-libs/mesa-9.1.6[opencl,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( >=media-libs/mesa-9.1.6[opencl,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( >=media-libs/mesa-9.1.6[opencl,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_64? ( !abi_x86_32? ( dev-util/intel-ocl-sdk ) ) dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ca39e03f2fc751e6d1492c00667d0666
+_md5_=9a2cc9b68f3c0edfc8323950f76ad56a
diff --git a/metadata/md5-cache/virtual/os-headers-0-r2 b/metadata/md5-cache/virtual/os-headers-0-r2
new file mode 100644
index 000000000000..52d413facfcf
--- /dev/null
+++ b/metadata/md5-cache/virtual/os-headers-0-r2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for operating system headers
+EAPI=7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=!prefix-guest? ( || ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) ) ) prefix-guest? ( !sys-kernel/linux-headers )
+SLOT=0
+_md5_=e721f7fdcef63420c21a528a72af93ed
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 47ce786b188e..53ec7b1dc266 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -2197,7 +2197,7 @@ app-misc/oneko 1.2-r2 1.2_p5 1.2_p6_p14: A cat, dog and others which chase the m
 app-misc/openastro 1.1.56: A fully-featured Open Source Astrology Program
 app-misc/openastro-data 1.8: OpenAstro data files, ephemeris, famous people database, geo database
 app-misc/pal 0.4.3-r2: Command-line calendar program
-app-misc/pax-utils 1.2.4-r1 1.2.5: ELF utils that can check files for security relevant properties
+app-misc/pax-utils 1.2.5: ELF utils that can check files for security relevant properties
 app-misc/pdfpc 4.3.0 4.3.2: Presenter console with multi-monitor support for PDF files
 app-misc/perltrash 0.3-r1: Command-line trash can emulation
 app-misc/pet 0.3.6: Simple command-line snippet manager
@@ -3243,7 +3243,7 @@ dev-db/lmdb 0.9.23 0.9.24: An ultra-fast, ultra-compact key-value embedded data
 dev-db/lmdb++ 0.9.14.0: C++11 wrapper for the LMDB database library
 dev-db/m17n-db 1.7.0 1.8.0: Database for the m17n library
 dev-db/mariadb 5.5.66 5.5.67 10.1.38-r1 10.1.43 10.1.44 10.2.22-r1 10.2.29 10.2.31 10.3.20 10.3.22 10.4.10 10.4.12: An enhanced, drop-in replacement for MySQL
-dev-db/mariadb-connector-c 3.0.6-r1 3.1.6 3.1.7 9999: C client library for MariaDB/MySQL
+dev-db/mariadb-connector-c 3.1.6 3.1.7 9999: C client library for MariaDB/MySQL
 dev-db/mariadb-connector-odbc 3.1.6: MariaDB Connector/ODBC
 dev-db/metakit 2.4.9.7-r2: Embedded database library
 dev-db/mongodb 3.6.13 3.6.14 3.6.16 3.6.17 4.0.12 4.0.13 4.0.14 4.0.16 4.0.16-r1 4.2.1 4.2.2 4.2.3 4.2.3-r1: A high-performance, open source, schema-free document-oriented database
@@ -4714,7 +4714,7 @@ dev-lang/cll1h 0.6-r1: C<<1 programming language system
 dev-lang/clojure 1.8.0 1.9.0-r1 1.10.0: General-purpose programming language with an emphasis on functional programming
 dev-lang/closure-compiler-bin 20170218: JavaScript optimizing compiler
 dev-lang/coffee-script 1.9.3-r1 1.12.5 2.3.2: A little language that compiles into javascript
-dev-lang/crystal 0.31.1 0.32.1 0.33.0: The Crystal Programming Language
+dev-lang/crystal 0.32.1 0.33.0: The Crystal Programming Language
 dev-lang/duktape 2.2.1 2.4.0: Embeddable Javascript engine
 dev-lang/elixir 1.9.4 1.10.1 1.10.2: Elixir programming language
 dev-lang/epic 0.9.3.3-r1: Compiler for a simple functional language
@@ -5217,7 +5217,7 @@ dev-libs/pigpio 72 73 74: A library for the Raspberry which allows control of th
 dev-libs/pkcs11-helper 1.25.1: PKCS#11 helper library
 dev-libs/poco 1.9.0-r2: C++ libraries for building network-based applications
 dev-libs/popt 1.16-r2: Parse Options - Command line parser
-dev-libs/ppl 1.1 1.2 1.2-r1: The Parma Polyhedra Library for numerical analysis of complex systems
+dev-libs/ppl 1.2 1.2-r1: The Parma Polyhedra Library for numerical analysis of complex systems
 dev-libs/processor-trace 1.6.1 1.6.2 2.0: Intel(R) Processor Trace decoder library
 dev-libs/protobuf 3.10.1 3.11.2 3.11.4 9999: Google's Protocol Buffers - Extensible mechanism for serializing structured data
 dev-libs/protobuf-c 1.3.2: Protocol Buffers implementation in C
@@ -7968,7 +7968,7 @@ dev-python/jinja2-time 0.2.0: Jinja2 Extension for Dates and Times
 dev-python/jinja2_pluralize 0.3.0: Jinja2 pluralize filters
 dev-python/jira 1.0.14-r3: Python library for interacting with the JIRA REST API
 dev-python/jmespath 0.9.3-r1: JSON Matching Expressions
-dev-python/joblib 0.12.2: Tools to provide lightweight pipelining in Python
+dev-python/joblib 0.12.2 0.14.1: Tools to provide lightweight pipelining in Python
 dev-python/jog 0.1.1: JSON Structured Logging for Python
 dev-python/josepy 1.3.0: JOSE protocol implementation in Python
 dev-python/jplephem 2.6: Python version of NASA DE4xx ephemerides for Astronomical Alamanac
@@ -8763,6 +8763,7 @@ dev-python/scandir 1.10.0-r1: A better directory iterator and faster os.walk()
 dev-python/schedule 0.6.0 9999: Python job scheduling for humans
 dev-python/schema 0.6.6: Library for validating Python data structures
 dev-python/scikit-build 0.10.0: Improved build system generator for Python C/C++/Fortran/Cython extensions
+dev-python/scikit-learn 0.22.2_p1: Machine learning library for Python
 dev-python/scoop 0.7.0-r1: Distributed Evolutionary Algorithms in Python
 dev-python/scp 0.10.2: scp module for paramiko
 dev-python/scripttest 1.3.0: A very small text templating language
@@ -8917,6 +8918,7 @@ dev-python/textfsm 0.4.0: Python module for parsing semi-structured text into py
 dev-python/texttable 1.6.2: Module for creating simple ASCII tables
 dev-python/textx 1.4: Meta-language for DSL implementation inspired by Xtext
 dev-python/theano 1.0.4: Define and optimize multi-dimensional arrays mathematical expressions
+dev-python/threadpoolctl 2.0.0: Limit the number of threads used in native libs that have their own threadpool
 dev-python/thrift 0.11.0: Python implementation of Thrift
 dev-python/thriftpy 0.3.9: Pure python implementation of Apache Thrift
 dev-python/thunarx-python 0.5.1-r1: Python bindings for the Thunar file manager
@@ -10539,7 +10541,7 @@ dev-util/icmake 9.02.09 9.03.01: Hybrid between a make utility and a shell scrip
 dev-util/idea-community 2019.3.3.193.6494.35 2019.3.4.193.6911.18: A complete toolset for web, mobile and enterprise development
 dev-util/ignition-cmake 0.2.0 0.4.0: CMake modules to be used by the Ignition projects.
 dev-util/imediff2 1.1.2-r5: An interactive, user friendly 2-way merge tool in text mode
-dev-util/include-what-you-use 7.0 8.0 9.0: Find unused include directives in C/C++ programs
+dev-util/include-what-you-use 9.0: Find unused include directives in C/C++ programs
 dev-util/indent 2.2.11-r1 2.2.11_p5 2.2.12: Indent program source files
 dev-util/intel-graphics-compiler 1.0.3151 1.0.3445: LLVM-based OpenCL compiler targetting Intel Gen graphics hardware
 dev-util/intel-ocl-sdk 2.0.31360 4.4.0.117-r1: Intel's implementation of the OpenCL standard
@@ -11478,6 +11480,7 @@ games-simulation/searchandrescue 1.7.0: Helicopter based air rescue flight simul
 games-simulation/senken 0.3.0-r1: city simulation game
 games-simulation/simutrans 0.120.2.2: A free Transport Tycoon clone
 games-simulation/singularity 1.0_alpha1-r1: Simulation of a true AI. Go from computer to computer, chased by the whole world
+games-simulation/slime-rancher 1.4.1c_p34605: Cute game where you cultivate slimes on a distant planet
 games-simulation/train-valley 1.3.31403: Build railroads in order to connect cities, tunnels, and bridges
 games-sports/billardgl 1.75-r2: an OpenGL billards game
 games-sports/bygfoot 2.3.2-r1: GTK+2 Soccer Management Game
@@ -14427,7 +14430,7 @@ net-fs/s3backer 1.4.5: FUSE-based single file backing store via Amazon S3
 net-fs/s3fs 1.80 1.83 1.85 1.86: Amazon S3 mounting via fuse
 net-fs/s3ql 2.24 2.25 2.26 2.28 2.32 2.33: A full-featured file system for online data storage
 net-fs/samba 4.11.6-r2 4.11.7 4.12.0: Samba Suite Version 4
-net-fs/smbnetfs 0.6.1-r1 0.6.2: FUSE filesystem for SMB shares
+net-fs/smbnetfs 0.6.2: FUSE filesystem for SMB shares
 net-fs/smbtad 1.2.6: Data receiver of the SMB Traffic Analyzer project
 net-fs/sshfs 2.10-r1 3.6.0 3.7.0: Fuse-filesystem utilizing the sftp service
 net-fs/wdfs 1.4.2-r1: WebDAV filesystem with special features for accessing subversion repositories
@@ -17090,8 +17093,8 @@ sys-boot/cromwell 2.40-r3: Xbox boot loader
 sys-boot/cromwell-bin 2.40-r1: Xbox boot loader precompiled binaries from xbox-linux.org
 sys-boot/dvhtool 1.0.1-r2: Tool to copy kernel(s) into the volume header on SGI MIPS-based workstations
 sys-boot/efibootmgr 14 15 16: User-space application to modify the EFI boot manager
-sys-boot/elilo 3.16-r2 3.16-r3: Linux boot loader for EFI-based systems such as IA-64
-sys-boot/gnu-efi 3.0.3 3.0.6-r2 3.0.9 3.0.11: Library for build EFI Applications
+sys-boot/elilo 3.16-r3: Linux boot loader for EFI-based systems such as IA-64
+sys-boot/gnu-efi 3.0.11: Library for build EFI Applications
 sys-boot/grub 2.04-r1 2.05_alpha20200310 9999: GNU GRUB boot loader
 sys-boot/lilo 24.0-r1 24.1 24.2: Standard Linux boot loader
 sys-boot/makebootfat 1.4: Command line utility able to create bootable USB disks
@@ -17245,7 +17248,7 @@ sys-devel/native-cctools 4: Host OS native assembler as and static linker ld
 sys-devel/parity 2.0.1 9999: A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)
 sys-devel/patch 2.7.6-r4: Utility to apply diffs to files
 sys-devel/pmake 1.111.3.3: BSD build tool to create programs in parallel. Debian's version of NetBSD's make
-sys-devel/prelink 20130503 20130503-r1 20151030 99999999: Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
+sys-devel/prelink 20151030 99999999: Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
 sys-devel/qconf 2.3 2.4 2.5: ./configure like generator for qmake-based projects
 sys-devel/remake 4.2.1.1.4-r1: patched version of GNU make with improved error reporting, tracing and debugging
 sys-devel/slibtool 0.5.28: A skinny libtool implementation, written in C
@@ -17332,7 +17335,7 @@ sys-fs/davl 1.2.4-r2: Visualizes the fragmentation status of ext2/3 filesystems
 sys-fs/dd-rescue 1.46 1.99.8: Similar to dd but can copy from source with errors
 sys-fs/ddrescue 1.24 1.25: Copy data from one file or block device to another with read-error recovery
 sys-fs/dfc 3.1.1: A simple CLI tool that display file system usage, with colors
-sys-fs/diskdev_cmds 332.14_p1-r1: HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
+sys-fs/diskdev_cmds 332.14_p1-r1 332.14_p1-r2: HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
 sys-fs/dislocker 0.7.1-r2 9999: Dislocker is used to read BitLocker encrypted partitions.
 sys-fs/dmg2img 1.6.7 1.6.7-r1: Converts Apple DMG files to standard HFS+ images
 sys-fs/dmraid 1.0.0_rc16-r3 1.0.0_rc16-r4: Device-mapper RAID tool and library
@@ -17454,7 +17457,7 @@ sys-kernel/kergen 0.1.4: Kernel config generator
 sys-kernel/kpatch 0.6.3 0.7.1 9999: Dynamic kernel patching for Linux
 sys-kernel/linux-docs 4.19.99 5.4.15: Developer documentation generated from the Linux kernel
 sys-kernel/linux-firmware 20190815 20190923 20191022 20191215 20200122 20200316 99999999: Linux firmware files
-sys-kernel/linux-headers 3.18 4.4 4.9 4.13 4.14-r1 4.15-r1 4.16 4.16-r2 4.17 4.18 4.19 4.20 5.0 5.0-r1 5.1 5.2 5.3 5.3-r1 5.4 5.5 5.6: Linux system headers
+sys-kernel/linux-headers 3.18 4.4 4.9 4.14-r1 4.19 5.4 5.5 5.6: Linux system headers
 sys-kernel/mips-sources 4.4.196 4.9.196 4.14.149 4.18.20 4.19.79 4.20.17: Kernel.org sources for MIPS-based machines
 sys-kernel/pf-sources 5.3_p8 5.4_p6 5.5_p1 5.5_p2 5.5_p3 5.5_p4 5.5_p5 5.5_p6 5.5_p7 5.5_p8 5.6_p1: Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
 sys-kernel/raspberrypi-image 4.14.98_p20190215 4.19.57_p20190709 4.19.75_p20190925 9999: Raspberry Pi (all versions) kernel and modules
@@ -17680,7 +17683,7 @@ virtual/leechcraft-storage-device-manager 9999: Virtual for LeechCraft plugins f
 virtual/leechcraft-task-show 9999: Virtual for plugins that can show IDownloads and IJobHolders
 virtual/leechcraft-trayarea 9999: Virtual for LeechCraft plugins providing a tray area
 virtual/leechcraft-wysiwyg-editor 9999: Virtual for LeechCraft plugins providing WYSIWYG text editor
-virtual/libc 1: Virtual for the C library
+virtual/libc 1 1-r1: Virtual for the C library
 virtual/libcrypt 1 2: Virtual for libcrypt.so
 virtual/libelf 2 3: Virtual for libelf.so.1 provider dev-libs/elfutils
 virtual/libffi 3.3_rc0: A virtual for the Foreign Function Interface implementation
@@ -17704,7 +17707,7 @@ virtual/notification-daemon 0: Virtual for notification daemon dbus service
 virtual/ooo 0: Virtual for OpenOffice.org/LibreOffice
 virtual/opencl 2: Virtual for OpenCL implementations
 virtual/opengl 7.0-r2: Virtual for OpenGL implementation
-virtual/os-headers 0 0-r1: Virtual for operating system headers
+virtual/os-headers 0 0-r1 0-r2: Virtual for operating system headers
 virtual/package-manager 1: Virtual for the package manager
 virtual/pager 0: Virtual for command-line pagers
 virtual/perl-Archive-Tar 2.320.0: Virtual for Archive-Tar
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f05899d17a62..21f51483d13b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 01 Apr 2020 21:08:54 +0000
+Wed, 01 Apr 2020 21:37:36 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 44261259b0dd..56f02fddf92a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1371,7 +1371,6 @@ dev-db/mariadb:systemtap - Build support for profiling and tracing using dev-uti
 dev-db/mariadb:test - Install upstream testsuites for end use.
 dev-db/mariadb:tokudb - Add support for TokuDB storage engine
 dev-db/mariadb:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
-dev-db/mariadb-connector-c:mysqlcompat - Enable mysqlclient library symbolic links
 dev-db/mongodb:lto - Adds support for link time optimization
 dev-db/mongodb:mms-agent - Install the MongoDB Monitoring Service agent
 dev-db/mongodb:tools - Install the MongoDB tools (mongoimport, mongodump...) from app-admin/mongo-tools