2021-03-26 15:20:42 UTC

23 files changed, 31 insertions, 194 deletions

diff --git a/metadata/md5-cache/app-admin/salt-3000.8 b/metadata/md5-cache/app-admin/salt-3000.8
index 2c46bdc77f44..91c3a1434b30 100644
--- a/metadata/md5-cache/app-admin/salt-3000.8
+++ b/metadata/md5-cache/app-admin/salt-3000.8
@@ -3,13 +3,14 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
+INHERIT=systemd distutils-r1
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libnacl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/msgpack-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/msgpack-1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mako? ( dev-python/mako[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ldap? ( dev-python/python-ldap[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) libvirt? ( python_targets_python3_7? ( dev-python/libvirt-python[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ioflo-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/raet-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) cheetah? ( dev-python/cheetah3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mongodb? ( dev-python/pymongo[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) portage? ( sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) keyring? ( dev-python/keyring[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) redis? ( dev-python/redis-py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_7? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) neutron? ( python_targets_python3_7? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) profile? ( dev-python/yappi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) x86? ( test ) test
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3000.8.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b0a88349e57ed990b5d63b7a0a60626a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
+_md5_=ce569a0509a0dd5c3c2a6138e6f70868
diff --git a/metadata/md5-cache/dev-games/ois-1.5 b/metadata/md5-cache/dev-games/ois-1.5
index 033c32c0490b..e90b1b2367df 100644
--- a/metadata/md5-cache/dev-games/ois-1.5
+++ b/metadata/md5-cache/dev-games/ois-1.5
@@ -4,9 +4,10 @@ DEPEND=x11-libs/libXaw x11-libs/libX11
 DESCRIPTION=Object-oriented Input System - A cross-platform C++ input handling library
 EAPI=7
 HOMEPAGE=https://github.com/wgois/OIS
-KEYWORDS=~amd64 ~arm ~x86
+INHERIT=cmake
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/wgois/OIS/archive/v1.5.tar.gz -> ois-1.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ac1432ef5c4980be6a5d15182859124
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501
+_md5_=b9469bb5da6349ccdf6cba7d36540bce
diff --git a/metadata/md5-cache/dev-libs/libksba-1.5.0 b/metadata/md5-cache/dev-libs/libksba-1.5.0
index 03a408db89bc..46e6a865bf85 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.5.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.5.0
@@ -5,9 +5,9 @@ DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/libksba
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.5.0.tar.bz2
-_md5_=9f04c7d0e3b5dd9162f756a064a8d1b1
+_md5_=ffb887e1bff7d6e70ab1f59fad85b3b4
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.3 b/metadata/md5-cache/dev-python/pymongo-3.11.3
index d79197cf8473..49d9849253c7 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.3
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.3
@@ -3,13 +3,14 @@ DEFINED_PHASES=compile configure install prepare pretend setup test
 DESCRIPTION=Python driver for MongoDB
 EAPI=7
 HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/
+INHERIT=check-reqs distutils-r1
 IUSE=doc kerberos test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm64 ~hppa x86
 LICENSE=Apache-2.0
 RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/3.11.3.tar.gz -> mongo-python-driver-3.11.3.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=504b76b0b04cd1bb8f61a6a2d7017d38
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
+_md5_=dd2b46bc028e304b79e9ba3d8e9d8836
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.3 b/metadata/md5-cache/media-libs/glfw-3.3.3
index e3335f04d120..7cbfd4ec4ea3 100644
--- a/metadata/md5-cache/media-libs/glfw-3.3.3
+++ b/metadata/md5-cache/media-libs/glfw-3.3.3
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs
 DESCRIPTION=The Portable OpenGL FrameWork
 EAPI=7
 HOMEPAGE=https://www.glfw.org/
+INHERIT=cmake
 IUSE=wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=ZLIB
 RDEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] )
 SLOT=0
 SRC_URI=https://github.com/glfw/glfw/archive/3.3.3.tar.gz -> glfw-3.3.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ca7401d959c167eb198eba2c0eaea68
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501
+_md5_=65be5263d81d1d266b809502f7226131
diff --git a/metadata/md5-cache/media-libs/lasi-1.1.3 b/metadata/md5-cache/media-libs/lasi-1.1.3
index c3c09f932208..54bb06c0d3b8 100644
--- a/metadata/md5-cache/media-libs/lasi-1.1.3
+++ b/metadata/md5-cache/media-libs/lasi-1.1.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.unifont.org/lasi
 INHERIT=cmake
 IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/freetype:2 x11-libs/pango
 SLOT=0/2
 SRC_URI=mirror://sourceforge/lasi/libLASi-1.1.3.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501
-_md5_=8b617198c06f184b4b750f67429ebece
+_md5_=5333ca0cd8d9361432a61fe3952bb4a1
diff --git a/metadata/md5-cache/sci-misc/h5utils-1.13.1 b/metadata/md5-cache/sci-misc/h5utils-1.13.1
index edede37ac959..c5d26b2ad154 100644
--- a/metadata/md5-cache/sci-misc/h5utils-1.13.1
+++ b/metadata/md5-cache/sci-misc/h5utils-1.13.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/NanoComp/h5utils
 INHERIT=autotools
 IUSE=hdf octave
-KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= sci-libs/hdf5:0= sys-libs/zlib hdf? ( sci-libs/hdf:0= virtual/jpeg:0 )
 SLOT=0
 SRC_URI=https://github.com/NanoComp/h5utils/archive/1.13.1.tar.gz -> h5utils-1.13.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
-_md5_=4d722aded774b82b92bc7f815d41412b
+_md5_=13cc73260d57d648f247e9788a0833c1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.223 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.223
deleted file mode 100644
index 970b04bac5d0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.223
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.223
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-233.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-233.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-233.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-233.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-233.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-233.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-233.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-233.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-233.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0440f9b06bc1dd419a26eef5a72f3c97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.224 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.224
deleted file mode 100644
index eceed9aef91f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.224
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.224
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-234.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-234.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-234.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-234.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-234.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-234.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-234.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-234.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-234.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=69d9c0ae642ad58e55af09a294f0cf35
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.178 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.178
deleted file mode 100644
index 534c0dfb407a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.178
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.178
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-177.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-177.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-177.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-177.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-177.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-177.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-177.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-177.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-177.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=74de12fa6fa881885b7a6fa443df259a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.179 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.179
deleted file mode 100644
index c9cfad17145e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.179
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.179
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-178.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-178.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-178.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-178.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-178.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-178.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-178.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-178.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-178.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ab2548d1bb86e844450b000e7b3451c5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.180 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.180
deleted file mode 100644
index 69060c8200de..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.180
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.180
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-179.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-179.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-179.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-179.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-179.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-179.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-179.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-179.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-179.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3c7195dbac06eae79ea903bc9d8f90b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.259 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.259
deleted file mode 100644
index feecef191587..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.259
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.259
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-261.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-261.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-261.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-261.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-261.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-261.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-261.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-261.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-261.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=96b7e9a233c94b5849e057ac4acb4235
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.260 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.260
deleted file mode 100644
index 1b20a302f579..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.260
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.260
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-262.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-262.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-262.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-262.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-262.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-262.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-262.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-262.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-262.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9e958634fa3d0368b826e0e645296548
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.259 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.259
deleted file mode 100644
index d4a34982a73e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.259
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.259
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-263.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-263.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-263.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-263.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-263.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-263.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-263.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-263.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-263.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bd3496f307d683dd3a15dd51cb24ba7d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.260 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.260
deleted file mode 100644
index cf2df3c17f9d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.260
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.260
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-264.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-264.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-264.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-264.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-264.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-264.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-264.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-264.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-264.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5ccdd0c586afc7b3d521b68b5f186b2b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r7 b/metadata/md5-cache/sys-libs/glibc-2.32-r7
index 9302a762f352..6a8ec69c579c 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r7
@@ -4,13 +4,14 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
+INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
-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=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-6.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=520bae5ab1df01df9cdfda7926c29a02
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	systemd	74b223e42834adf09a2d21fe5fe13741	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
+_md5_=26ff5e75009b46a6e0cdffeec1f5c3ea
diff --git a/metadata/md5-cache/sys-libs/libstatgrab-0.92 b/metadata/md5-cache/sys-libs/libstatgrab-0.92
index 55207fd0549d..3202f0e9910d 100644
--- a/metadata/md5-cache/sys-libs/libstatgrab-0.92
+++ b/metadata/md5-cache/sys-libs/libstatgrab-0.92
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.i-scream.org/libstatgrab/
 INHERIT=autotools
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~x86
 LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-0.92.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
-_md5_=db2d884ec92c513ac1ea196592135d5b
+_md5_=342a17a87d32dee1a257b0fe113214d8
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.107 b/metadata/md5-cache/www-servers/tomcat-7.0.107
deleted file mode 100644
index 0415ae3bb8a2..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-7.0.107
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.107:3.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.107:3.0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=7
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.107/src/apache-tomcat-7.0.107-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=874665d53979e4fb82c2c3d14b623054
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.61 b/metadata/md5-cache/www-servers/tomcat-8.5.61
deleted file mode 100644
index d8375f7013a6..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.61
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.61:3.1 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.61:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fd97eba162ab424e2838ec625737ad5c
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.41 b/metadata/md5-cache/www-servers/tomcat-9.0.41
deleted file mode 100644
index 256527c21409..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.41
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.41:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.41:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c5070ea82e326a3ad3159f5ae2ec660
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 0ff22a9ccff3..cfd2d432e97d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -17700,7 +17700,7 @@ sys-kernel/dracut-crypt-ssh 1.0.7: Early unlocking of encrypted systems via ssh
 sys-kernel/genkernel 3.5.3.3 4.0.10 4.1.2-r3 4.2.0 9999: Gentoo automatic kernel building scripts
 sys-kernel/gentoo-kernel 5.4.94 5.4.97 5.4.99 5.4.100 5.4.101 5.4.102 5.4.103 5.4.104 5.4.105 5.4.106 5.4.108 5.10.17 5.10.18 5.10.19 5.10.20 5.10.21 5.10.22 5.10.23 5.10.24 5.10.26 5.11.2 5.11.3 5.11.4 5.11.5 5.11.6 5.11.7 5.11.9 5.11.10: Linux kernel built with Gentoo patches
 sys-kernel/gentoo-kernel-bin 5.4.94 5.4.94-r1 5.4.97 5.4.97-r1 5.4.99 5.4.99-r1 5.4.100 5.4.100-r1 5.4.101 5.4.101-r1 5.4.101-r2 5.4.102-r2 5.4.102-r3 5.4.103 5.4.103-r1 5.4.104 5.4.104-r1 5.4.105 5.4.105-r2 5.4.106 5.4.106-r1 5.4.108 5.10.17 5.10.17-r1 5.10.18 5.10.18-r1 5.10.19 5.10.19-r1 5.10.19-r2 5.10.20-r2 5.10.20-r3 5.10.21 5.10.21-r1 5.10.22 5.10.22-r1 5.10.23 5.10.23-r2 5.10.24 5.10.24-r1 5.10.26 5.11.2 5.11.2-r1 5.11.2-r2 5.11.3-r2 5.11.3-r3 5.11.4 5.11.4-r1 5.11.5 5.11.5-r1 5.11.6 5.11.7 5.11.9 5.11.10: Pre-built Linux kernel with genpatches
-sys-kernel/gentoo-sources 4.4.246 4.4.257 4.4.259 4.4.260 4.4.261 4.4.262 4.4.263 4.9.246 4.9.257 4.9.259 4.9.260 4.9.261 4.9.262 4.9.263 4.14.209 4.14.221 4.14.223 4.14.224 4.14.225 4.14.226 4.14.227 4.19.160 4.19.175 4.19.178 4.19.179 4.19.180 4.19.181 4.19.182 4.19.183 5.4.80-r1 5.4.97 5.4.105 5.4.106 5.4.107 5.4.108 5.10.24 5.10.25 5.10.26 5.11.6 5.11.7 5.11.8-r1 5.11.9 5.11.10: Full sources including the Gentoo patchset for the 5.11 kernel tree
+sys-kernel/gentoo-sources 4.4.246 4.4.257 4.4.261 4.4.262 4.4.263 4.9.246 4.9.257 4.9.261 4.9.262 4.9.263 4.14.209 4.14.221 4.14.225 4.14.226 4.14.227 4.19.160 4.19.175 4.19.181 4.19.182 4.19.183 5.4.80-r1 5.4.97 5.4.105 5.4.106 5.4.107 5.4.108 5.10.24 5.10.25 5.10.26 5.11.6 5.11.7 5.11.8-r1 5.11.9 5.11.10: Full sources including the Gentoo patchset for the 5.11 kernel tree
 sys-kernel/git-sources 5.12_rc2 5.12_rc3 5.12_rc4: The very latest -git version of the Linux kernel
 sys-kernel/installkernel-gentoo 1 2 3: Gentoo fork of installkernel script from debianutils
 sys-kernel/installkernel-systemd-boot 0: Wrap kernel-install from systemd-boot as installkernel
@@ -18240,7 +18240,7 @@ www-servers/servefile 0.5.1: Serve a single file via HTTP
 www-servers/sniproxy 0.6.0-r1: Proxies incoming HTTP and TLS connections based on the hostname
 www-servers/spawn-fcgi 1.6.4-r1: A FCGI spawner for lighttpd and cherokee and other webservers
 www-servers/thttpd 2.27.1 9999: Fork of thttpd, a small, fast, multiplexing webserver
-www-servers/tomcat 7.0.107 7.0.108 8.5.61 8.5.63 8.5.64 9.0.41 9.0.43 9.0.44 10.0.2 10.0.4: Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
+www-servers/tomcat 7.0.108 8.5.63 8.5.64 9.0.43 9.0.44 10.0.2 10.0.4: Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
 www-servers/tornado 6.0.4 6.1: Python web framework and asynchronous networking library
 www-servers/uwsgi 2.0.19.1-r100 2.0.19.1-r101: uWSGI server for Python web applications
 www-servers/varnish 6.0.6 6.3.2 6.4.0 6.5.0 6.5.1: Varnish is a state-of-the-art, high-performance HTTP accelerator
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 74f98c857ebd..a6cc8e6a272f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Mar 2021 15:05:43 +0000
+Fri, 26 Mar 2021 15:20:42 +0000