diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8037a3bd9184..51f008b547ab 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 6768ffa666a2..fbd7c9d97272 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/accerciser/accerciser-3.38.0.ebuild b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
index bdad92ae536b..75c56eacf543 100644
--- a/app-accessibility/accerciser/accerciser-3.38.0.ebuild
+++ b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
 
 LICENSE="BSD CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2e30b883f7c4..1cabdc15f101 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index f997980ac9c1..d8998137c569 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.27.1.tar.gz 5344908 BLAKE2B 2672cd1e0e4ac59585c0ab376d130fc650db4a9ce8ac3ad7e28b3f22ebdabd4b6d61a477a2b1b8f4da098ef6ed296f6c9a8dae6cc734843c1d4dccb6cd2fbcc2 SHA512 e6d74968ad5677bef4b6c5b698281d1b27949214e3c1f87cbce15e622cfc800b4b0e958c6ea75f9a7eb1f8f3211f0e13bc6819dcc5e95cf996936b956c276619
+DIST exo-1.27.2.tar.gz 5347725 BLAKE2B a66c311ae9cbe30f6998151fa8fe3006dd332c60fff80a28b388e92d0a8db2a44bc7ad053dbc500b8f19636e06feaac4d42811bf221d88ed6a7d7855af5aba17 SHA512 690b7e19309a03901f56a9987696ea66952a0febf6c7b1dc99e8e0f323ab2985a49aa87ea2e2469d039d583d8232d56ebb4aa203d3f8193453f479e9d68911ce
diff --git a/app-admin/exo/exo-1.27.1.ebuild b/app-admin/exo/exo-1.27.2.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.27.1.ebuild
rename to app-admin/exo/exo-1.27.2.ebuild
diff --git a/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch b/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch
new file mode 100644
index 000000000000..7723a44af677
--- /dev/null
+++ b/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch
@@ -0,0 +1,81 @@
+https://bugs.gentoo.org/754987
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -123,31 +123,31 @@
+ 	$(NULL)
+ 
+ $(hostnamed_built_sources) : data/org.freedesktop.hostname1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdHostnamed \
+ 	--generate-c-code hostname1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.hostname1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(localed_built_sources) : data/org.freedesktop.locale1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdLocaled \
+ 	--generate-c-code locale1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.locale1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(timedated_built_sources) : data/org.freedesktop.timedate1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdTimedated \
+ 	--generate-c-code timedate1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.timedate1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ BUILT_SOURCES = \
+ 	$(hostnamed_built_sources) \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1315,31 +1315,31 @@
+ 	$(do_subst) < $(srcdir)/$< > $(srcdir)/$@
+ 
+ $(hostnamed_built_sources) : data/org.freedesktop.hostname1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdHostnamed \
+ 	--generate-c-code hostname1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.hostname1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(localed_built_sources) : data/org.freedesktop.locale1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdLocaled \
+ 	--generate-c-code locale1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.locale1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ $(timedated_built_sources) : data/org.freedesktop.timedate1.xml
+-	$(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \
++	$(AM_V_GEN)( cd "$(srcdir)/src" && \
+ 	$(GDBUS_CODEGEN) \
+ 	--interface-prefix org.freedesktop. \
+ 	--c-namespace OpenrcSettingsdTimedated \
+ 	--generate-c-code timedate1-generated \
+ 	$(abs_srcdir)/data/org.freedesktop.timedate1.xml; \
+-	popd > /dev/null )
++	)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
index e4a68aca3d92..a2c33fcca1a0 100644
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
@@ -12,22 +12,27 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="systemd"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.30:2
 	dev-libs/libdaemon:0=
 	sys-apps/dbus
 	sys-apps/openrc:=
 	sys-auth/polkit
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	systemd? ( >=sys-apps/systemd-197 )
 	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-util/gdbus-codegen
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-remove-bashisms.patch
+)
+
 src_prepare() {
 	default
 	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 48f197168fe4..884fe5a116bf 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lrzip/lrzip-0.641.ebuild b/app-arch/lrzip/lrzip-0.641.ebuild
index 691bf43500dc..a89029b177fa 100644
--- a/app-arch/lrzip/lrzip-0.641.ebuild
+++ b/app-arch/lrzip/lrzip-0.641.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
index b9782eebc304..934435006f16 100644
--- a/app-arch/zstd/metadata.xml
+++ b/app-arch/zstd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">facebook/zstd</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facebook/zstd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 4f9fcc01e248..1075735142cd 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/duply/duply-2.3.1.ebuild b/app-backup/duply/duply-2.3.1.ebuild
index b6505eb38052..68e3ae211d57 100644
--- a/app-backup/duply/duply-2.3.1.ebuild
+++ b/app-backup/duply/duply-2.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-text/txt2man"
 RDEPEND="app-backup/duplicity"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 220b1ad68fb4..a7b0b406200f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gcr/files/3.36.0-avoid-gnupg-circular-dep.patch b/app-crypt/gcr/files/3.36.0-avoid-gnupg-circular-dep.patch
deleted file mode 100644
index 313b65628e46..000000000000
--- a/app-crypt/gcr/files/3.36.0-avoid-gnupg-circular-dep.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d3fd10fa3d3fe3e2e60a9ca5cfb401faa5e9c5bd Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Wed, 11 Mar 2020 11:49:08 +0100
-Subject: [PATCH 4/6] meson: allow building without gpg(2) installed
-
-This avoids circular dependencies, such as gcr -> gpg2 -> pinentry -> gcr
----
- meson.build       | 7 +++++--
- meson_options.txt | 5 +++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f19af0f..57b625b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version)
- gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version)
- gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version)
- glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ]
--gpg_bin = find_program('gpg2', 'gpg')
-+gpg_path = get_option('gpg_path')
-+if gpg_path == ''
-+  gpg_path = find_program('gpg2', 'gpg').path()
-+endif
- libgcrypt_dep = dependency('libgcrypt', version: '>= 1')
- p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0')
- p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules')
-@@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true)
- conf.set('HAVE_LOCALE_H', cc.has_header('locale.h'))
- conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
- conf.set('HAVE_MLOCK', cc.has_function('mlock'))
--conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path())
-+conf.set_quoted('GPG_EXECUTABLE', gpg_path)
- conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
- config_file = configure_file(
-   output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index bbdc8e3..ae0f524 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,8 @@ option('gtk_doc',
-   value: true,
-   description: 'Build the reference documentation (requires gtk-doc)',
- )
-+option('gpg_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Path to gpg, autodetected if not set',
-+)
--- 
-2.20.1
-
diff --git a/app-crypt/gcr/files/3.36.0-fix-gck-slot-test.patch b/app-crypt/gcr/files/3.36.0-fix-gck-slot-test.patch
deleted file mode 100644
index 44a7919ea8d4..000000000000
--- a/app-crypt/gcr/files/3.36.0-fix-gck-slot-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4835310d233899f8b541e1c75c79f5c3a9ebf928 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Sun, 15 Mar 2020 13:00:08 +0000
-Subject: [PATCH 1/6] gck-slot: Initialize struct tm to all-zeroes
-
-If the format string for strptime() doesn't include a time zone,
-then the tm_isdst member will be left uninitialized (see NOTES in
-Linux strptime(3)). This means we will be off by an hour from the
-intended time if whatever arbitrary junk is on the stack happens to
-include a positive value for tm.tm_isdst.
-
-Resolves: https://gitlab.gnome.org/GNOME/gcr/issues/42
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=953981
-Signed-off-by: Simon McVittie <smcv@debian.org>
-(cherry picked from commit b1c8213b64fdfcad8c4ae0ff33a31105c0a0a312)
----
- gck/gck-slot.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gck/gck-slot.c b/gck/gck-slot.c
-index f3b2f97..f00857f 100644
---- a/gck/gck-slot.c
-+++ b/gck/gck-slot.c
-@@ -607,7 +607,9 @@ _gck_token_info_from_pkcs11 (CK_TOKEN_INFO_PTR info)
- {
- 	GckTokenInfo *token_info;
- 	gchar *string;
--	struct tm tm;
-+	/* Must be zero-filled, because strptime will leave tm_isdst
-+	 * unchanged */
-+	struct tm tm = { 0 };
- 
- 	token_info = g_new0 (GckTokenInfo, 1);
- 	token_info->label = gck_string_from_chars (info->label, sizeof (info->label));
--- 
-2.20.1
-
diff --git a/app-crypt/gcr/files/3.36.0-meson-enum-race.patch b/app-crypt/gcr/files/3.36.0-meson-enum-race.patch
deleted file mode 100644
index ef9d7a1bc3ad..000000000000
--- a/app-crypt/gcr/files/3.36.0-meson-enum-race.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b04d117d5f8275a4c605743825faf2d5a28ae028 Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Fri, 19 Jun 2020 22:37:31 +0200
-Subject: [PATCH 3/6] meson: Make sure gcr-oids.h is built
-
-Fixes https://gitlab.gnome.org/GNOME/gcr/-/issues/48
-
-(cherry picked from commit 9fca6ae0aa7355c27d0922c561b9fbe18dde5b3d)
----
- gcr/meson.build | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 199452f..06c3a63 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -178,7 +178,10 @@ endif
- gcr_base_dep = declare_dependency(
-   link_with: gcr_base_lib,
-   include_directories: include_directories('..'),
--  sources: gcr_enums_gen[1], # Make sure gcr-enum-types-base.h can be included
-+  sources: [
-+    gcr_enums_gen[1],
-+    gcr_oids[1],
-+  ],
- )
- 
- if get_option('introspection')
--- 
-2.20.1
-
diff --git a/app-crypt/gcr/files/3.36.0-meson-fix-gtk-doc-without-ui.patch b/app-crypt/gcr/files/3.36.0-meson-fix-gtk-doc-without-ui.patch
deleted file mode 100644
index 72950d381ea2..000000000000
--- a/app-crypt/gcr/files/3.36.0-meson-fix-gtk-doc-without-ui.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9343a5b0afb8265e02798c48ab52758d6cdfddf9 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 18 Aug 2020 09:53:38 +0300
-Subject: [PATCH 6/6] build: Don't build gcr gtk-doc without ui enabled
-
-gcr gtk-doc includes both gcr and gcr ui documentation, so we can't build
-it without ui enabled
----
- docs/meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index f353516..8984ef2 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -1,2 +1,4 @@
- subdir('reference/gck')
--subdir('reference/gcr')
-+if get_option('gtk')
-+  subdir('reference/gcr')
-+endif
--- 
-2.20.1
-
diff --git a/app-crypt/gcr/files/3.36.0-meson-vapi-deps.patch b/app-crypt/gcr/files/3.36.0-meson-vapi-deps.patch
deleted file mode 100644
index 60d1058ee654..000000000000
--- a/app-crypt/gcr/files/3.36.0-meson-vapi-deps.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fc2bc7e230b745dbbd4f4b2cd82e1e5e0c7bf109 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 11 May 2020 22:19:16 +0000
-Subject: [PATCH 2/6] meson.build: correctly set internal vapi dependencies
-
-If they are set as strings, meson will supply the right
-arguments to vapigen, but will not set the ninja dependencies
-to ensure they get built first, and so races will occur:
-https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-(cherry picked from commit 91712a2e131692fa727a0da2868bc23e8df1bf17)
----
- gcr/meson.build | 2 +-
- ui/meson.build  | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 254a933..199452f 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -203,7 +203,7 @@ if get_option('introspection')
- 
-   gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version),
-     sources: gcr_gir[0],
--    packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ],
-+    packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ],
-     metadata_dirs: meson.current_source_dir(),
-     vapi_dirs: [
-       build_root / 'gck',
-diff --git a/ui/meson.build b/ui/meson.build
-index 5ca3753..477412d 100644
---- a/ui/meson.build
-+++ b/ui/meson.build
-@@ -174,8 +174,8 @@ if get_option('introspection')
-     packages: [
-       'glib-2.0',
-       'gio-2.0',
--      'gck-@0@'.format(gck_major_version),
--      'gcr-@0@'.format(gcr_major_version),
-+      gck_vapi,
-+      gcr_vapi,
-       'gtk+-3.0'
-     ],
-     metadata_dirs: meson.current_source_dir(),
--- 
-2.20.1
-
diff --git a/app-crypt/gcr/files/3.36.0-optional-vapi.patch b/app-crypt/gcr/files/3.36.0-optional-vapi.patch
deleted file mode 100644
index 50969fdae409..000000000000
--- a/app-crypt/gcr/files/3.36.0-optional-vapi.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 525f5c7dbfdff6c1b24510a22eeffa804836e1bf Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 18 Aug 2020 09:36:19 +0300
-Subject: [PATCH 5/6] build: Make vapi optional
-
----
- gck/meson.build   | 2 ++
- gcr/meson.build   | 2 ++
- meson_options.txt | 5 +++++
- ui/meson.build    | 2 ++
- 4 files changed, 11 insertions(+)
-
-diff --git a/gck/meson.build b/gck/meson.build
-index 756b486..a15f4ed 100644
---- a/gck/meson.build
-+++ b/gck/meson.build
-@@ -142,6 +142,7 @@ if get_option('introspection')
-     install: true,
-   )
- 
-+if get_option('vapi')
-   gck_vapi = gnome.generate_vapi('gck-@0@'.format(gck_major_version),
-     sources: gck_gir[0],
-     metadata_dirs: meson.current_source_dir(),
-@@ -153,6 +154,7 @@ if get_option('introspection')
-     install_dir: get_option('datadir') / 'vala' / 'vapi',
-   )
- endif
-+endif
- 
- # pkg-config file
- pkgconfig.generate(gck_lib,
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 06c3a63..cc642cf 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -204,6 +204,7 @@ if get_option('introspection')
-     install: true,
-   )
- 
-+if get_option('vapi')
-   gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version),
-     sources: gcr_gir[0],
-     packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ],
-@@ -217,6 +218,7 @@ if get_option('introspection')
-     install: true,
-   )
- endif
-+endif
- 
- # pkg-config file
- pkgconfig.generate(gcr_base_lib,
-diff --git a/meson_options.txt b/meson_options.txt
-index ae0f524..f68cb95 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -18,3 +18,8 @@ option('gpg_path',
-   value: '',
-   description: 'Path to gpg, autodetected if not set',
- )
-+option('vapi',
-+  type: 'boolean',
-+  value: true,
-+  description: 'Generate vapi data (requires vapigen and introspection option)',
-+)
-diff --git a/ui/meson.build b/ui/meson.build
-index 477412d..0b89b24 100644
---- a/ui/meson.build
-+++ b/ui/meson.build
-@@ -169,6 +169,7 @@ if get_option('introspection')
-     install: true,
-   )
- 
-+if get_option('vapi')
-   gcr_ui_vapi = gnome.generate_vapi('gcr-ui-@0@'.format(gcr_major_version),
-     sources: gcr_ui_gir[0],
-     packages: [
-@@ -190,6 +191,7 @@ if get_option('introspection')
-     install: true,
-   )
- endif
-+endif
- 
- # gcr-viewer
- gcr_viewer = executable('gcr-viewer',
--- 
-2.20.1
-
diff --git a/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch b/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch
new file mode 100644
index 000000000000..8454a0388ea0
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch
@@ -0,0 +1,29 @@
+From 6fc0e3e321cdf0bf7e047234561fe8a8084a93f9 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@mengyan1223.wang>
+Date: Wed, 14 Apr 2021 23:18:06 +0800
+Subject: [PATCH] Fix segfault when built with ldap disabled
+
+Fixes #321.
+---
+ pgp/seahorse-pgp-backend.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
+index 25febf31..8c10e7e3 100644
+--- a/pgp/seahorse-pgp-backend.c
++++ b/pgp/seahorse-pgp-backend.c
+@@ -445,7 +445,10 @@ seahorse_pgp_backend_add_remote (SeahorsePgpBackend   *self,
+         /* Don't persist, so just immediately create a ServerSource */
+         g_autoptr(SeahorseServerSource) ssrc = NULL;
+         ssrc = seahorse_server_category_create_server (uri);
+-        g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
++        /* If the scheme of the uri is ldap, but ldap support is disabled
++         * in the build, ssrc will be NULL. */
++        if (ssrc)
++            g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
+     }
+ }
+ 
+-- 
+GitLab
+
diff --git a/app-crypt/seahorse/seahorse-3.38.1.ebuild b/app-crypt/seahorse/seahorse-3.38.1.ebuild
index 031375c4f5c1..c3761406ca46 100644
--- a/app-crypt/seahorse/seahorse-3.38.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.38.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58:2
diff --git a/app-crypt/seahorse/seahorse-40.0-r1.ebuild b/app-crypt/seahorse/seahorse-40.0-r1.ebuild
new file mode 100644
index 000000000000..cb214296bdda
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-40.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="Manage your passwords and encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=app-crypt/gcr-3.38:=
+	>=app-crypt/gpgme-1.14.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=app-crypt/gnupg-2.2
+	>=gui-libs/libhandy-1.1:1=
+	>=app-crypt/libsecret-0.16
+	dev-libs/libpwquality
+	net-misc/openssh
+	ldap? ( net-nds/openldap:= )
+	>=net-libs/libsoup-2.33.92:2.4
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	app-crypt/gcr[vala]
+	app-crypt/libsecret[vala]
+	gui-libs/libhandy:1[vala]
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-segfault-with-ldap-disabled.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dhelp=true
+		-Dpgp-support=true
+		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
+		-Dpkcs11-support=true
+		-Dkeyservers-support=true
+		-Dhkp-support=true
+		$(meson_use ldap ldap-support)
+		$(meson_use zeroconf key-sharing)
+		-Dmanpage=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1a5c4acf6196..607c8eefe278 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
index a473957b2ef3..ff16b60f733d 100644
--- a/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection +latexmk rubber"
 
 DEPEND="
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 45b755df4072..46bdd473a42e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index a4d540bc2fdb..de40de59488c 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -3,3 +3,4 @@ DIST docker-compose-1.28.4.tar.gz 318110 BLAKE2B 97a39c52a2e9819fa4632a16080b9b3
 DIST docker-compose-1.28.5.tar.gz 318236 BLAKE2B 32aca16fdebd00c5b211404e82b44b9486340bfa379d4739d164d5aa75d4f35b95d914065c05fef585ea7e412035e582d8058f2b942a4ce17a9b2bc25ff0cd31 SHA512 1f2cc87b82d18c023e8c2d9eb2e991393c96f7a3ab17fa6871d0969a28162b6832f98b42c76cadc641416629f74eb00763c89e044ae8cf02a062bd74b58371c9
 DIST docker-compose-1.28.6.tar.gz 319216 BLAKE2B 6f35f13fd35e08223fd17406b219fcd8c97fe9a2e96a3210607d23d54923496a9a51271f359b1537b73bc5e407d175822075835f44406fcfe028cc23d8eaf9f9 SHA512 0aef0066e58ee3e9ac6ddfef71cd29ae46ba52ed641b6da7ffc74b9e9a60b3974593173e84ac863475bb5d2a3896a0d453fda4decb69101c91abc04f33e50d45
 DIST docker-compose-1.29.0.tar.gz 321019 BLAKE2B ba20ae83e0f2d899da2d39cd9f2edbc00b22eaba0209eaa1dbc5d376fc94b16d454713f5d26fed8b06eceb274098dd1155430d43a723e096643a108023de19ed SHA512 41bb20a405a0305093b0678e24c57582393806bc617bd09f98c43c9cd1c38af51011c7ab1c0afd1a91159c5a3e19a1b8df575c5be4a7e8317db96dd37ee9a339
+DIST docker-compose-1.29.1.tar.gz 320234 BLAKE2B 7efdfee009d293a3cf46af54113750877a105231ad2bb0a643c15431ebc39017d4e5bd06e5e486a4aa0c95de6af165828818b21ac665437156a3e5ec734ece06 SHA512 d28298e6a80787d6ed822039214aa8b7fc10dca45e52f7ba499891e0a2f20715dc503edda673c239fdddd33f9941beedcefb34a79dd00ea2fa724d17d54be2f4
diff --git a/app-emulation/docker-compose/docker-compose-1.29.1.ebuild b/app-emulation/docker-compose/docker-compose-1.29.1.ebuild
new file mode 100644
index 000000000000..0d5c1a457def
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.29.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.29.0-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 4f0b1fbab893..826d1fc1b58f 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1 +1,514 @@
+DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv0.0.0-20200220082720-bb896865146c.mod 1056 BLAKE2B c85fe160fcc992da8aced9b0b8430782069b6d97a614645b2b005fd2a798c296bf6689321768d7d8796ce502232071f715f4b33fc2fe51c6252fa67be1e78a93 SHA512 885c07825c23ecf41cc3b757a44996da9ccc3868059a5123ee77ff9d6387d4b1fe860706569d08d1fe7149de440056a200c2d500a90cee8c89fdc9f6ae519c45
+DIST github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.mod 795 BLAKE2B 89ad929eba129f42030bfdfc1d57971763092640f3d978d365fb929ea8b071549bdf857036978692a1e347581ada83ed837712d810a31a8e75f06e236bef293a SHA512 668f03da10a3ac27bdefe9b28b8d80fcdf9b3eaaf242bc93fe23a16925a8f496de748741c5361cd47e7ddfb4c94e968dec5651ce9df74f3ad3ba85e5c7db544b
+DIST github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.zip 27458 BLAKE2B 2bda425a75d82b666a7afa64ac1db2155ac40facea587d020e8fcc6fd44ef7312482bc3cdf0e4d265304cc9b1873bbff6a9d1766643ab0fec5c39a9aa92de046 SHA512 08b8a72567896dd12bfdcc809ec76d3418bc564550582b3e493bd9b2fa99a7340ba8b656ed7c3fa7b38ab5c39c5aafb50a87a67c73f22967022f75c5fd9e07c6
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod 177 BLAKE2B 1b5b5169436173ec669c16023c6993e233f5fadbb574533e7e2db2140c2db22cd9b8697135a46fe7d8787b8e5ae8c16019f15e5cd7a8c4ad59a46f6e6db9bb5e SHA512 83b5d04d488db971f78cd1853903e7f5cb1d547d5b5270bcaf35aff4240f0b96c300ce311014775028e1424c6fad714991c27f0c676d8b8eb37aaa62330450ec
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip 162259 BLAKE2B 71daa9e2a01282e0f29e7f47081f8e5cebb59a31837b2e70b2b52d1ab371b351f6f00a8a0cdf33efaf0529f6ea5e0230ef9a35209dcd7600ad1204cadefa53a2 SHA512 31cef74693dcc7ff3e5e3542654b4174eb8ce7fd3a8a763df52414c99e01679404f2a5e6a1ab9cdbfed958b588e6584feeb8676ef9e149c4d24ae095dd654b64
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip 552856 BLAKE2B ec7ad9c6e4c49c04f8aaca1c42e198027e5db5abd79ed84f1bc8dcef2e26d3e386e02554285b666eaed6dae5ac9bec5f0e9c01cb703585921f2834cd8f49b65e SHA512 5d4575dc4e98137cfacd463cabbaefe2df0e49b81af900e9c43d2f98fe2aa4a02323e395b390bdf4c05bdb1d470f8fd2f2766123d27360541f249cde5e91c738
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod 1715 BLAKE2B 2404c8d3fa21fbaaa7f43c4799c320c9c251dfe3f630f7b6d85696c270baa6c4cb017087a4ddc7f7da0b29b94239fc20399616ef1c5f3ce76f05e937779425da SHA512 9d9ed47cb1b8c51ddf79159682aeb99a043532f912514c2ef6574883f5bcb24f1c77c8cdc6238eba436bf3a6ffd095e53956ea1b28eef9fb5dec3646b5549efe
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.zip 477269 BLAKE2B c47ecb41bf2d747e9df605dd7021361f2f3db6107a17dc78cb394effbd565cecdf08abcb29a7788161c5f06c4cc99779b2481abd394412ef561eca8ca4723429 SHA512 9ee1a4d8f9ee1e8a1f75904114073c1a0d2d936d39ea453c924e7a602a02881dfbe580742299e069dcb97883528b13b45b89423f940cf910cc0fc1b4b49a9aea
+DIST github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod 31 BLAKE2B a9858e56714c0ef3f20576058bbad347aa76d00379ba71c7944479abe032692c3f0d33303ca82ad6d140ff529b0c6bf23a844c4c0b8b655c4fd23f6df414ff02 SHA512 ee0d1ac5d8bed0498ae9b304c1f3b07566a2e192b6f7cf706b4d801e74e62ad3157b101be9878733b48a06d5aaec3ee916336c7f73bf155d63f606d039f8c6e5
+DIST github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod 41 BLAKE2B 3f9f665454c79b0807b44cf10f69fb0e5c31364865412f19d8b146fc9a0b12d7e5a6282812c7ac70940470a3ed3f2cd9c2e6bca7eb51e43a4b14ad5e723d76f3 SHA512 f9f36e700dbfd7c997b79e527ec2a4d91e5ccf2f4bc7ad6a9298a9cbebe05263bcf8776bd2f3dd258f292790928a20cf45184e7af00140b2940af322897a59fc
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.0.0-20161221203622-b2a4d4ae21c7.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
+DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod 38 BLAKE2B f6ad4f22436471512ed4037c3f4c8dec4e0f7cb9191ddda23a2f5a5135785a6c5af99dd9005218bf196e0f48db755d040c894f6c5f2c1c338580597eca5eecd8 SHA512 05b70033a965ce6a70ea5fe7c635768c2c665942e04b17e47fba03b70cd977a8cbc292faacc3e10bd785523a43c61d42811c20513669592f308830863cfab56d
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod 35 BLAKE2B 253b8f5c57339e04a68fcd945f25b655ae0d9b6a265fc3e02c9ab2a5cd0e41d68f5866e80aad321eda2e3fe0ae8b311ec0c4eb922d67e0c7f425ebff5d6dba69 SHA512 c19ab1ccc5297aae6bc7e3536b97091f3f877b1b76e5d93b89842e48ae3c9d4cf49a471ecf72ce6e2da001bd51ef3eb126a83bf5a35e50acc30a43db4d37c301
+DIST github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod 53 BLAKE2B 099610d4ac9528646136a6214a5816a721da42afd273e8e2e7ce40bb4afde2ee7ee3de02e0c04a92808ebedba623d47715e61e8deac2bef77aa9eddce5bc1036 SHA512 fe08dc8aa742ec64dde4481a917d19c5a64d68ab7a373ad0e8a3064978f8c76c5429d9a18a4a52d0b49b035ca9a4b5f96a24fc86df475a1fd725f7cbc0da814b
+DIST github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod 37 BLAKE2B 9dbf4e5a299c30b356177f7b76d96328e3f35affc49bbac79607fce63bcc72476a8220f773d3c5ae9a6aa0d5fa567b10e6392c68036aef5218253d409dfbc244 SHA512 ebe7fe07551e5a485d47502d69cf84978be13de26484f7541945be2113698bf11ee375a19718cc01af81074ada64803ce8ab78a5bc08fc389eae78fd9455572e
+DIST github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod 32 BLAKE2B 879ed9071c4044f638be3ff367074c7b456ebdd04a6b298b81240662e105635e778f6668870ea711daa2be5bf45086511170df20a43f811d41cb5b1ea439169e SHA512 6eac336db439692e7c478978d290ef8ac9128a31d4535744b0b55331dce7cef6284058b5acb164a6b749a60449cdabeb131142dc5ee3d0222d443c4f292f9683
+DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod 36 BLAKE2B 8937677f3b8473d8d71c79e9d3e420bae0476de69d366765ba5f9a4c42d14a8cd18a49f4ad2911673c80276bdd47dbf019a62fc0aaadbffa72647cac046c362d SHA512 b23603768dd8994a9b735ae81f119d2ac2e33a1b54e6328044f92ebf03f905210e54692752076413dc45217b0a400870a5da8ebd75856bf6b74272d0a301484e
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod 135 BLAKE2B 1b785fb4e0af530378f15100e4523543e22b2f5f7f350eb46cb16290c1e2f55b18a9f8894024a472c7e9d45deacb1e7a3828a54368ce1ef83095916e2262c194 SHA512 242e8e3859ac02adf7d059da6d2fd5f774892e8a11b69d8e22bd2de43c534f7d4a472e9b3bde5e5bac106211f41546614cefd078ac23115557e26c3d8457d7d0
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.zip 939888 BLAKE2B 1b5c82fae6ab074f2fc2c63a1499cd203cfff217535761750b4b8a85412e4ce55ca30709ddb029288094aaa83012f4850c73fe51702b18f479ee4513c0efbbea SHA512 84d14f976c35a0c05958b791e5afde8f5b15e3ba12ad7bab6faeaa34537691d893b8decd8f61d834c18b8716ea6e101f2af7641233aacdeb42587aa68cb919ec
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20160425231609-f8ad88b59a58.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod 411 BLAKE2B aaed1a7526861470d053cfa204fe5af2ba4ebca024322c8007d3660acce6fdca03264a12ca0bedcb6fe1f0cc5c78de920f8e8e19a36b12e1604cc3274bb88733 SHA512 32f6adadbc5dc2c9a57c698ba76fa4fd83637e67f58da55c6a22d4faad9f705fef7a472c2b2b2b94b2bba2b839b85856254fac4681dc9770893afa940bc734a5
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200217135630-d732e370d46d.mod 648 BLAKE2B 2b9b1ecb77e51df4f51ee1acb9392492f048411d8ba23993408a7b916b1eab0b0713f66511c3900406c192c2e970284a1f92fc051c7fbc5a1a5df33ddd5445b3 SHA512 02406903eb3a5ddf5de63f248ebafbc864e38198b0883e40a00d9d27d4eb2f00882c3c55fe4c28079faead4780c9160d02f868327b77d18661226be41cf9c335
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200217135630-d732e370d46d.zip 125651 BLAKE2B 72ac72185c7dad8eec89dc52efbdedf52d8791147eb56eb26c33c07e0a233322ff070bd37594b6289d80ac5743a7bf32ef929e4465c70807770d0c36cd9762eb SHA512 0666d728911f502d48f4ed2fde6a5b8e1a380584d6e62ecfc8ef0dc122312b923079869f8c6e15b3e140f50a9c16b616a8e4f683373e9d1836037cb5a2739af0
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod 142 BLAKE2B 078f299e69579bbfd85aa291a997ac81e3f04a8317db16e836da1bb4242c8fa52fe809643b227471f5fc95ae2ccddb5d900a2720a91eef9e3fafff0e28979daf SHA512 a3da31b6bf413b1ed55de8dc4693fe4c9019550c77bf5098b67d305b273945cec0114a00cca4aee4d652b4a09ce318642a5bacd1ea7d7df63616734947bee914
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191219165238-8375c3424e4d.mod 142 BLAKE2B 078f299e69579bbfd85aa291a997ac81e3f04a8317db16e836da1bb4242c8fa52fe809643b227471f5fc95ae2ccddb5d900a2720a91eef9e3fafff0e28979daf SHA512 a3da31b6bf413b1ed55de8dc4693fe4c9019550c77bf5098b67d305b273945cec0114a00cca4aee4d652b4a09ce318642a5bacd1ea7d7df63616734947bee914
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191219165238-8375c3424e4d.zip 25105 BLAKE2B 0390be1b8bdfa32316cc92db2a99c81a2f19bfacb04ae69cc5052d901bd2068728fabaebc3889e9e465614c9ffaba82ed15886c610fa6fe4a9bf06edf514c0c5 SHA512 4e29b6ba5865d878a3ad24b10d2c35a036b62a7d70a0dcf5459440e1f7aa1c86c8fed0ef9dd3cd7b31bfa47e7ec9b5becc90853cac1e6dc89e25609221863969
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20200227195959-4d242818bf55.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20200227195959-4d242818bf55.zip 1737252 BLAKE2B 6b491903861c99eb7d2f166380d3331693ec0d982415433bf603928942f74e80c6d9aa13b656e581ba5dcf863c41781e05f9d3ceb4b3215ec1cff2fc52b2415e SHA512 d7de2c56e0181278f57d1f6662d10c221203bbe447d06e7f5653511a26e445820facb0473de3306bc73855bd2512e38ef4554ce44bfe93a9e7157e54744dfce2
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20180921161001-7f53d412b9eb.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20181001140422-bd77b46c8352.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.zip 133764 BLAKE2B 0472340f7bfaceeec5aed6031677f27e06f737ef59db494fef5d65293f3e5d2ceabd4706a82e503963e4dc70f5778c5dddb2a828e086ab6ab6be1fa6b5f75bab SHA512 f6def995defa9a9a3481a63e1c0f4db9bafc70e500094a78d6d035c6db01854b6957f440598c933df51c69fddf76c5b1406f9dcf1edbfaf8c6a7a97185e68f20
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod 1000 BLAKE2B 595d0a4ca474b1143bfaff75d8bb1089953f1b68da5b593966f85461b5a20ea0a8ebefe6340ae8747b12e9fda5a13dff135e751262f4efbf7142993938a103a8 SHA512 b6ec25dca49d545033cf2e97f7907e4709103e1bd76b341a27511c25df44788246d9788281d2f2636bfc7b4f39ac7fb25fc1de293917bd68ebaec92babea8557
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip 137748 BLAKE2B 6ccbe78dd7b1773d54ffb28aaede1b1a10ced9228c4ba511be4b5c20940f7d8551dea187254c9aea915b4f3095ea415bae6ea7bc3df00f36966e29ef8309560a SHA512 38f840756874baeca822de082893f9a5774b29164f9b798660adbc99122f8c4d42be0e0538bf5d1c4c428ee2f2f2af5592b9eba4e2b5f01a74f4e8b591212592
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod 1000 BLAKE2B be8fe2174e146003221bd28edca0ceeec630e4bfb3be709e9a00f274c1a7b17d07f7ab07750aec301f443b9a8fbabe612eab719355843da965af2157f4cb0aa9 SHA512 17f1c4c0fb892b6273fe6c90d880b670e6c1fa4e1e036e137fc5ebb9a056d0fb25a968972addfe736c924d1326eb6b5ea4acfaa12119abce1bfa1ec5fdbe2157
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.zip 134137 BLAKE2B a19f9ca4afd3b4fe63929512cd95b4b28b0b838d1e42fecfece6bc0c29559e164bd58a863abb71c85ecb17400c0edcad4e85dcaca036350c701b753a020564ff SHA512 437d50ea75f4ec614a2a86cacc7f4559ba6d91a8761c265e31bec65f47b7fe77cdbd23602637a358a1bb8cb90e002b4a926beb5ae126150c5520641e4df32f87
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20191213151349-ff969a566b00.mod 175 BLAKE2B 1573b65ca6fa922fe9d47ba40920cc95f7f7f9135c729fe9d8f9c2723492a136033f6b16680bc5c405377ce7bf14db34d989c563af74bce702db0b5ab761bc13 SHA512 b227a5f0ea52840001d34ebdfb11b0209dad5dc49faa55c20f5d7283c67992f1e63e4325c4cda3a3e5b70cbc7231301ea448a7e272a5f864d78585cf938f0d2b
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20191213151349-ff969a566b00.zip 22168 BLAKE2B 9be413f55a84b6af8f8537fd3ad96c021cad01a27ebab1fb88f29b95c642c4f9aa55b9bc3110eb98d3042193485a8aa076184720158f5f6b07dc5010ac2d3279 SHA512 7b5005a900f3b8dc7ad910c0b864fa086eec1bdc4201b029ba09f63afa8711086086773ad84ed319ec328508c70cfd254cbceb68971a2e670afa94b3a284614f
+DIST github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv0.0.0-20200107172653-c154a49e2c75.mod 452 BLAKE2B 24a9f367913ec94805e96dc887784ff740c55bbe40d3f47d9ef0972a2dc7372a2a1e5821937fcdde5b64d4dce74c00e5f64d3363e7e0eebc6417df5ba8ab5eea SHA512 0c7314c57760b9674c8d05829b055046cfb297c67a3768440352d16e05039599be9f4a7ec641ae79b9d9c778e9d2af382f940b1cdc210f3480e0315c6edafcd2
+DIST github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv0.0.0-20200107172653-c154a49e2c75.zip 22868 BLAKE2B 72e4044a0df258ad1e28c1cd2539a56d7a9030ccd8e42252b70020f1013336914116a793a02d79f4b1d8d23281c8c5454fd0ed05e5b63bd689e3179d15fb4085 SHA512 09fdc329c2ad1460ab90676e0c64cab69bbe434d806b13b75bd4174b474ef1903ceb496bb73273bffa7b524b94f571f030b6c84b0594eecaa7edaa7b5a160e98
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.zip 23474 BLAKE2B d931ed25c809a397fd438128783be1f65f3ba4e87f525999eaac668998ab31eb2c25b48780a95d5bbcb8e2ddc3068cebc3cd2e55cdc35c122bf8e937e71b37b8 SHA512 b4d9e261d5c93babfa7a993cc1985065a8476a934c2c580d2ea0101d392a4b44f0eb73051a81458615b571211d774626c9850814dcb2cd1109bd838dc744a631
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod 255 BLAKE2B 32db1b4c953ea3f3938b2440858dde31e603131b72aacc4acf32af9e44edece17c738b2014c04558fb658e367ac02c6dc2d1f57b89b61907bd38ba56242d9aa5 SHA512 69dde1b31556a7ede162e742be7e546d412bf257449878e92a5f8b3cd8246d77e9ba96c3dc82415f356c5b8a0181517a2b8f41178e5537739644b8e4713eb594
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.zip 25790 BLAKE2B 466cf6fbb3a4171703ae4912a288aebab52049de02c9c5a346e567a8a770ed662672094e2d6d87a035a6f0609204f166ba859fe1a916a1a06aad876b99b9c237 SHA512 5d8a0e7f0f1c9aa65065a8a62f2fcb47b57976d7e9585c7c1d1e149a0ed17a0e983915b01199cfb9dec8e233f418386120f441dc4d85099c228e82c76e600700
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod 368 BLAKE2B 52b871af9fd9f2b71074286d0877d16dbf6e9395f18326cfee8cd1eb7339b4694bfb90ae4c843ae1f71cea664a64d4b090b3b8be7e72f01366424400ec2ff05a SHA512 1655c00f6600d5a2ce87971a893f5e23b4d40f1e49d62fc39916751fc8c5352766321761b1e4c5f321f8e205d5164409c964ec508c9cb7372bd182b850692045
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20200121165050-0be804eadb15.mod 439 BLAKE2B 7c315352ceb1b2572b46be523f2ae18dcda51ab13d268c7f54d597a4eb0a71d97cd3d615fc8c45584a7c8070b232b1c5b7003cef36a7ff31d1034335951dbbe2 SHA512 aceeefb2d381828781a1bb99048bf5135c18e1443339298974a1f457eecf86116dc70442d2c192725fba64157c230782ebe3b918f0026d89adff9195bf3bd78b
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20200121165050-0be804eadb15.zip 46590 BLAKE2B 26d6a98035687a7fe99b69654413ea2e375f8ce7fd045aa582031b4e2d62ec78ba9ef621f9388ae4b7e9afb1622e6532e5fc913b86b6e137abd2f4e8d375bcfc SHA512 6ccef21df8cf7c667980a746b6bd9692cde856607bc04c10d1984bd1fbe8a0c4377f5a5fdea345f615027513a69c9e797dec696fd60ac26b7a607a01d6398076
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod 439 BLAKE2B 7c315352ceb1b2572b46be523f2ae18dcda51ab13d268c7f54d597a4eb0a71d97cd3d615fc8c45584a7c8070b232b1c5b7003cef36a7ff31d1034335951dbbe2 SHA512 aceeefb2d381828781a1bb99048bf5135c18e1443339298974a1f457eecf86116dc70442d2c192725fba64157c230782ebe3b918f0026d89adff9195bf3bd78b
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.zip 45186 BLAKE2B 4c1278247295d40234a02de926a07b97155bf80c4b88a08976cf3cb5ccb3d81665711c8db307663c6b46104d0c0c417147ead605c36ce21ad47caca93448c5f2 SHA512 f7537d05e867f8dfcf77e2f028c494d2ce9da88b845425196392cdc5b3f0f4519ed5829507369c0db5557d063de3e524ca0be710f181effa295479c3b744fea7
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.zip 9069 BLAKE2B 65b34ace1b0655929a00f648d5574406440dd840e4ab182b188d754e131dcadb6eadb07971840e867aca65a2efa8ce01c89c20ba76d35654a58e7adbbd3b867b SHA512 cc7e018805824fcff055bf5fac93253b6194a12a421f1e1795de114edf863d865d6eb416ea92ce3ab66fb627b5470a6e721911c059733a27c6eea487f89d3f15
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod 122 BLAKE2B 775bbfe519746bae037f93939baef72c091af97099c61ce8ac2e4ddc93a52ce06a4d4fccc52ae28f533da9c7aa147d9f302269d57448a003a695cc765d32cbc0 SHA512 a92ddbef593ef363aee93b81d810ff76b2df0a4155714d95dbae9d000edfcb4383953625becc3f24cbea19a77431cebc0767e40c746b6abf613ca5346f024370
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20200205145503-b45ef1f1f737.mod 122 BLAKE2B 3fadecc6cf793ac4efbc51546c1ab8f882b9f350b9c32fcfbb93da9707cdb9d9cad9115e0a2334b4022e1cc5b715d8ad6a1b59e286ffe65b26d20f49036e8a21 SHA512 d2a8eaa285710c7734b1c046775e9715d20bffb7850f1df888d9b98cd4bd6062dcdcb18d43843ecd95adf7b125a105453f1bdea3fb75f09a350d229663e0cc23
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20200205145503-b45ef1f1f737.zip 12306 BLAKE2B c7f6cd709592e42a9ea2d1f422ae6148f5c21b1914d235ee171f24ef655338cf79a7a3e230484d32ca45972b51bd9e21656fb26009f0bbdeb8617bf21ac3fd23 SHA512 b7ddae1fe80b1f5edff332511ed9b493505388928bcbe1d869163d0eef1d45eb41d03bb4c0cf69ac0041e4b8a4c5e531c3147431fc44458010b9edabc5c8d66d
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod 122 BLAKE2B 3fadecc6cf793ac4efbc51546c1ab8f882b9f350b9c32fcfbb93da9707cdb9d9cad9115e0a2334b4022e1cc5b715d8ad6a1b59e286ffe65b26d20f49036e8a21 SHA512 d2a8eaa285710c7734b1c046775e9715d20bffb7850f1df888d9b98cd4bd6062dcdcb18d43843ecd95adf7b125a105453f1bdea3fb75f09a350d229663e0cc23
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.zip 12534 BLAKE2B 3ad833c79b731b055b9ee48cf567c70d119d2f286c1c16726e167890a5a1fac593c37e4d6f61d9bcbdabaea85a52a7856eb7973c8b47a2c3e7349178bb76588d SHA512 90e97e49a783cac6b06cd0260bcf1ca1358063119593d1caed6785105c669e03ac944bb2d63db6f82acb6d21eefc2b89ec89a81d7bc67c710e3b7458bd85fcd9
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod 42 BLAKE2B 85f366b44e027fa05e71cf323e294e3c4771719c65dd467d2fdab5564501cce11bdd37696a3026b76ae93fab5f9fe92e0f11c6083c6f756f74a19cf0412f94cb SHA512 8249600ef0c0b1993da84d89e9ac18ce72daf21430e0d491f09e863baa6d59d6968b52066c2ef3c4d448570150a511641513da44219f4cc4f64184b883d87703
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip 147142 BLAKE2B a28d972c54b69ead2b6fe83552ad4358b5d86985ba0a3141a68ccf13efeb2656950e664a9ee3333550278d2571ec1d92a31a6f906e9a0cb04978de6586681adc SHA512 7773628b7aa2a7b2e838e6c8a8acc1e6f90701c46c7ce5d153cbef11e80bd8d82eb09fb4a6a6fbf54beaf63ca9ad88d92bc7be1b0c1ae741b9039810c4780766
+DIST github.com%2Fcoreos%2Fclair%2F@v%2Fv0.0.0-20180919182544-44ae4bc9590a.mod 31 BLAKE2B c1ff63881636ab7da1c4089b6ffc0212911348416787ee0570ee3fc4795930e7fea0122728e12b3d6a0d6b64c98b8b52c3bfceacd8b1bb8c77ecf8235d12fec6 SHA512 26c17d64fa51ed7b526eded3dd8673bd95c9e4e861e6b6bdb0a7159d17e569e939e45c4d4bf59092c8365981799b1b8d8f81edf3faa0e4bbbaeb6b9b1ff5e216
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43e288a393932b03a27d91cd456cbef42c2611751d40e8a8e6c14d2b80f65990711a5be7d75e1f62b1eaef3d9eb8c9bcf3f51eb14a2436ca1dcb15b3b3a2ef16 SHA512 9df60d53633425f32d5bf594dd579ce61bee549c2672da2f7da39437031a8b0d27b7d3448adc6f9b20b230f48c355242ce8b01b0c5be25612165c53c73e10735
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip 116823 BLAKE2B b33381de26ca23c0d218ecd16b22bcf13362635348a4c9887ab2c4ec803e0dc2996833eeab85b327b838a234198dcd555dc148a02b8b1282a1dab61e44e56c80 SHA512 4aeae5f35d7de56c2e693fae7eaf6f418745b9d9b8a7652bda4acd6c2979cc2cd175c4809386b7e762d9c243e1504baf82aa4e4dadd7bc6050d2227a61510b7d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod 38 BLAKE2B ca172597deee09bc6129ff6d8a27b70cd49f5891f9db37e73f1178996255cd0548405d7fdfcffed3745777a332d3e979195e4da827f45e00305725f119332cc1 SHA512 086ced52944283fce02fb1b53de3748e32fed8a90dbab1d69e9ade5ff40c47e3fa1277cb3ce7bcdce2dc36d903eb52d3d3e723801fa8f6265736badba1ae935a
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20180920165730-54c19e67f69c.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200227165822-2298e6a3fe24.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200227165822-2298e6a3fe24.zip 2088281 BLAKE2B 996e4c4f13cd406497b6a759b3c957fe6d5428eb405d1620b47f62c6c8b8e577279192aac481782e21d3d2892fb89c4e709fb44bbada7c2bd13e6d0e91e487f8 SHA512 f2318e9b6ad793d00b44733bcf24740cba324013faeb1f7b7b814ea4313c18694684dcb46f5b3ec9153c07840a9b976ae99b9dd0fcdca542572404ba86a08cef
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20180920194744-16128bbac47f.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20200223014041-6b972e50feee.mod 3136 BLAKE2B 877cf2bfcda79b66447d450755604fbf045e8a5de1d8384b3383b8a5d391c5d581abad094a3e576a9084bd7b71c42ed9716e160342a28a109072d0a3baeba839 SHA512 da1a31e4125660400cfabd496bec36739b75009ce1ff05146f8db82b88605a03435fb38a77ca158ea0e943f340172e205f96c1c1ebb66ba88b53932590887766
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip 681938 BLAKE2B 62693a6170e7f843812aed03d05965ef0a7f1d212029239924385746efbef5d4df3c649e14ae60977805063e521c0b5c68a42f32e3b8ae131b438da4d062269e SHA512 7280b01be97dba11cd18c2cf044dcd0edbe9ef09538966cc3d92d27400bc615f8106a858377e8f9c80453e8db0449829d4437fb371aed5bccda370f12479a621
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200227233006-38f52c9fec82.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200227233006-38f52c9fec82.zip 4125681 BLAKE2B 44badb00f73ea1c2072e29b0044f1f420653fe3c2d290bbca10d3dbd9bbe4da8c9f4858fb0690d4008cf8f59c456bc472801204aee75d292131774524dc4ce51 SHA512 266c4ab01191bb285c6bd42146da788068cb30693ed3b1d1db5e2b2e10317cc430acb4d01b13ca37ae104dd8a2fb6e9d685b782b14fdb573a1507b6ec40a4ed3
+DIST github.com%2Fdocker%2Fdocker-ce%2F@v%2Fv0.0.0-20180924210327-f53bd8bb8e43.mod 35 BLAKE2B 4e186ae86f87c9e911be31ef3dff3b6819b114579bcee827e50c6d76d8f5fc5a0d3e72d2ae2da90082fdcddac1fc4f9080ef00d66ac91d16ff08ec2931ca8834 SHA512 5e88908d21649ce058590b5817bfa1be594e3562b163c0ca386fdf7ccfe9a1e038e746808c6e2f51630829bba89dac2dd81ffd6204cc4170feb21043e8c9872a
+DIST github.com%2Fdocker%2Fdocker-ce%2F@v%2Fv0.0.0-20180924210327-f53bd8bb8e43.zip 5702875 BLAKE2B 0ca3e4420cf6d5d6acad99ab7d70787cdd6d8ed093b10e26d1838b9921b9cc0669ec4dfcaa29e393ce4de4c2a74cbbcb070a230e9110cac0f448ef9050f94919 SHA512 fa83b8040cfdef81d70890f6b643c87bf762a2a659a033fb3f9a49cbdcb10fbd2ca59c9e30b0818b5407f5f3c2d8197295ac729f67ac0e3c08f260b87f6df1af
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.0.mod 51 BLAKE2B 324ddf12d16d5c0261f3700594d6a352ad79601237806dfa84179ff6524b7f8f2f7eb13326ab6ad1f7c22f4a358372de89f4f257d5ff6a702e865bbb56c45274 SHA512 a2ad0b6ddee7601a260905c3d146540292ff3bd69b62166b6b4ae1d25f4f0c8872fe144ad4f3024d0d9723f0f1c8c9ae7bf4e2c6ea5f30a14161bee94c3c06b1
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.1.mod 51 BLAKE2B 324ddf12d16d5c0261f3700594d6a352ad79601237806dfa84179ff6524b7f8f2f7eb13326ab6ad1f7c22f4a358372de89f4f257d5ff6a702e865bbb56c45274 SHA512 a2ad0b6ddee7601a260905c3d146540292ff3bd69b62166b6b4ae1d25f4f0c8872fe144ad4f3024d0d9723f0f1c8c9ae7bf4e2c6ea5f30a14161bee94c3c06b1
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.1.zip 39516 BLAKE2B 7b6e0419d160b8623f6388bb2ca166b73bd6aac72d097e13d7aa9e6304cda5c1913fde426a09371acc5b2c84aae80c5dac58c388ee3c38f60cf1dede192931cc SHA512 e9c006f89f71e732c4a29d2b1e9903b5d466aa379dbb76103f857b2c61c351c007e8cebf6641270e567819752c35c82b70c8f596549f6b1fbfe70706839860ef
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.0.0-20180821093606-97c2040d34df.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
+DIST github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod 35 BLAKE2B cb3636f6ba689ab17bbd240c10dd1f1f150988421212af1498f68fcce3250f61f1dedf1aec95c5437ca7ce92c26ebd115d1b3a16da55d07cfa423871e6f6f73c SHA512 ff56a30d40408c088c121984ad3ecfbc1214da641baf359fc36b8a3ae50ebfac8b98add4b9e4a47f8e03f586800fdd9c268582e581bf99e95009abdcb4e83af3
+DIST github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip 22827 BLAKE2B 33b13d02d0031c2a898aca18f16292ef603fcdb6aab746a77cb782fd0bb786668434fd5dc99287176b6d57679d0ea565bc55b2954ea8b26fe8914160da4dc10b SHA512 c7770bd3cfd352b844a988b8a0921ec4bac94dfbbf7223a55639ed8501e0fbd06b0b55d2458727459db41c8f0ca93a9c9abd7956f37b39bce2be30acd0f09fa0
+DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod 36 BLAKE2B f42e08ea331c88b2b916ba61587904489222acd832f03a2c7d887d555555a634bfaeaf752d030c7476bfcb1c2d3ee627035d30ea79391656489046a09b61b1b7 SHA512 8a8ece742e952ae7af8fda10838b5c394ba66b2b3fb26b59d8751beeaaffe799210812857cd37eaa311f50f937aa5d271e9e75e54e81fe4a8cc688c1f2a33977
+DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.zip 21328 BLAKE2B 67a791718cce6f164f869dd248ffcd91fa5e272eb587f5540d1826682649a56b9860675a7904543f4cacd5081ccb177a4b4d56aef455b1d701bc9fa28a61c7dd SHA512 94af6e21995f7371a106873fe8ce811f2d786471c1ae870a0adcfe1457c7f09f0813fada72b1ce6fb6d523a1593a3ab5c3210d6abe7b08010288920538472293
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.1.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip 13789 BLAKE2B 1961aff6de16c83f1a771b94965a6e5fc95a951033d93b576cb1567b008473b5fde0a12078179738a921ec88752621281a36137ee6719d4a1110ce072f450bb0 SHA512 66587313fba838dcea2a00bc81222924d1dbf77bfe47b7ed0443a071c249f14204b8e0765146f060009c8d840dc802ff701d6905a4c05b816ded9adbb0a0e981
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
+DIST github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20200226230617-d8334ccdb9be.mod 36 BLAKE2B 4b8cf468872414728e3cb5f49eff6ba10147cd8f2803b0cc415506dd82ce017facd77e78a9875d83f5c759de443a82545d5f447ac8351b4d74ca77892cb94f45 SHA512 abfe66b3242eed64b0a243bac35f2dc06faefb3b5c1dc27b60b150990a2e0c6527e359b0d4e1b48d05e6bcb5f1ef8f6f67e011691b57d4eb8b8a0208f6c8135a
+DIST github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20200226230617-d8334ccdb9be.zip 958154 BLAKE2B dedc48c0f805ae9246c777dec325f01d8b75c06240229143d2727d27463c8144568311b6b7b4201d8286da2c60ca87ae597d203e06eff7ce0256ccbbf678b5d1 SHA512 226087b2866d0f04f8a1f063c640032a5eb1b5d657dc017ed617fa338b7d7f9fd3163f52634ddc5a2b3ae7f02e1dd6d788ac75d919af4605f4005c65d26be410
+DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod 34 BLAKE2B a4bf0454b86b8bee83b8b7c1af18459c17c527c3c30546cab6d4f3e950cfb7336d70d7154c2b799307acd9df81bdd341722555ee7f91a53a8604046039f3f337 SHA512 d5fb8a4b7587a35d372e8f0710899a7df4791ac0f0a7fb96b8fe2330a6d676ecba8903aa9c86d810b0575e61b98543bcf1ebc24e5961f1947e934d6acb121736
+DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.mod 34 BLAKE2B a4bf0454b86b8bee83b8b7c1af18459c17c527c3c30546cab6d4f3e950cfb7336d70d7154c2b799307acd9df81bdd341722555ee7f91a53a8604046039f3f337 SHA512 d5fb8a4b7587a35d372e8f0710899a7df4791ac0f0a7fb96b8fe2330a6d676ecba8903aa9c86d810b0575e61b98543bcf1ebc24e5961f1947e934d6acb121736
+DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.zip 55046 BLAKE2B 3b79219296ef31cbf7404bf3c6290e20cc0d8b55650d7ae8f98cdce894839a0f7c105af18a8018b17366e8fcd0aa182eeb4ded9197c290824f583676026786a1 SHA512 fbe6d7b023d070a93eabd1e5c2675d5116a9bfadf9bae3ccb209e50b4537d68044d48dd88b4e6af03e0332d33554f6e50a847d979aa769d50e9090559abb872f
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Ffernet%2Ffernet-go%2F@v%2Fv0.0.0-20180830025343-9eac43b88a5e.mod 35 BLAKE2B d74f0deb84e43864fb4a447289a83fbe23aaa185ee273a460d8726ebc29026e9899ec5cf35d3356b7c8bfc2908b97687cb5f8aa4ec9af973477f3d3d9a0581bd SHA512 18bdd654afae1e515f559edcf9c3782bf67ea3600781aef4f96de613cc765db6c54556fe97013b3107a121415e3afe98c9a3fc1abccddc3b49611985a09df018
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
+DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
+DIST github.com%2Fgenuinetools%2Fpkg%2F@v%2Fv0.0.0-20180910213200-1c141f661797.mod 35 BLAKE2B 7fc896729a5db9315caa3d40597c165bcec0ed81595c4834774cd90c005628f1d1c93b6d190f7f861d65b2908604b409330c66d36fc6fcf46bffc09900ca197a SHA512 1eae884e9dbafd573a380ccb8019472aa1dcbccd289ad727f2141c6225f3299226fbf23f688eaf6b4bf90a66ca07b3302bcb2c56d7a6bd5d06d5c6b400a3de74
+DIST github.com%2Fgenuinetools%2Freg%2F@v%2Fv0.16.0.mod 2928 BLAKE2B 6fe02174af4dafd42952fcfe2154097537ec8987f08f033d5a74269af29be30c69b7eef69cc99b6818d8ee6bb5f12a52a472a21ca935bf47c9f85ed45096137c SHA512 03748c7577b422271927f5ce5a2db942af24d0555071afdf6078487615f9b1f7c60822acec9b480d0b3e7c2514490d5013c134034faedf9f29b8fe133d348dfe
+DIST github.com%2Fgenuinetools%2Freg%2F@v%2Fv0.16.0.zip 372886 BLAKE2B 6cb8bfe239cb9485e9413d4b5f06d5c6b5adb23eaf0e89024d015922d2614c5e7535f6f9d6e60b7dc5411f1822bc2e73ed4a2ccb050d1aa91aed9bacb8182b70 SHA512 d5581f1d3c54e2e5f96f868977af964a954b0a307ac64bbd5b37ae2b6732c80d7ef72d3b05767598d1d3cb25335308ec8e453842491c57694f591235878e702f
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip 91123 BLAKE2B 16eab5a0f642cdf2af9b9ffe96a6e83ad03f0a6d7898841defe1ee5855de12a28939c27c7cfa5c1a676c8293238e6282256ed22c10a32ea47bf3d41f7b2fd507 SHA512 74be69e28d337ea6c5a8ad4f2a563f0480d04efcd1e07d75cc73c008a79e5dc9bc4f8eb068a7eae263729a81f686f5614af211ba78dcdb786eaf65e4199e5363
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip 91628 BLAKE2B 740176e3d836aea1d048b055add89c2da65bacf5ff93315a62d33a82bce287dbf041376711f0464eba8e71396f12e411d867e719d340c65d790948a17bab9779 SHA512 14f8d0a81caf385c26ef681e16e4045bfa0f5f08d90d68de22f17d6f462c592442a78d24391f7ea3b6e44e8a035b065d00d72dc34a72c50fdba85cecd118b63e
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.0.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.0.zip 11203 BLAKE2B 3cdb4967b121474511dc3f7e8463fa7b3cc0adbea294bb1e17fbecdb4d7b3aebc9c19f61618044f62ad60c6ce765e90760a7429fcd817fc5983a8f43db3b7a76 SHA512 d943de66074bca8eb0901dda9b7b71a2b7aa70c9004e2be5836ab94f43977fd6f02bfdbc0540a23d76ad67fb46d696201badf220e1ea4f377537136839ee7938
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod 84 BLAKE2B a4c32df89469a4b93e0d85b867852d870bca997fd2d31163529c9a9f43e67765099caa6dd708e2edc4500b5496c4d36445d8f5c13ec9b08345d6f155dd68fdf7 SHA512 435ffb431d95016e1b15d4bebf142423ab3ac863a17a8ceb4a1595892e1a786a77b37ae0d3c63cd55904e92a783fd908ff5d79f9eeb5e1ebe98dc7e2c0b9a078
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip 171611 BLAKE2B 78ab7e9e5b381ff74c6fa1e25dacb3da3e8e21b86d59372144aafa5a49bcb3f2926abb373d102723c6e690d3056836a735d004f28fab7cb1aa6855d4bc3907ab SHA512 a7b2bbc09f09b2a66bccea6ad20fd04078ba9004ef07a273ee85fce81f2271e036eb9db7730d37225deec64ad2a4f09f68269bf187e9273231f78d47e1dc5ccf
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
+DIST github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 30 BLAKE2B 342057d82bd6cfc545f94289ce6dda498b35f949a3e5f9ad978910e5fcde556edd6e7a3847d136c5ef40115d99d9718e0c2bd2f420ed4ba72a4cbfda31db4c6e SHA512 fdf76199e91b2db4f75d0f8ce5844df0c4d0ea77319bec31ea1cc12f67121ebdee9f236eac8f6410313e84e3d4d625b92105802b8f1bf25de49c870aa6574d49
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip 458249 BLAKE2B 54ddd18b48745d6ad5a14e52a3eb57e28dc5d3ae87696a46dc48c867c7474af1b496d941005248f3af82ba4d2b964516e0325039e0d70de3758eb39e7c17abeb SHA512 bbde51e57a81708409dcc88617f1f5a4f7756c64912c4d0610899c6210201eb50782435adbf84cf622a47dd9a479c31113854d7976a434b3d882d218478b0e4f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip 458317 BLAKE2B df49024ad50c301d81d451351fec1ce0e3706c602de5068deeda6a0614412e49c0d230b47cd630cdc90a6a5bd4761e66f4f38554fd4b60b8896aec768cb98e19 SHA512 bc1c7eeac13afd27ba62c1343b697480a61812ab15231efae740c716f0a6abe2b53c8a40787601624af9017cd36463cc7cb5e895f4fed0de6e52a3c248bd0a9e
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
+DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20150127133951-6f45313302b9.mod 31 BLAKE2B 8b444a2f4fcd8323bb5c69f5b6a534d6d2b46b8f76a5cef4fea77c9ea8f67846a69daca9405d70182bb28804458214ff53cdff13a362211216f287e00a9baa5d SHA512 bf92a95139e1c279091b2adbc91ad5f0ab9d93852a2852a8701c753cb2a54a866b7d442f166c3b11e550cd04165d703f4cedec0479270b7406133b06cc99ca16
+DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20150127133951-6f45313302b9.zip 8716 BLAKE2B 371550dc6d8c6113510b7ad13670c07e03a145856fa41df40106d4c301984306c15a107c55b6025eb3f765688e071eae22daa9733f27a3970068d05278e5b77a SHA512 9bebe6f57548beace50333cc841162ec9a377dea9aac5d6be81f3129985a1878fbf892a78f8ba635a506e67f1fb8c9c842772c8b11c220b0f25ff24240dbdbed
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.zip 6042 BLAKE2B e2f7528550bb8f14d3f1546786616d85248b896e5859c0cba4ed17cab5af3f37765064621fa41fe0ecd46646b547ac54a48fc42070be9271f6dc333eb7d174d0 SHA512 b062352a9628f1bd9408dcca0e1062fd2c20c7bb7e2ab03518f866236e914706412cfefdc21e7b836ab9f569ba0d93733bc1a3f3f0ef1ded5086075826b0c708
+DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.zip 49324 BLAKE2B f38fcc4e7ebfe5ae0c0ca5eec73bc1f160e9e1467582b4ba8fadd019e8172d5c92814ce0a041e3f33d63129d80cd8210ef6ad14648b73ba483c7e4a9e47f464c SHA512 ba82f8bac4bbca155cdcb7ca59a4e9754cefbd65e45f84a7cd1cedde5e415c59e7a2a4f7ead37a615e3622cb8fd792070cb8f6fce4b9387067074ce89fb9b3a2
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip 52079 BLAKE2B c04668f509f8b3bb85f90304bbd60ab871c2dedb9ae91a363e692951d6be27fbca226016aac4dd7eb345face0f8d318fdeb99a68b7f0db6c41759a09aca905b7 SHA512 187e2308e2a487929d71144596f7e0dea1d4e85369eb2ec94e79bfcdd895b3355d0a9ff75f68d0e915f9c45e4140549d1a470f48dbf588a43c472b635c744b28
+DIST github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod 48 BLAKE2B 1928fe4e63005bf9d678f5d275400bd3519d679207918c44b0d93e829e1171dd1dded06cb8d82109e1f0b06b5b8a3f5124f1596e736ed83c15b6831de57a271c SHA512 dc9bf8e49c8937007be31d97dac8bc58e0ff9e983b8f287c50944ba074281c1e2d20e643cb26fb207a936a1703680a2884ef10d07bb0b9fa0c545d5414dcdb91
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-opentracing%2F@v%2Fv0.0.0-20180507213350-8e809c8a8645.mod 50 BLAKE2B 76c2ed48a610007fab08579e78ae1e2b1d038743f93b5ba36e9fc72814dcd1fa19c1afd655b6ba807448eb59010e680950cbd251cab89e9be4b0807a72b98c59 SHA512 5a6cc1e876170eb0017797932588f9a5fed08b3e49ecca379bd496d22b3b376f5007b4b82376709203a86b110738597e2863ccaa76ddbf56124541e5dfa0e1ab
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-opentracing%2F@v%2Fv0.0.0-20180507213350-8e809c8a8645.zip 88686 BLAKE2B 416bfa10eac7748a5439d6844b402a02f5f648f139942fec8c540c242447b9ee6945f512482b452448a3af6911b81ce724ebf872849175886133a405433e5ec2 SHA512 1ee1035105d982315dd77301deb2bc9175786711327624ae089339551333f1276794400c98b0df1f160f622baefe446376d6c774ccf0c203ae27a605034281c8
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Fuuid%2F@v%2Fv0.0.0-20160311170451-ebb0a03e909c.mod 33 BLAKE2B 2e38d5740d126ffd44a5cd3d08d36b199f703cfa71ae7a056358772263293b29336db7ba1ffff071ba064727f2ebe1c4be4138d8216fed1ba851e170a51e92fc SHA512 bc2e62927b25e1f3526c5cac02a02ea16f5950cf53c261b39dbdbcd59351ad9c61af40330a22ba7928628890254b7f956cc998a9799991421fbe84ce9ca47661
+DIST github.com%2Fhashicorp%2Fuuid%2F@v%2Fv0.0.0-20160311170451-ebb0a03e909c.zip 7144 BLAKE2B 13e521267bd5444cb3a0e65af43f1a97444e4dfb3012e03b0f1b244bb70592124a8e565675fe05b42dffd1d25ab865e6b46dd0e9037e0fd4b352f7d52b79b8fe SHA512 9aa4091d80a66770ea7d4e85747e847fe3d0e53d01584c006a49672810b89288fcbe52e70fdd6e1fd54a432451eb06b294c4ec3a876059bab80d221031fb53c1
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20191218070446-00ab2ac2db07.mod 45 BLAKE2B c120fbd8dc8fabd192e93cd22f7361a058c95c5b69cb18bec7d186837a6a3aa6dab60fa03a46f018283cd98bf97a1fc2494c357961958c97389227df13f284f7 SHA512 8febfa2a5531be6d97dd97d6c6d5bbd5f7f8e28632766162d5a3c45d084b03608914cafe2d740cabbdc8f900e0b412ec988e4c0268a40a846064f384bd1cc3e5
+DIST github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20191218070446-00ab2ac2db07.zip 23779 BLAKE2B 73aff9103f3014ce0211cb5f23e5b7a4766e30c13dad6f0004fe81b423d44e509087f0198a8f44b0428e888ecf4022b2cb1a4ec34f01a632bb6a18dc82ec880f SHA512 cfc44c73264d55878b2017f957edf246dfa321bc25ec77f04a248f628b7d65073ca9989c2ae1d2fd7ef02e50d936d7bc2b266a0ed2c936020f67fa6c587dd530
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod 30 BLAKE2B 672d0e9f9aaf18bd8da762725652827a96008d49cf50ac4c7a9776d884b15dd92a7738f49ce870b53c9136976487ea8b64a31f9b689615e16327b76a22ae605a SHA512 65984a32ddd3eea6fe699c2e636cc2368a11059756fd1f711ecb20930ac5a9bdabae5735e9d4ef829bc4312219bde9f2907dfc7864dc53c2a580fca3f8b7b39c
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
+DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
+DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip 8207 BLAKE2B e83d1907a09b00eac0ff79803983863e643961fefe9ff69fe0c8ca7ea590d0878d416109df385eddaa7eaea4cbb86fa60ad0df16a09254fc16d06cadfab82219 SHA512 c4d665252984e51420039cea5d2fb7e435b31cf8df3fc915bf01eb19b739514ccfd632c6e4b4f93df575b0e1fb02ed7ea822a5e02790442bae4e421b7cff44b4
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod 34 BLAKE2B 420449db437a4343e47d666ed912d5c57298ec80d13265f293c3a2294624cdbbce9fa319e47ee530da73bdc06d48d80b4a590a03fa1d741f089ab302cadf071d SHA512 ded99f470ac6900d2627d6cefffc4adcd64946cc036657a805f90145aa83fe05478df9eb994059cd8d9613c75f3009221ab0405bcf7e14b00d5d950e09f3e354
+DIST github.com%2Fmoby%2Fbuildkit%2F@v%2Fv0.7.2.mod 4332 BLAKE2B e2d0b37c4c5872e6a38435362ca268437eba47cdf9509fb087fc513701b764a2c7cca39a546f995fa367f3c1f2dec5ea416c404992b2ba0d8b49d56713c1766a SHA512 529f95678a56afa1e274af89a992a04c7a6adb4bd7c3a15350273a15c260b8a34be1b7d6852981b6d0b2aae8dcaf4f826a2545427ab2ff53439ea7b516f2afc1
+DIST github.com%2Fmoby%2Fbuildkit%2F@v%2Fv0.7.2.zip 796470 BLAKE2B 622c735e410594e5a09ae70420689ee6bd73be79b33c37028022822b331ec85b5d826ea69d25dbb434d6c63914acf97e5b7f9d4220f336b2c3e0f4f02abc80df SHA512 9882e3573611c8eae8835efa92ba36998d1b2a5c8dae002b0e1e1bf4d9872fd24ef0b63afa174f9f290307032a1bbf393d0cda5df71bd10d1bfb80ce069afe60
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.zip 57428 BLAKE2B fbf4df5732ec592055be959bdcdc61cdbc34d7eebf9943be51f373c07ec454cd4b69ffbaa29e05207765e9bb5e7f2f96ade50676e2f855d9140808abdb37a8c0 SHA512 b1ae387299086dc7cea9482ef991a5f36cc68f4598f0fdf179ab4d3f774632cd1130a45397eea2dacc0c7fc92f9491d0827e6e666c1f64c6dee0150d58f943cf
+DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.zip 244154 BLAKE2B c770944d112fe8352d48de60bf0ef0c656008eefbe1ccd0e498e3f129d948a77bb625b6f2b7f9b26998774bf1a5490d1106774caf2171e7c7d2bc3a8e2338ae9 SHA512 fba02794ec34d0cf1083c48373889c62be424b5b0b63a614d64bd03718bba0cd928fa5d6124bc71ac014c8cc8a644861e0630bbffdf56295e56c670fda919e3a
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip 157699 BLAKE2B 15dfd7933294898066316bcf6a0943e1dfa8b6099ec8d7f05425561f622c4d81989a239d46543c37d9cba761eb08ab6a1bc6ef1fc8c8f48fc0059edfe6720ece SHA512 286608571a79faf71bc8cbc29a77ad4478cd2a1d6ece91bdaf4a7c056141a154a04c2c8a93612c3d6536a6064b9ac9198527888a3fc0cb7756ec41548e7dbd31
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 27125 BLAKE2B ace23a65113f48afafaf52d19231b51238dba82a08a85dc615a0037b037530f3fa3bba1af1ad885eed9ca453aeaa0e2585d2f1b94cecdccccf2e32d36a86f11b SHA512 95dd5f43096dcde7c21338e393977b2d8ff3389b9c9b24ffc11df2cffc73b26f3f16a6406b10281add7d6d952ce2276639ba94929491be7792a2cb8f40746bee
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod 52 BLAKE2B 451e6b2dce76ac1525c48f536a0f9fc9ae773978ca7b9356bd75473e075877d0127217cbb5695f1fe406295c02a7a9d5424f2f7d4520505d0119834c11645785 SHA512 708918e1cabb5710f63858f35ef5bb197666b2ab8220ee48b47575b77805e44b083dc7577ad3bcf9414fd801653c21be9582086ca73fbd9c5589380a7450a400
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip 34573 BLAKE2B 156844533eaaa6410ac116ec0bddc68ac155aebafc017c51e6fdbfe0425a02dc878e8515795e9300b6ddeef776aafabb60ad0c420a1acb9b0fbcfa1fc0f84905 SHA512 be04251b483e39b4cf503ee442344d3ac1eabcc7c41acb56c25d65ee35eea414f798f159fc168ecf5594b15b9d5349c96cb9741a6c5202cab4bfeb104353a9a1
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc6.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.0.20200102164712-2b52db75279c.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.0.20200221051241-688cf6d43cc4.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.0.20200221051241-688cf6d43cc4.zip 615485 BLAKE2B 0709f67223d075151badacbe96dcbefff8a8927b99ab2f24155962c0180af7ce5b13b46f1bc661886e7dd1c5aa83067a9f998c6d279cb5a26e40301697f9b80a SHA512 e7699312c564063e063b568732848563c7aed63b561a6df9255582e3dd46202a43d8da307d2f4066c99e89304f53c60b0e89bd64a7bde2c97971504f60d6b007
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.zip 79636 BLAKE2B 54d182e4edd486a8d2ab61cac262b8227d392430730850cc670a3dfc038c25325a60056565e383a94d21c5016c28d86255185fb6cd7e75edd0f99e8e87d8085f SHA512 1674aba312894bdaa50e2d5b91a65ac557daa696289f395adcc1f458dd1298c305453e38b85c7ff6c125ecb7ba57904f4e23bc613b0ab09171018223e1f7db36
+DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.2.mod 146 BLAKE2B 5f1b9af6a04921a636cbef00a5dce3fcd8dc2836d8922a16b4abb1b06f898b9fbafaafc732e5c43dd774f0bc4416e186f936afd3734aa08be41908ff88971aee SHA512 737cceb5d3f0b5a231216e0b264ef250e550073302e4b3ff6fab616a90a4652a4ca7051eae98dbeaf1cd6d13ab703bdd6cb12e17ed7d2c44c0bde3a0f0a435ba
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.2.zip 27107 BLAKE2B 0fe74b88e85a3e508134750d89d8276f5819c8c73cfb06f69f685c7dc16e690032c13a8fc3367e5c27eb9f390c8fb46fdcc442fc9cd81c56b8ad67e7a857a14e SHA512 ff9765aef5320032664d33d84de687854dc304a1c311c1712a98105d8d3d4f35c286533cb91b279439141254d5772689700a0b34d10bb5313d2288484536b60b
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv0.0.0-20171003133519-1361b9cd60be.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.zip 34113 BLAKE2B 29aea1a410735b812d7a0df30523e7632929f836ba18cf7329e0c1bae5b918ea898c8b10e59b9407b6862d28236c8877492a16e48fce256c0a5dc2ed6e798cab SHA512 5f35c076ac542650bc8d43fa4937f8f3e2de363d61909928d165a7673718f5fae0b0ca4d5276b31e044aff3f725982f4b56eed908312959dab24b344aeb5b88f
+DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20171029140428-b1a47cfbdd75.mod 48 BLAKE2B c08c41c4980afcb2ed505a0061f4139c9af4242068d0527ee2f5f82125a1fa3db4c9c78a0995de0aac8fd7f86bbe134843d80a5659cdea287fd33bcadf85c208 SHA512 69c3f270258679fdd5517bdd5c08411bfc6157c63c52970fca5a223bbb192559ef67981fb38d1b3ca8498358cc98a640606a145c8acb98f224b45d48627f281e
+DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20180702182724-07a764486eb1.mod 48 BLAKE2B c08c41c4980afcb2ed505a0061f4139c9af4242068d0527ee2f5f82125a1fa3db4c9c78a0995de0aac8fd7f86bbe134843d80a5659cdea287fd33bcadf85c208 SHA512 69c3f270258679fdd5517bdd5c08411bfc6157c63c52970fca5a223bbb192559ef67981fb38d1b3ca8498358cc98a640606a145c8acb98f224b45d48627f281e
+DIST github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20180702182724-07a764486eb1.zip 8880 BLAKE2B c6df8c2d863b755bb58d562100caac661c62f68e40d50b154979da87d86b8d6988dc8fb2969161ef68eebd22ac5d8d6123700fa303cca52b8141203d86d5992c SHA512 90722a50f1f57633959503b5b780766a78512aa1801bc501f251b5cc25bfe6824fc329f63678c8a98e04fd9e558711d35c2053a19c6a9cd89c8d290864dee648
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpeterhellberg%2Flink%2F@v%2Fv1.0.0.mod 37 BLAKE2B 019204f78ffb09224fe4150e0e91d86fa5ec8367d9176b36bb304b2f42eacb41ff9cf1bc6e8433f1f6af522c57fd0762a029821aa4c5e5d5402c9e80fa7df26b SHA512 cf8dd9328f63f91ba5c1318d7418c07a64c03421068e9f528a3799dd691e9f1f8f819ce2c879f0fa9e09a99da42e3c638b4639aac9f105776b1eb15049f20fd0
+DIST github.com%2Fpeterhellberg%2Flink%2F@v%2Fv1.0.0.zip 5225 BLAKE2B 1e62a520b198663235bd6d62add09e8457148bac835d4f048887f94cdb66726cc2193b1514bd8c451fbeeffab051446c523791d90ce1250599d280f2d4124607 SHA512 46c0f0709e767468561d319d12f845606c2f200ef9e615064cc8228a39686d036ca8972fe2f91ed65752d4859e07f4af690fb438fc140da87405420ebffd76a2
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod 30 BLAKE2B f5ef9d146a30ae9c67d2f7e86eef366821045d1f7b6442681377ec8d4528e315b661373ce82bedce6dcc74bb3dd9b7b2e5d59c6d5fe6aae8302a09656bd61b04 SHA512 a8742602593700ae7d9d1bb18e567d5784239e9b158b2c9ffc0c16e1212013bb9fe49c4bdfd58fd2e61e1752b5bd0390fd6910d66e5ea8917450a3e41609d54e
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180924113449-f69c853d21c1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180924113449-f69c853d21c1.zip 190897 BLAKE2B fa0e7ac0a0bea7c177075c73f24d737be66824cf269f764181728e39456a1aa3331f87afb58d175f532a43c8b7d43a200edb8768151af141d12eb4eb781954c4 SHA512 9f2807749b564afe1fdb848d01f95f6f693a28d352c618d08b34b3f7cf9ae007eeb6422d4a928c4101b718263a7d7d8e1004537e3a2613a7f631f379769c918f
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 68325 BLAKE2B 9b783cb98fd4f1ceb158d8a72ffdc7d0c232a8a9740de221b4321b2c7e240d98bb5f2bfca74222c6a7796368d48b1d3e315229a9d2c0436d5590bc200be31817 SHA512 25290d540c185fa2010b06596a70b6d06d4ae14fd92b4e5596b48074e4e5ef5ec6b990c8d0bc39cb44f0c2a83a0a1ac4415f86ea4e3fb69970bb2496f148d0c9
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.zip 129149 BLAKE2B c28cf5021255ad8f2150db609ee74fe675f9990f14bf95024029330b950489a1ef1756e9c0635f5d0fcaf89863ef08904a3e7ada1f8cad8f42395a9221fd461b SHA512 a6e76b1d9e34fc77e2b39c2828c04cb3979407cefcd413aff5218bf96379dbf3b78c5956f8de3c980311375026018178367d105a0296faf23f92926a794dd7c8
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180920065004-418d78d0b9a7.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180920065004-418d78d0b9a7.zip 96902 BLAKE2B b9861291fa35bee207c72f470e9d43f78ad68b5bb04bc30e3eb9f117686f2d7fc401e20bed34ec51aaedfa53e814f87ee3cf109d941f938596690ee4e01e9005 SHA512 b268e39aa38a803e5afb6a0b8dffc097b83ec653f2c092c4ead344d2fd4abb20cc2096475f7ce88a30a5a81571b13c465200dd965f246313d6060fbbe44af64c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip 188550 BLAKE2B 6163258786861881f6a7b621f8578e8dbe3eccecee396c3564a88686cfe72584e234f593847ee5cb4fed6a6a1009f1f14da8238f967ce5d68ff919410d25d8df SHA512 42a764174dc4a56c6e27b0e83004f042b3fba397039a923310b8bdfc658ec24096395f27bbd69e8275c1d0f0ea45ed68c2015ffdcc74b6186c6d1497f0ea1e6a
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fserialx%2Fhashring%2F@v%2Fv0.0.0-20190422032157-8b2912629002.mod 35 BLAKE2B 94a509a8d541a0fe5826e711c6c73d4ecdef000a04e6996f80bb4bf183db05c4a0ca427f3bab329b2acddfd11080a913ea1c805705c3a322b19e2c5379c518ef SHA512 9bfad30911f387eeef0c1e170b9659270730649c0a15ca736747e052df7d2530d74d6625f3f3fef79d37542f3cdc5652d5446b7c2ebb5adfe9eaf21b2efa48e7
+DIST github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod 34 BLAKE2B 5844c0db6ae64aae3cf731d2d71203d29aa723f4ac32760f4b74a4fd21bc55829dd0c5ac9fcb71c368026f9f60ab48a623d976e1de5c7a0085e095b701903d54 SHA512 96df2995b87ec379faba4c16f3e73b60edb5e9831384d171c260539f04c1cb6c66c5ee44ca1d293d9a68c9cb70d40a0dc09694c6a412f5445c353136f1fddf24
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.3.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 151788 BLAKE2B 423089b53512bb0c6d09fa259a266d879e2fcc1db85939481475f71df2dd91db5794e4492ebdf61cc6f694501d94cfe8e761f986f857f62e328e596413403304 SHA512 cf0a047c617e014bfcd50dbdf466431efba7d32186027dcd714e0a63a483d4abbbba00716265309f10477f7739406fd3710fa137a4dd6fad4a9d3c4ff84c991e
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip 37190 BLAKE2B 7c8b79cb736f53337fdd2878cd1d745a6da3d803c3d3f6a0ed53a86f1d4789d2c656c6e7a17f90caed496fac91fdc89fa66b1de7b2caf97409114aa59658efa3 SHA512 b2af82dccd20e9539d72c8629f2d4babd573f711a810fa77e629fec897a614776cc4ff857700c0b6eb32370a13d122504c0a4abdd3d9111eb8ac0938a0e7234f
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip 14006 BLAKE2B 98de01f568485c6909fd0e98a46e2cb040bc556c175948af267453cff5c750c32e95b27609b513073d374da19a8521e62f7a8cc195e0eb993662e1c443cbbfd5 SHA512 7782b65f0d21a519d280f1655257da7b15e5e433f3eb3ff4bc963c81fab22cc9d18ffaea0786d9a7e9f5f32425353c055ea8fcc1daa1e8a30caac47ef2ef31b1
+DIST github.com%2Ftonistiigi%2Ffsutil%2F@v%2Fv0.0.0-20200326231323-c2c7d7b0e144.mod 1177 BLAKE2B 735b5a8e76cf8d23e6fdf18e2ad796355bd6b41eb67246d29e75b901a2fbfd510f84abb192d4a849686a9e93a24b3ed8785498bcc4f3a22443c628e7fd6faedd SHA512 d87c2e0c39ffd5e4c713037a2cc5d17eb64290b6f50869f9887e236799c5c461acd2589044fd6ed6a88519d3d3417b324e88c9dfaf3eccedcbc6b6409c7c966a
+DIST github.com%2Ftonistiigi%2Ffsutil%2F@v%2Fv0.0.0-20200326231323-c2c7d7b0e144.zip 69211 BLAKE2B 9c68272ec1a7e5fab9f81b8604ce2bd2409a37e7fc85dda58af2c180916e089ec479e4d8f46a3bc3bd19003f59d6e9dcf6d5ab572df501cb46efbb60da3f8d1a SHA512 c546e9086ff873b8731e2f000539dee8743bc6f19532de2d33d0aea37061efca17b6a493671fa31ad6d0292de4808c4ced9b1058d6da1e9eb60bbdf39ede321f
+DIST github.com%2Ftonistiigi%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20170803185627-826af9ccf0fe.mod 48 BLAKE2B 4f13249b4688dd488564c40ad14989f0b70049e96cc3e9e53a27a1c833b54626d41c87ba89edeec7a2850222878b554492fb631a5a8ee1fd0f21e03c49e9c94c SHA512 5ba53b4bab812bea70c600da351240c02b02b87f0e623bbcd846f89cfdd2fc146b84036623f8e2dce5b44f2b4fe6ee74ab9f930ed9d3a3b62e1387d569a53485
+DIST github.com%2Ftonistiigi%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20170803185627-826af9ccf0fe.zip 22933 BLAKE2B 84233f43f3bef4184b309af77ae1a1d4b2028c54f63e879e5477b9c401ad008067f786a49b4d8729c70477ec209406fddaac0ff78360e6f60fa3157223e2828e SHA512 82ff44c752b6bb8596aa77f862616dfd2bb73ab2a610bf5eb27d7f9a8c05f61895ad6053bc72b42ffcd91351eb34c02dfae8b9a1aee7e9174c8a7fb17f9cfd1c
+DIST github.com%2Ftonistiigi%2Funits%2F@v%2Fv0.0.0-20180711220420-6950e57a87ea.mod 35 BLAKE2B d787e84ef1bfb91a2e2db10f06b68923366f840640ab2a95bbf8f02b4e62b2b6b9773dd3d9f3d0cbdcbc1cdb03cbac578b62f4dd3806e2128f2ca9a9e74736bb SHA512 9ffaf1e5238605376c072d98a7a0fa7d27ebfe5d9126391821ef1337ee28753d4f6ee01377d8db71b9928bac009f115faf37c022a67ade34e870235b13bf5f28
+DIST github.com%2Ftonistiigi%2Funits%2F@v%2Fv0.0.0-20180711220420-6950e57a87ea.zip 3967 BLAKE2B f945bee17ec2409a0a9da1edbabd1fb98ff452c246dcce7173052e2ec0e07dff239d8b6fa3f6c42e0e056fe9023b7d48e9216c778ede7844f6afe821569fcdf4 SHA512 8f9f9c1680ef685950e8c0dd3f4c60a9e9c4a275b65997539ff1df851fbb6830010cf3e03b42993922d80539cadd4123d1f81d5cc9f3655d59a09eeeb88bb376
+DIST github.com%2Ftonistiigi%2Fvt100%2F@v%2Fv0.0.0-20190402012908-ad4c4a574305.mod 86 BLAKE2B b1e144f63c002d64ea9e92ae2d05fc454d5eb9e8addc31a06b86d70cd189fbada9189304193dcf5fd2be69bef030a5a75423989f4a8d2b7151930d76542af8ce SHA512 d9ec6e5960bf5e3b001be628d44ee619c066a033847364f9a923ca185b32c77c3b4eab912d5669efc8e0cbc9aa3a4c5ad51812045109c2e9bce712728fdf2f43
+DIST github.com%2Ftonistiigi%2Fvt100%2F@v%2Fv0.0.0-20190402012908-ad4c4a574305.zip 39019 BLAKE2B 6fd3e5d3f25c4bac5dc60e135ed4c99e58ba4b9e79d4f2360cc856d38073fd84d3d2756e3e8fb40da4cbd49ea0e7888322ba8fc1fbc2abd79eb219a86e9e3e54 SHA512 0e2877cca96d23298a8c46f469853ba7f938afec949d493b79b7ead8dbb4aa406dad9c1ece4938cbfb332b11023324992f6581824815866bb4d3be0cece71e67
+DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv0.0.0-20180103221425-e02c85f9069e.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
+DIST github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv1.2.1.mod 34 BLAKE2B 86524b6dd4255f923cdf5eff9681366c6eaaae6fe91f082ec77b87aab1ea6c96d890ca356e06abcbf7219590d08a6eed13131d39a253ca03baf9614c1e775506 SHA512 57a8b8c1e0646693137815a820547a8b9dbb35a132b25a735d1fdbe1fb829efab1eeec4907d5de44e248e953f033f3bb8040f6632bc899238b4329be1ce552fb
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.zip 75925 BLAKE2B 3905e6c4d1bfda6516c0b008dc2ecaef0d7266968721307d1cb280b83dfb491811cc215233d1c93e5c45e7ce4b66d2447f850bf78ffc1f9f9a43d88ebef510d7 SHA512 72defeb12c3929fbbe359a54f73932a5c1d287544b13c3dbf8dba8e58395b78d362763d9686593d8ef0e7a7c8be7d0a82367c81b53a7d2116fda102ffd286749
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip 106836 BLAKE2B 1dc75781d1462b8b6d646ef09cf402ce7e301a981ae04efdfd205274cb593cbe849341374adcd4239887e4323d937964850ff4caf203242ac216fe0858f7fa60 SHA512 ebe55034b03a75da1e267c7cd06517a6e429d96557bfdd0253ef3967576d57b5866d8137172f15cad0875c009c2bd2efdb6994ee82c2ba83e804e9e8531f4a14
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod 38 BLAKE2B 3ade12a1ed924c4e12dd9422b763bf2cadf710ef072d593dc40923d48477b792d87aaa3035e020bcab860da3ceeddcadc44afd74d9e11c3902a5d6241c8826b9 SHA512 637521629966c8f1b3d711a2b2b7b1753bed946f26570cd8e5e55ee3da5b106d418e0b80f48cac7a2651b71103c0d09116707d7b9d8cfb2d78d7bac2e908560a
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.zip 160183 BLAKE2B fc6ac9b8beb1c1edad738f821182d572e2e655442c32d4dddc27c0213a5d13dffe3c107f6f947a528a4741972d72af879963f1503266628f365a96ab8eb21d83 SHA512 d6b124a270150ab54764406789f23955f5ffc09effaa2b7f4ae0c2d3b69ad916fbf8377f48ee5650bb57a0e9ee2079a481d4fbf146409aeb29c15eaac260f3ef
+DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod 36 BLAKE2B 89b77c2e7582554fd3a63f99bc03f2886e9f554e579ee4e0a99160385d8704b5f983e5680da06accae6bab806d303b726b22f2b4a6c2b03e82bd6bf9a9ddde7e SHA512 8f581beb7e676d082a76b9bf47b7d04c486d5e96e4f69f17fd99efc101e408cd7cd1c8d51a46ab1cbb55f7bb35b08ba8dd875f18e430f30ba9c88c43e44056fb
+DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.zip 9506 BLAKE2B f2ca36cdbfaed586696e77a17fd3ee88c158d5fba569d57685a09e6bc6eafdc36ce041d58002b19dc7a87ece0fdba73c793fa443ec31a2a33ef0f4030edcb447 SHA512 0baf36e3d814a78b868cfb028e116b734907c1cdb8898d5cb28986861e96f75ea8d61725f55c01974b4b5d74a4494a5f52a34fd38c9d82ebf97691244af8682d
+DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
+DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod 40 BLAKE2B d9bfc152a45edf20400c8f59ff6f7d20ac98441b3bed903d1215a98ad5b59aa9037c3dc413b750a34d4784a14d98b6441b47f8117624acba6bf69202345c43c1 SHA512 2b18d1b7379b2fb032b531119bc11adf0d7ee3b7cb490db5fbb2d7c80f04bfcceedf474012172da27d75f4337902929fa49635a17ac436ccd3df638e182c7932
+DIST github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod 37 BLAKE2B 65bb120d06237325c63f8f722a251585f54d2e7f5c70dc35554fa50147d94298bae6117cee34fc6fa202e96ffb0878534d5eea11775a83ed514d33d4fdfb8775 SHA512 cb07bd4926b20e43b08c9f6c29a74eec6b9119421d56d48d69da58152ce8ead0520197c72109579869f3591fc8f8d05b7bca3d274d383cb65b7a023fd9428ed5
+DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod 50 BLAKE2B 1df5b82dac953ff568a0709714e04e4fb31f384e8160fa933b9aaa579f311eabd38c42781612c6d39b7eefb1f995251f74b5ca5364bbd9d240f6896df3257ca4 SHA512 a921e5321a35252f98bbfc819df7177a500b64665f710f2b833f4187062e5c2f050daeeb5230c6cea9dce724823eae24d272924742df53fd3437d9bee9ad89c6
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip 115621 BLAKE2B f59bced3cd34292c237fe5a472a66fabca151ffdfd39553bd060bcc706433c248d0712fc4fcc7c44a67ee86fb3517a30cd1846c5c5e70b4549d42c1f12be9495 SHA512 0b6a8a073673708adc8fc0d01c96fb0ec4276db63a17f45ff02b4243235de9634952747aff63382ed767157c6dcbcaebd5399ace63a14e52cc826bd5c9749f82
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180910181607-0e37d006457b.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip 1870169 BLAKE2B d77b65d467395373431c09d1318cd73d2dded32c6c7bbcaee6e59aaeed4b8ce1c183e32747f8da207762d82aa07c186af4b9c06dca9d4b5cfcaeef3bd07b3e16 SHA512 abd93a766353b4c36ff9527df785cf9789317755de2fd1d951a1847c4a9b43de197f6d7cb41ec6f17fd3b50617cfbf8e1d8c93f59f671be578a0152da0754ff3
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180925072008-f04abc6bdfa7.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180925072008-f04abc6bdfa7.zip 1331114 BLAKE2B 68d0ea061ef9403549a09a790194c625b252fb9217470127778f9351ab7ef787fc8b118158ba5ea0f38ac8e90c3cf04a509b04d935368e4d849bd44b92c0aff4 SHA512 82dc4bebe9d26c975e8d6a968b46941b2ea94b9a2a8e30d8d9a9c59b26638dd027941bca67f0991cfe1e573bb57d62c6a043a0f80d98e6df4dee232208fe4dd3
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.zip 1500176 BLAKE2B 19d7d151e8d60007d2f947acca62dac5191c8383b951d0b243b70b36e132eb15749352bccb94aceae00ff114a3273bf79acab4043520c34ba76d7a5e137e0366 SHA512 61a5ddd9691d95dc88f2a147f9a07fcbd69f2c1b573cb8ae895fcbbcd0b4f0a928243cad62efabdfe0143b8aa06e61e29057406ce3b3863c4c22fc01432293f8
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 24878 BLAKE2B b405b445c49834f5b9e5ee82326dcd5f4807963a38d29b851fdd1e914d2695fc5066e17066288e539818ddc52f83c209325d9318d1e4e76f9a2a9a1859f82ff8 SHA512 1f94b8b8c8e4aed577fba2cb65403424cd649c2c437c115d52e08338194f447a4939fb39d73237c2906ea15a4b5089642abdd0bc6ad8a34c8b8e6f097cb43fdc
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180925112736-b09afc3d579e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip 12802 BLAKE2B bd71752bbf787376638a3eb8369fb3f3ac4efdc057cf3ecc9f02318186011af009c17c0a7a3b9183b1bb6a88aad15128dc64835821c90d9bc2adabf6cb6ddde6 SHA512 2e23c18588f6f5cb58a6edc02b23ba1abfef92ec0d46c272b3f542354f8ffba45b14c3a328372dc46bd8118a255d3f3d9aed303a8a91ababd6ed296cba2aadc6
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod 31 BLAKE2B 679418ac9c2ad45dc432c1fb2f8ae13482bcce67e3d83f3204380a5fe8b69ecb6f19114b8e10656880a434e012712ad94bfe3767874d88ac64960d86dd5548ed SHA512 1ce907ff4c74870bf960dc786a8a2d824ed8794c433af026bdb4fe29c40c0812187bd409e3dfb99bb91414e0ac5f766d3cfe0badfa6e1ac4a3e54de3f14c40dc
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180924164928-221a8d4f7494.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180924164928-221a8d4f7494.zip 2667524 BLAKE2B 5153b39155dd08a750073f3305564877abfc22f5812e44cfa844f960c0d53342d839f2acc77082438fa4db65dafd33eb9e9520e5c589213c61001e424bc1234a SHA512 bf7ebf2a11d268f06a180686c6126cbb4a4446070e68891c9ffb35d364a082d6019d183b0c3de0b04ae4182a7449c87ed6b4ab40d4e6d11ec916a5f6ce5c8ec6
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200227132054-3f1135a288c9.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200227132054-3f1135a288c9.zip 8475819 BLAKE2B 293f3eb502a932b23b3ac663f9d83bb6118b5f5ee1fa44db0fd7cf0713c6beabbf70aced6cc8d5c42730a495e5e1f03e7b9cb45253c96bb07baceb6c5ca39537 SHA512 629baff3c7008fe504b8a0d1814ba21abf3a1ff27c0de55d3926896c444026c6cb99f55b0e7e30d79e87389488283012025266d243c7c8a57099c7b528d91c0a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.15.0.mod 903 BLAKE2B dd9ff44489e2a944c07f3e58c3246534b472b407eb15780bfcf9a30370eea7353a8ec12601a6c3e0e39edad1de6651df1c959f86a528a0cb53ff7d2e8514d1e6 SHA512 1e7c2190023d06747cf81e4d6f25aa284a250912ac304e3d590e1b85f5ca3ad3d9963a0ff7106e5dc55f82f58eea953c72f131f4baa6618b46017a575669742b
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.15.0.zip 711593 BLAKE2B b269fc5aa687739714af8986863354495176a313d604bd1fa364fa4c63db1f0360c3aed0bf0749754dd53c22447b5fca2ac8e85a0adff285290575cbd0a4feb0 SHA512 52ffe9ae20019bcb9629f4d904ae999a609be29146640fdf9373f38f39ebaaeb6ec96493c95522789b07a94942cd229fcbc16e20ee83f52d2b1f62631fe92f0b
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip 1142481 BLAKE2B 2b5b18292c24f142fafdffd7ca4416da8425f317e195b3c59fffa6881eaf42ee90722ec7d06f8dd39fff3b582fd5a08248d967d58204d5c55161900c01164d56 SHA512 0ba3e5799dc97e3cae5765bf607742bc3165ab02dcd774290b2a624518ab503c3110b9ea7bd889b9e898344aa679f0bb13f05fcd94514090f7d408fec81cd1ea
+DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST gotest.tools%2F@v%2Fv2.1.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST img-0.5.11.tar.gz 4743864 BLAKE2B 6e08ddce536d666539bca9d06fc14c8a01cedb012024ee7f970a7c4ea5a701f28b52a0b247e9f681e72bff1aab354e6f6d02d12bdde4d434aa2dd6ff92de949c SHA512 de80c2c26dd2fb780fb0447f07b5478e1571067ec934fb2adb32dff1aa3853ff872388b9c9c168c139194ab5d38672fb3b4c76c4f77fd8e61ce48bde8cae8c1b
 DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
+DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
diff --git a/app-emulation/img/img-0.5.11.ebuild b/app-emulation/img/img-0.5.11.ebuild
new file mode 100644
index 000000000000..154fb007ce4b
--- /dev/null
+++ b/app-emulation/img/img-0.5.11.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"github.com/AkihiroSuda/containerd-fuse-overlayfs v0.0.0-20200220082720-bb896865146c/go.mod"
+	"github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0 h1:LhS8BiMh7ULa6zkkF5XI6piLV5XVTR7mSm9j3hTUB/k="
+	"github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8="
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+	"github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ="
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/Microsoft/go-winio v0.4.11/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA="
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.6/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7 h1:ptnOoufxGSzauVTsdE+wMYnCWA301PdoN4xg5oRdZpg="
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.9 h1:VrfodqvztU8YSOvygU+DN1BGaSGxmrNfqOv5oOuX2Bk="
+	"github.com/Microsoft/hcsshim v0.8.9/go.mod"
+	"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0="
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3 h1:i8+1fuPLjSgAYXUyBlHNhFwjcfAsP4ufiuH1+PWkyDU="
+	"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20200217135630-d732e370d46d h1:UKAt78F1OvM4ceTn1VvXuYuatXohsFU1eSI2IBtTw9g="
+	"github.com/containerd/cgroups v0.0.0-20200217135630-d732e370d46d/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
+	"github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d h1:VuiIRfgJ2M3vYEU0F6E5lg3+V0l9YpbGQr3jpZor5fo="
+	"github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d/go.mod"
+	"github.com/containerd/containerd v1.3.1-0.20200227195959-4d242818bf55 h1:FGO0nwSBESgoGCakj+w3OQXyrMLsz2omdo9b2UfG/BQ="
+	"github.com/containerd/containerd v1.3.1-0.20200227195959-4d242818bf55/go.mod"
+	"github.com/containerd/continuity v0.0.0-20180921161001-7f53d412b9eb/go.mod"
+	"github.com/containerd/continuity v0.0.0-20181001140422-bd77b46c8352/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8="
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 h1:kIFnQBO7rQ0XkMe6xEwbybYHBEaWmh/f++laI6Emt7M="
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe h1:PEmIrUvwG9Yyv+0WKZqjXfSFDeZjs/q15g0m08BYS9k="
+	"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00 h1:lsjC5ENBl+Zgf38+B0ymougXFp0BaubeIVETltYZTQw="
+	"github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00/go.mod"
+	"github.com/containerd/go-cni v0.0.0-20200107172653-c154a49e2c75 h1:5Q5C6jDObSVpjeX8CuZ5yac8d/KIYuPzUHbUzdL+NFw="
+	"github.com/containerd/go-cni v0.0.0-20200107172653-c154a49e2c75/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3 h1:esQOJREg8nw8aXj6uCN5dfW5cKUBiEJ/+nni1Q/D/sw="
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328 h1:PRTagVMbJcCezLcHXe8UJvR1oBzp2lG3CEumeFOLOds="
+	"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20200121165050-0be804eadb15 h1:+jgiLE5QylzgADj0Yldb4id1NQNRrDOROj7KDvY9PEc="
+	"github.com/containerd/ttrpc v0.0.0-20200121165050-0be804eadb15/go.mod"
+	"github.com/containerd/ttrpc v1.0.1 h1:IfVOxKbjyBn9maoye2JN95pgGYOmPkQVqxtOu7rtNIc="
+	"github.com/containerd/ttrpc v1.0.1/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8NEo3bC/vx9pbi/g2WI8mtP2/nXzu297Y="
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20200205145503-b45ef1f1f737 h1:HovfQDS/K3Mr7eyS0QJLxE1CbVUhjZCl6g3OhFJgP1o="
+	"github.com/containerd/typeurl v0.0.0-20200205145503-b45ef1f1f737/go.mod"
+	"github.com/containerd/typeurl v1.0.1 h1:PvuK4E3D5S5q6IqsPDCy928FhP0LUIGcmZ/Yhgp5Djw="
+	"github.com/containerd/typeurl v1.0.1/go.mod"
+	"github.com/containernetworking/cni v0.7.1 h1:fE3r16wpSEyaqY4Z4oFrLMmIGfBYIKpPrHK31EJ9FzE="
+	"github.com/containernetworking/cni v0.7.1/go.mod"
+	"github.com/coreos/clair v0.0.0-20180919182544-44ae4bc9590a/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8="
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28="
+	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg="
+	"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk="
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM="
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg="
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v0.0.0-20180920165730-54c19e67f69c/go.mod"
+	"github.com/docker/cli v0.0.0-20200227165822-2298e6a3fe24 h1:bjsfAvm8BVtvQFxV7TYznmKa35J8+fmgrRJWvcS3yJo="
+	"github.com/docker/cli v0.0.0-20200227165822-2298e6a3fe24/go.mod"
+	"github.com/docker/distribution v0.0.0-20180920194744-16128bbac47f/go.mod"
+	"github.com/docker/distribution v0.0.0-20200223014041-6b972e50feee/go.mod"
+	"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible h1:dvc1KSkIYTVjZgHf/CTC2diTYC8PzhaA5sFISRfNVrE="
+	"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200227233006-38f52c9fec82 h1:kZwwJwYnVWtU/byBNjD9rEGWVMvwnfiKu9lFJXjrk04="
+	"github.com/docker/docker v1.4.2-0.20200227233006-38f52c9fec82/go.mod"
+	"github.com/docker/docker-ce v0.0.0-20180924210327-f53bd8bb8e43 h1:gZ4lWixV821UVbYtr+oz1ZPCHkbtE+ivfmHyZRgyl2Y="
+	"github.com/docker/docker-ce v0.0.0-20180924210327-f53bd8bb8e43/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.0/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g="
+	"github.com/docker/docker-credential-helpers v0.6.1/go.mod"
+	"github.com/docker/go-connections v0.0.0-20180821093606-97c2040d34df/go.mod"
+	"github.com/docker/go-connections v0.3.0/go.mod"
+	"github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ="
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8="
+	"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 h1:yWHOI+vFjEsAakUTSrtqc/SAHrhSkmn48pqjidZX3QA="
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-units v0.3.1/go.mod"
+	"github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk="
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw="
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libnetwork v0.8.0-dev.2.0.20200226230617-d8334ccdb9be h1:GJzljYRqZapOwyfeRyExF2/5qfv8f1feNDMiz0hmRPY="
+	"github.com/docker/libnetwork v0.8.0-dev.2.0.20200226230617-d8334ccdb9be/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4="
+	"github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I="
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/genuinetools/pkg v0.0.0-20180910213200-1c141f661797/go.mod"
+	"github.com/genuinetools/reg v0.16.0 h1:ZhLZPT+aUGHLfy45Ub5FLWik+3Dij1iwaj8A/GyAZBw="
+	"github.com/genuinetools/reg v0.16.0/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68FptL43tDKIq8FladmaTs3Xs7Z8="
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME="
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/gofrs/flock v0.7.0 h1:pGFUjl501gafK9HBt1VGL1KCOd/YhIooID+xgyJCf3g="
+	"github.com/gofrs/flock v0.7.0/go.mod"
+	"github.com/gogo/googleapis v1.3.2 h1:kX1es4djPJrsDhY7aZKJy7aZasdcB5oSOEphMjSB53c="
+	"github.com/gogo/googleapis v1.3.2/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.0/go.mod"
+	"github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls="
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58="
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM="
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I="
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls="
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ="
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg="
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/shlex v0.0.0-20150127133951-6f45313302b9 h1:JM174NTeGNJ2m/oLH3UOWOvWQQKd+BoL3hcSCUWFLt0="
+	"github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod"
+	"github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY="
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8="
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk="
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I="
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU="
+	"github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU="
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c h1:nQcv325vxv2fFHJsOt53eSRf1eINt6vOdYUFfXs4rgk="
+	"github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c/go.mod"
+	"github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI="
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI="
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM="
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 h1:rw3IAne6CDuVFlZbPOkA7bhxlqawFh7RJJ+CejfMaxE="
+	"github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU="
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+	"github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y="
+	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/moby/buildkit v0.7.2 h1:wp4R0QMXSqwjTJKhhWlJNOCSQ/OVPnsCf3N8rs09+vQ="
+	"github.com/moby/buildkit v0.7.2/go.mod"
+	"github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE="
+	"github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod"
+	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY="
+	"github.com/onsi/ginkgo v1.10.3/go.mod"
+	"github.com/onsi/gomega v1.4.2/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ="
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ="
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U="
+	"github.com/opencontainers/go-digest v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI="
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc6/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9.0.20200102164712-2b52db75279c/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9.0.20200221051241-688cf6d43cc4 h1:JhRvjyrjq24YPSDS0MQo9KJHQh95naK5fYl9IT+dzPM="
+	"github.com/opencontainers/runc v1.0.0-rc9.0.20200221051241-688cf6d43cc4/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.1 h1:wY4pOY8fBdSIvs9+IDHC55thBuEulhzfSgKeC1yFvzQ="
+	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/opencontainers/selinux v1.3.2 h1:DR4lL9SYVjgcTZKEZIncvDU06fKSc/eygjmNGOA3E1s="
+	"github.com/opencontainers/selinux v1.3.2/go.mod"
+	"github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75/go.mod"
+	"github.com/opentracing-contrib/go-stdlib v0.0.0-20180702182724-07a764486eb1 h1:gmB1XmLjI0RXG8rJCP0PK6g8rwhX8COSGFTiOgJ4Wx4="
+	"github.com/opentracing-contrib/go-stdlib v0.0.0-20180702182724-07a764486eb1/go.mod"
+	"github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.2 h1:3jA2P6O1F9UOrWVpwrIo17pu01KWvNWg4X946/Y5Zwg="
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterhellberg/link v1.0.0 h1:mUWkiegowUXEcmlb+ybF75Q/8D2Y0BjZtR8cxoKhaQo="
+	"github.com/peterhellberg/link v1.0.0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I="
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.2.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180924113449-f69c853d21c1 h1:mEzWvBiJdUbhqHRT6kNSGzD6IDcWCWF2uAhrEEE740M="
+	"github.com/prometheus/client_golang v0.0.0-20180924113449-f69c853d21c1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8="
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM="
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e h1:n/3MEhJQjQxrOUCzh1Y3Re6aJUUWRp2M9+Oc3eVn/54="
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180920065004-418d78d0b9a7 h1:NgR6WN8nQ4SmFC1sSUHY8SriLuWCZ6cCIQtH4vDZN3c="
+	"github.com/prometheus/procfs v0.0.0-20180920065004-418d78d0b9a7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+	"github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8="
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo="
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q="
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo="
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.3/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4="
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I="
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s="
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg="
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A="
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q="
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk="
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8="
+	"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
+	"github.com/tonistiigi/fsutil v0.0.0-20200326231323-c2c7d7b0e144 h1:6RY1EKxCnPQShPM46xFDHta2JSOd+YKCgHyyBHtKuo8="
+	"github.com/tonistiigi/fsutil v0.0.0-20200326231323-c2c7d7b0e144/go.mod"
+	"github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe h1:pd7hrFSqUPxYS9IB+UMG1AB/8EXGXo17ssx0bSQ5L6Y="
+	"github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe/go.mod"
+	"github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0="
+	"github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod"
+	"github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 h1:y/1cL5AL2oRcfzz8CAHHhR6kDDfIOT0WEyH5k40sccM="
+	"github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305/go.mod"
+	"github.com/uber/jaeger-client-go v0.0.0-20180103221425-e02c85f9069e/go.mod"
+	"github.com/uber/jaeger-lib v1.2.1/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5 h1:MCfT24H3f//U5+UCrZp1/riVO3B50BovxtDiNn0XKkk="
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo="
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/vishvananda/netlink v1.0.0 h1:bqNY2lgheFIu1meHUFSH3d7vG93AFyqg3oGbJCOJgSM="
+	"github.com/vishvananda/netlink v1.0.0/go.mod"
+	"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4="
+	"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk="
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0="
+	"go.etcd.io/bbolt v1.3.5/go.mod"
+	"go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4="
+	"go.opencensus.io v0.22.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw="
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20180925072008-f04abc6bdfa7 h1:zKzVgSQ8WOSHzD7I4k8LQjrHUUCNOlBsgc0PcYLVNnY="
+	"golang.org/x/net v0.0.0-20180925072008-f04abc6bdfa7/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8="
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA="
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20180925112736-b09afc3d579e/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+	"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8="
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg="
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM="
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs="
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180924164928-221a8d4f7494 h1:WIJ3k0fGJRrCVzZTuGmcBnUzWeSDpWiP+jUOxWkA8bo="
+	"google.golang.org/genproto v0.0.0-20180924164928-221a8d4f7494/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod"
+	"google.golang.org/genproto v0.0.0-20200227132054-3f1135a288c9 h1:Koy0f8zyrEVfIHetH7wjP5mQLUXiqDpubSg8V1fAxqc="
+	"google.golang.org/genproto v0.0.0-20200227132054-3f1135a288c9/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.15.0 h1:Az/KuahOM4NAidTEuJCv/RonAA7rYsTPkqXVjr+8OOw="
+	"google.golang.org/grpc v1.15.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk="
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4="
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ="
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I="
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gotest.tools v2.1.0+incompatible/go.mod"
+	"gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo="
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E="
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
+HOMEPAGE="https://github.com/genuinetools/img"
+SRC_URI="https://github.com/genuinetools/img/archive/v${PV}.tar.gz -> ${P}.tar.gz ${EGO_SUM_SRC_URI}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+IUSE="seccomp"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+RDEPEND="${DEPEND}
+	app-emulation/runc"
+
+src_compile() {
+	GOCACHE="${T}/go-cache" \
+		IMG_DISABLE_EMBEDDED_RUNC=1 \
+		go build -v -work -x -tags "noembed $(usev seccomp)" \
+		-ldflags="-s -w -X version.VERSION=${PV}" || die
+}
+
+src_install() {
+	dobin img
+	dodoc README.md AUTHORS
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 7318ff4c3fad..8fad662b93c6 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 78b586f2ec09..2354479f0fd5 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ RDEPEND="x11-libs/libICE
 	freewnn? ( app-i18n/freewnn )"
 DEPEND="${RDEPEND}
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
@@ -47,12 +47,15 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
+		AR="$(tc-getAR) cq" \
 		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
 		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 63082ad56b5f..c6203305dc89 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
index 262843e5b3d9..6e1677c1aeee 100644
--- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 BDEPEND="
 	app-text/rman
 	x11-misc/gccmakedep
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 PATCHES=(
 	"${FILESDIR}"/${P/_p*}-include.patch
@@ -41,20 +41,17 @@ src_prepare() {
 	done
 
 	default
-
-	printf '#!/bin/sh\n%s ${*}\n' "$(tc-getLD)" > "${T}"/ld
-	chmod +x "${T}"/ld
-	export PATH="${T}:${PATH}"
 }
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		CCOPTIONS="${CFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index b7709be5a465..6b211be32604 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,4 +1 @@
-DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
-DIST solaar-1.0.2.tar.gz 1540722 BLAKE2B 66c6f7c347f5eba538d3d48ff1c1137c1c71bf84dfb1a306a94e3cb24810378864066644a82d27eaaee2d80d30bcd30bb71ebe80fdb12363e9b194df9054946d SHA512 5f97b51e7853386311c5b9ff968a72529d55837f7262786e86085e130d219ac22095c20c984e340f619a15b8242f90e66a6c678c5e0c507c261d0430b74eacd6
-DIST solaar-1.0.3rc1.tar.gz 782803 BLAKE2B a4dde7238f2616d98cafafa775050fd0c3a3aaf8a11b0eab333993a9246c321c45ebe4d30adddf82d826e1909a8e90cb0914472ab40f9ed5560d380931aea591 SHA512 845c55865ef93c163bae80dfe6e8e3013363cff1be03b167dcd4f30c541ae16e1828ed6e51c8c77aa8b067e3a75cd8e1980fb8847b308d067a816598f83c8d83
 DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6 SHA512 28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
diff --git a/app-misc/solaar/solaar-1.0.1-r1.ebuild b/app-misc/solaar/solaar-1.0.1-r1.ebuild
deleted file mode 100644
index 76839e200c83..000000000000
--- a/app-misc/solaar/solaar-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_7 )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-
-S="${WORKDIR}"/Solaar-${PV}
-
-CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
-
-python_prepare_all() {
-	# don't autostart (bug #494608)
-	sed -i '/yield autostart_path/d' setup.py || die
-
-	# grant plugdev group rw access
-	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	udev_dorules rules.d/*.rules
-
-	dodoc docs/devices.md
-	if use doc; then
-		dodoc -r docs/*
-	fi
-}
diff --git a/app-misc/solaar/solaar-1.0.2.ebuild b/app-misc/solaar/solaar-1.0.2.ebuild
deleted file mode 100644
index 3fd7c0cbe1e4..000000000000
--- a/app-misc/solaar/solaar-1.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc appindicator libnotify"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	appindicator? ( dev-libs/libappindicator:3 )
-	libnotify? ( x11-libs/libnotify )"
-# libappindicator & libnotify are entirely optional and detected at runtime
-
-S="${WORKDIR}"/Solaar-${PV/_rc/rc}
-
-CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
-
-python_prepare_all() {
-	# don't autostart (bug #494608)
-	sed -i \
-		-e '/yield autostart_path/d' \
-		setup.py || die
-
-	sed -i -r \
-		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
-		setup.py || die
-
-	# grant plugdev group rw access
-	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc docs/devices.md
-	if use doc; then
-		dodoc -r docs/*
-	else
-		newdoc docs/index.md README.md
-	fi
-}
diff --git a/app-misc/solaar/solaar-1.0.3_rc1.ebuild b/app-misc/solaar/solaar-1.0.3_rc1.ebuild
deleted file mode 100644
index 9f3587867282..000000000000
--- a/app-misc/solaar/solaar-1.0.3_rc1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc appindicator libnotify"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	appindicator? ( dev-libs/libappindicator:3 )
-	libnotify? ( x11-libs/libnotify )"
-# libappindicator & libnotify are entirely optional and detected at runtime
-
-S="${WORKDIR}"/Solaar-${PV/_rc/rc}
-
-CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
-
-python_prepare_all() {
-	# don't autostart (bug #494608)
-	sed -i \
-		-e '/yield autostart_path/d' \
-		setup.py || die
-
-	sed -i -r \
-		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
-		setup.py || die
-
-	# grant plugdev group rw access
-	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc docs/devices.md
-	if use doc; then
-		dodoc -r docs/*
-	else
-		newdoc docs/index.md README.md
-	fi
-	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
-}
diff --git a/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
index d7492f7d3390..1142f92f8000 100644
--- a/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
 	>=dev-libs/glib-2.62:2
-	>=app-misc/tracker-3.0:0=
+	>=app-misc/tracker-3.0:3=
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/app-misc/tracker/tracker-3.1.1.ebuild b/app-misc/tracker/tracker-3.1.1.ebuild
index 990ede6c4e97..19d4057f6487 100644
--- a/app-misc/tracker/tracker-3.1.1.ebuild
+++ b/app-misc/tracker/tracker-3.1.1.ebuild
@@ -12,9 +12,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-IUSE="gtk-doc +miners stemmer test"
-
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test"
+RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)
 
@@ -67,7 +67,7 @@ function inotify_enabled() {
 }
 
 python_check_deps() {
-	has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
+	use test && has_version -b "dev-python/tappy[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index fab87f9f715e..37eaa3f5f263 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
index c72a1f5b5744..0ecfc29466a7 100644
--- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 	x11-libs/libxkbfile
 	app-text/rman
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 RDEPEND="${COMMON_DEPEND}
 	contrib? ( dev-lang/perl )
 	nls? ( sys-devel/gettext )
@@ -97,16 +97,21 @@ src_configure() {
 		--disable-freetype \
 		--x-libraries=/usr/lib/X11 \
 		--x-includes=/usr/include/X11
+
+	export IMAKECPP="${IMAKECPP:-$(tc-getCPP)}"
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die
 }
 
 src_compile() {
-	xmkmf || die
 	# no parallel build possible anywhere
-	emake -j1 Makefiles
+	emake -j1 Makefiles \
+		CC="$(tc-getBUILD_CC)" \
+		LD="$(tc-getLD)"
 
-	tc-export CC
 	emake -j1 \
-		CC="${CC}" \
+		AR="$(tc-getAR) cq" \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
 		BINDIR=/usr/bin \
diff --git a/app-office/moneyguru/Manifest b/app-office/moneyguru/Manifest
deleted file mode 100644
index 7263b73b216e..000000000000
--- a/app-office/moneyguru/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST moneyguru-3.0.1.tar.gz 1052191 BLAKE2B 30ea5eaa7b6256a33e98dc590015f563a3d5f6a10ccf26911e397dced79dfffa3b55941900ecf2cf3915ad0055db0c4c95b2f10c0c55e34d972afe32d714a588 SHA512 fe0de1d01340d124f8f385a4713c6748d2d445c653b508ad08303a3fea5192a0d88be9feb4984d19d4608436eb47de830d1c3dc6680d23aeff81107d27dcaf10
diff --git a/app-office/moneyguru/metadata.xml b/app-office/moneyguru/metadata.xml
deleted file mode 100644
index aedd054b6f89..000000000000
--- a/app-office/moneyguru/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">hsoft/moneyguru</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-office/moneyguru/moneyguru-3.0.1-r2.ebuild b/app-office/moneyguru/moneyguru-3.0.1-r2.ebuild
deleted file mode 100644
index 1eac49c27c0c..000000000000
--- a/app-office/moneyguru/moneyguru-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Future-aware personal finances management"
-HOMEPAGE="https://hardcoded.net/moneyguru"
-SRC_URI="https://download.hardcoded.net/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,widgets,printsupport]
-	')
-	dev-qt/qttranslations"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-util/cunit
-	)"
-
-_emake() {
-	emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \
-		SHEBANG="${PYTHON}" \
-		DESTDIR="${ED}" \
-		PREFIX="${EPREFIX}/usr" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake install
-}
-
-src_test() {
-	emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests
-	pytest -vv core || die "Tests failed with ${EPYTHON}"
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bf838602feab..53f28a7fd035 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild
index 606b0e7ba92b..0ec9beee2ec4 100644
--- a/app-text/iso-codes/iso-codes-4.6.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/libgxps/libgxps-0.3.2.ebuild b/app-text/libgxps/libgxps-0.3.2.ebuild
index 051579ab2eaf..4ed7f9aa4718 100644
--- a/app-text/libgxps/libgxps-0.3.2.ebuild
+++ b/app-text/libgxps/libgxps-0.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
new file mode 100644
index 000000000000..cdd8ccf0f40d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
@@ -0,0 +1,41 @@
+--- a/Makerules
++++ b/Makerules
+@@ -117,11 +117,11 @@ ifeq ($(OS),MINGW)
+ else ifeq ($(OS),MACOS)
+   HAVE_GLUT := yes
+   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+-  SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+-  CC = xcrun cc
+-  AR = xcrun ar
+-  LD = xcrun ld
+-  RANLIB = xcrun ranlib
++  SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
++  CC ?= xcrun cc
++  AR ?= xcrun ar
++  LD ?= xcrun ld
++  RANLIB ?= xcrun ranlib
+ 
+ else ifeq ($(OS),Linux)
+   HAVE_OBJCOPY := yes
+--- a/Makerules
++++ b/Makerules
+@@ -122,9 +122,7 @@ else ifeq ($(OS),MACOS)
+   AR ?= xcrun ar
+   LD ?= xcrun ld
+   RANLIB ?= xcrun ranlib
+-
+-else ifeq ($(OS),Linux)
+-  HAVE_OBJCOPY := yes
++endif
+ 
+   ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
+ 	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
+@@ -197,8 +195,6 @@ else ifeq ($(OS),Linux)
+ 	PTHREAD_LIBS := -lpthread
+   endif
+ 
+-endif
+-
+ # The following section has various cross compilation configurations.
+ #
+ # Invoke these as:
diff --git a/app-text/mupdf/mupdf-1.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
similarity index 89%
rename from app-text/mupdf/mupdf-1.18.0-r3.ebuild
rename to app-text/mupdf/mupdf-1.18.0-r4.ebuild
index 21ae5eb3fcf4..db2b4ba6fd92 100644
--- a/app-text/mupdf/mupdf-1.18.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
@@ -8,18 +8,17 @@ inherit desktop flag-o-matic toolchain-funcs xdg
 DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
+S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86"
-IUSE="+javascript libressl opengl ssl X"
+IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of
 # bug #653298), the best way to ensure that its dependencies are present is to
 # install system's freeglut.
-BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/gumbo
 	media-libs/freetype:2=
@@ -30,21 +29,20 @@ RDEPEND="
 	virtual/jpeg
 	javascript? ( >=dev-lang/mujs-1.0.7:= )
 	opengl? ( >=media-libs/freeglut-3.0.0 )
-	ssl? (
-		libressl? ( >=dev-libs/libressl-3.1.4:0= )
-		!libressl? ( >=dev-libs/openssl-1.1:0= )
-	)
+	ssl? ( >=dev-libs/openssl-1.1:0= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
 	)
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.18-Makefile.patch
 	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	"${FILESDIR}"/${PN}-1.18.0-darwin.patch
 	# See bugs #662352
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
@@ -69,14 +67,12 @@ src_prepare() {
 		-e "1iAR = $(tc-getAR)" \
 		-e "1iverbose = yes" \
 		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}/usr" \
-		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
 		-i Makerules || die
 }
 
 _emake() {
 	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
 	# Bundled libs
 	# * General
 	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
@@ -100,19 +96,24 @@ _emake() {
 	#
 	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
 	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
-	emake \
-		GENTOO_PV=${PV} \
-		HAVE_GLUT=$(usex opengl) \
-		HAVE_LIBCRYPTO=$(usex ssl) \
-		HAVE_X11=$(usex X) \
-		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=$(usex javascript) \
-		USE_SYSTEM_GLUT=no \
-		HAVE_OBJCOPY=no \
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
 		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	_emake XCFLAGS="-fPIC"
 }
 
@@ -124,6 +125,12 @@ src_install() {
 		rm docs/man/${PN}.1 || die
 	fi
 
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die
+
 	_emake install
 
 	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
diff --git a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
index 9a58cc782f4c..cc554efa4982 100644
--- a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b918e849fc8b..72ad67f9f247 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9d25dc1abc20..ce8e183a0fd5 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -35,6 +35,6 @@ DIST mariadb-10.5.7-patches-02.tar.xz 8992 BLAKE2B ec9acc1f09ac08319c5ad7e952e75
 DIST mariadb-10.5.7.tar.gz 88214625 BLAKE2B 8ec53b4b98565d99a707899fd6adfdc5bffbf722528e0042ab16b5e186d32229a386881f2781a0ce435585f338b48dc66459bef9d8921fadc00a3d770b62bf5c SHA512 d964c61d6ba7cf21fea97b8e0b6a0bf1ee50fc7a7995753dafd710f4656001bd6e03c243896efb5802cce16dd6470849ed036d09b17415a538e008f64e974a9f
 DIST mariadb-10.5.8-patches-01.tar.xz 6212 BLAKE2B 7e4358d02d25edc51f5926a75646052ccf07fe2b5cab1901a133b27764793c94ca2a6c4d4b90b5d911b25a6d86f1cb7d2659edbcdab52c445fd6959ea080275d SHA512 f7a5d948c6d7d97896538b7df0de60c8e7969dd15b4ff406e8955a282e69fb7f19fe91424afc332029ac2a36c52781617bbf1c5f6d57dd3bfc21d3ea20ff4c5a
 DIST mariadb-10.5.8.tar.gz 88206163 BLAKE2B eaaddaf240102428a23602655920bdf543d25cf85e669b1b07bedba5119a5e0f4498e999db39031dcff168ac810ed0b28f5fa9ac995b3634b84b99b753b4636c SHA512 9801a68440a3502b49655e34dcbfd09734f4a4f1ba8621ed9b895e194cea461a8c69fb0ff66488d5defd3065b43f73e5083a60142e11cc7e4a442f86769b06e5
-DIST mariadb-10.5.9-patches-04.tar.xz 6544 BLAKE2B 283e289fd4c8a701426db6a329bb6da06db82093cb40d103ddc878cdae15cebc66d3b99c5315d460f0db4bfa370ddb0e9e5cc017d01515085b7dc1a27f97bf48 SHA512 6de84664ddd4f1a022280336d7ee742dfadbbd2f3e5e23c3e68b1f9423cc45becf403dda9976cb366d7afafd412f112720c27b558147486dca781f1053010ede
+DIST mariadb-10.5.9-patches-05.tar.xz 17120 BLAKE2B a6ea7c3ba3718e9667510db9fdfcedb3fa4a6a2da89f1c49f9a419c84191af9bf6148815afa836e31f47d752cafdaefdd98b530c29c849fa86af4ff0be9732ea SHA512 e39393505d5c5d45b3352d15b9e10a02a1057d5eb381335953c5dfca312791976be9e0e3b2adb6536a2f5cc6f00f01b9379a17806a029a9b73eb674a2a1fb583
 DIST mariadb-10.5.9.tar.gz 88639930 BLAKE2B 512c3fb0541bbeb19878979104f7858ce18ce67187507c8395798cfc9ffe92bd83e39bd47251419363600348a85716406286bd27b3c28662ea63e8ec761a4e01 SHA512 d23d5bf8510b3c36a6521fb3244cf323ef0f5d100ba379ed7b5bbc2acae1765a5b46c17bd929f0b27b28923eb1b5975314abdf7ffb96905cf7a93a5c8837294e
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
diff --git a/dev-db/mariadb/mariadb-10.5.9-r4.ebuild b/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.5.9-r4.ebuild
rename to dev-db/mariadb/mariadb-10.5.9-r5.ebuild
index a5ae5e62b16f..27accfb1aa15 100644
--- a/dev-db/mariadb/mariadb-10.5.9-r4.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \
 	multiprocessing java-pkg-opt-2 cmake
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.9-patches-04.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.9-patches-05.tar.xz"
 
 SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
 	${PATCH_SET}"
diff --git a/dev-db/timescaledb/Manifest b/dev-db/timescaledb/Manifest
index 21e15e51a375..ea1741696d41 100644
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@@ -1,3 +1,4 @@
 DIST timescaledb-2.0.1.tar.gz 2226320 BLAKE2B 0bd5011e30d6c0d5ac11b78ddf6650044f35d720317213bd0437a43e0421953708d3d69b6933a821d255b183bb72b1c5e34ff88223790266daf7af3cf21f2de2 SHA512 84e9c7da3f0fc6740eb0555bbd92f5511ceef4868fb1952650f9499f3054a4d2be59b3a042b17bf655155c9f9c1de82b6b4fb302bdad7ffbe893ed901adcefc0
 DIST timescaledb-2.0.2.tar.gz 2237429 BLAKE2B 58c5e68daf5a3c1fade48b2ce8f625496ee3c58be38c573c883e319eb0084064d243270ac839e4bdd1ce3c865fc6b916c7869232b995529d8aca77851a0c7a79 SHA512 26ce25e4d833810cdd99691f3b8a4d0c26655b2efeba7c25d5daaaf2d1aabd8f96a421a771da9c5b6cf29af66ddcab39f3881d40364e25c101ea691e4ec61116
 DIST timescaledb-2.1.0.tar.gz 2527250 BLAKE2B 6f257c4b1afc0869c8e309f9b3080dbcdda4b50debc1a5b3848b9d6e59744ff52902b475aca0bc8820aa2edebe9847d62e500a8cd19f7ab8050d9586d95d3a66 SHA512 53fddb9fe4c4ab51ebc020e90eea5b032b41259d3bd45e8a03a86451acd7f8864b5a6ecba1b82b7c78e230f62cfddf1da75ff27e6629ad5fe8178839ac411ce4
+DIST timescaledb-2.1.1.tar.gz 2534361 BLAKE2B d0aa5b231cbc9a75bb65eae395ffc0063a94bd3d9c47fe2b1f80bdf59c7624c83e3d4343f3d4ea402654627b8396936614f105fc7d01612f3ea03124471b44a3 SHA512 53bd8f9006741af834cc2598efe95b94e6ebf00df770ac3a4e0a087af83c8ba5ac2b1f421fd108e6609fde6bea725f05e2d590c3f341030a0f31edb6a3cf6cd5
diff --git a/dev-db/timescaledb/timescaledb-2.1.1.ebuild b/dev-db/timescaledb/timescaledb-2.1.1.ebuild
new file mode 100644
index 000000000000..54ea9700b357
--- /dev/null
+++ b/dev-db/timescaledb/timescaledb-2.1.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 13 )
+
+inherit postgres-multi cmake
+
+DESCRIPTION="Open-source time-series SQL database"
+HOMEPAGE="https://www.timescale.com/"
+SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="proprietary-extensions"
+LICENSE="POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+CMAKE_IN_SOURCE_BUILD=yes
+BUILD_DIR=${WORKDIR}/${P}
+
+src_prepare() {
+	postgres-multi_src_prepare
+	postgres-multi_foreach cmake_src_prepare
+}
+
+timescale_configure() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	local mycmakeargs=( "-DPG_CONFIG=/usr/bin/pg_config${MULTIBUILD_VARIANT}" "-DREGRESS_CHECKS=OFF" )
+
+	# licensing is tied to features, this useflag disables the non-apache2 licensed bits
+	if ! use proprietary-extensions ; then
+		mycmakeargs+=("-DAPACHE_ONLY=ON")
+	fi
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach timescale_configure
+}
+
+timescale_src_compile() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_compile
+}
+
+src_compile() {
+	postgres-multi_foreach timescale_src_compile
+}
+
+timescale_src_install() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_install
+}
+
+src_install() {
+	postgres-multi_foreach timescale_src_install
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7186df5d626c..3a74784f96da 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
new file mode 100644
index 000000000000..aaee170b76c1
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Apple eAWT and eIO APIs for Java on Mac OS X"
+HOMEPAGE="http://developer.apple.com/samplecode/AppleJavaExtensions/"
+SRC_URI="http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> ${P}.zip"
+
+LICENSE="Apple"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S=${WORKDIR}/AppleJavaExtensions
+
+src_install() {
+	dodoc README.txt
+	java-pkg_dojar AppleJavaExtensions.jar
+}
diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
index 316152059dfc..14b9dcd39d2c 100644
--- a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
+++ b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
 HOMEPAGE="http://eclipse.org/aspectj/"
-SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> ${P}.jar"
+SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/${P}-src.jar&r=1 -> ${P}.jar"
 
 LICENSE="EPL-1.0"
 SLOT="0"
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 1050fd7db142..293f425488f6 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,2 +1 @@
-DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
 DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
deleted file mode 100644
index 29554308da99..000000000000
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV="${PV//./_}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="BCEL_${MY_PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
-HOMEPAGE="http://commons.apache.org/bcel/"
-SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/commons-${PN}-${MY_P}/src"
-JAVA_SRC_DIR="main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc ../{NOTICE,README,RELEASE-NOTES}.txt
-}
-
-src_test() {
-	cd test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find * -name "*TestCase.java" ! -name "Abstract*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -g -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/bcel/bcel-6.5.0.ebuild b/dev-java/bcel/bcel-6.5.0.ebuild
index 5cbceb0bb20d..b4fcd293facd 100644
--- a/dev-java/bcel/bcel-6.5.0.ebuild
+++ b/dev-java/bcel/bcel-6.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
 SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index be542192d8d5..b1138e4df534 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1,3 @@
 DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
+DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
diff --git a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
similarity index 77%
rename from dev-java/jaxen/jaxen-1.1.6-r1.ebuild
rename to dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index c364ebdd0230..6890318a4927 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,22 +15,13 @@ LICENSE="JDOM"
 SLOT="1.1"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-CDEPEND="
-	dev-java/jdom:0
-	dev-java/dom4j:1"
-
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	jdom
-	dom4j-1
-"
+	>=virtual/jdk-1.8:*"
 
 JAVA_SRC_DIR="org"
 
@@ -41,5 +32,8 @@ src_prepare() {
 	# require jaxen to depend on xom, we end up in a circular dep.
 	# I fear though that removing those classes might bite us somewhere down
 	# the line...
-	rm -rv org/jaxen/xom || die
+	rm -rv org/jaxen/{dom4j,jdom,xom} || die
+
+	# this is now part of jdk
+	rm -rv org/w3c || die
 }
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
deleted file mode 100644
index 77b073b118a4..000000000000
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/dom4j:1
-	dev-java/jdom:0
-	dev-java/xom:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	xom
-	jdom
-	dom4j-1
-"
diff --git a/dev-java/jaxen/jaxen-1.2.0.ebuild b/dev-java/jaxen/jaxen-1.2.0.ebuild
new file mode 100644
index 000000000000..a3bec68c55bb
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jaxen:jaxen:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java."
+HOMEPAGE="http://www.cafeconleche.org/jaxen/"
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend on jaxen
+RESTRICT="test"
+
+# Compile dependencies
+# POM: pom.xml
+# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
+# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# POM: pom.xml
+# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	>=dev-java/xerces-2.12.0:2
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}"
+
+DOCS=( "${P}"/{LICENSE.txt,README.md} )
+
+JAVA_CLASSPATH_EXTRA="xerces-2"
+JAVA_SRC_DIR="${P}/src/java/main"
+
+src_prepare() {
+	default
+
+	# solve cyclic deps by removing these dirs
+	# dom4j, jdom and xom depend on jaxen
+	# https://bugs.gentoo.org/739894#c9
+	rm -rv "${JAVA_SRC_DIR}"/org/jaxen/{dom4j,jdom,xom} || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
similarity index 93%
rename from dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
rename to dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
index 671b3781782a..2543074e32b0 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,10 +22,10 @@ KEYWORDS="amd64 ~ppc64 x86"
 # tests fail with encoding errors
 RESTRICT="test"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:0 )
 	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P//./_}"
 TCK_S="${WORKDIR}/${TCK}-${TCK_V//./_}"
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 679b45f3b62c..2a4c459fafe7 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,3 +1,4 @@
 DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
 DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
 DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
+DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262
diff --git a/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
new file mode 100644
index 000000000000..ef897ae004c9
--- /dev/null
+++ b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
@@ -0,0 +1,22 @@
+diff --git a/XOM/src/nu/xom/tests/XSLTransformTest.java b/XOM/src/nu/xom/tests/XSLTransformTest.java
+index 443c058..56f7b6e 100644
+--- a/XOM/src/nu/xom/tests/XSLTransformTest.java
++++ b/XOM/src/nu/xom/tests/XSLTransformTest.java
+@@ -765,7 +765,7 @@ public class XSLTransformTest extends XOMTestCase {
+         
+     } 
+     
+-    
++    /*
+     public void testIllegalTransform() 
+       throws XSLException, ParsingException, IOException {
+         
+@@ -784,7 +784,7 @@ public class XSLTransformTest extends XOMTestCase {
+         }
+         
+     }
+-
++    */
+     
+     public void testRemapPrefixToSameURI() 
+       throws IOException, ParsingException, XSLException { 
diff --git a/dev-java/xom/xom-1.3.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild
new file mode 100644
index 000000000000..58e85eac158a
--- /dev/null
+++ b/dev-java/xom/xom-1.3.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Object Model"
+HOMEPAGE="https://xom.nu"
+SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+CDEPEND="
+	dev-java/jaxen:1.2
+	dev-java/xerces:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	dev-java/junit:0
+	>=virtual/jdk-1.8:*"
+
+JAVA_GENTOO_CLASSPATH="jaxen-1.2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-invalid-test.patch"
+)
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+
+	# removing directories based on build.xml
+	rm -rv XOM/src/nu/xom/benchmarks/ || die
+	rm -rv XOM/src/nu/xom/integrationtests/ || die
+	rm -rv XOM/src/nu/xom/samples/ || die
+	rm -rv XOM/src/nu/xom/tools/ || die
+
+	# reorganize the code and resources so that it goes well with java-pkg-simple
+	mkdir -pv ${JAVA_SRC_DIR} ${JAVA_RESOURCE_DIRS} ${JAVA_TEST_SRC_DIR}/nu/xom || die
+	mv -v XOM/src/nu/xom/tests ${JAVA_TEST_SRC_DIR}/nu/xom/ || die
+	mv -v XOM/data . || die
+	pushd XOM/src || die
+	for file in $(find -type f -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_SRC_DIR}" || die
+	done
+	for file in $(find -type f ! -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_RESOURCE_DIRS}" || die
+	done
+	popd
+}
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
index d392231d1098..a52b851aeb9e 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="An implementation of XMLPULL V1 API"
 HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/xpp3-1.1.4c-sources.jar -> ${P}.jar"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
 
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 1aa4df06c8af..29b899e69c49 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1 +1 @@
-DIST v1.4.9-1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
+DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
index 3ca6001de29b..ddc0e2cc4054 100644
--- a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
@@ -11,8 +11,7 @@ inherit java-pkg-2 java-pkg-simple cmake
 DESCRIPTION="JNI bindings for Zstd native library"
 
 HOMEPAGE="https://github.com/luben/zstd-jni"
-SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz"
-
+SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index bc8f156b045c..ed1faf6ff735 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 0cf67cd7fb7e..0232fbf259ec 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,3 +1,2 @@
-DIST mujs-1.0.9.tar.gz 123113 BLAKE2B c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b SHA512 a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
 DIST mujs-1.1.0.tar.gz 123450 BLAKE2B e7bc05d35566ff26346e713645e0f417a9acd1a73b5fb5c7f0c35bf940765fba1ab04199f4ed1dd6ce0e3bb2bf1547703335a1c125353da24de72f2b1adfb243 SHA512 10b61453f8483e3e67c95a742aa7868e255816b2ce25c84d8e24c5c737bad1f23ade67531c5c5bb914804be446da33c0cbe8e95a6d5889250dd8520ce56f23a0
 DIST mujs-1.1.1.tar.xz 95448 BLAKE2B df19d045a16603b94fae6e8f996af32ab5986983a191041bf82cde67c876b34e9574b2c5ea75be8dba36da6692761608ce56117c7cf98833795eadec37ee546e SHA512 8978cb120458b982cd8fa2242ca648c1bb19a837f3b41a88226f95c6d48796b92f221d95b4c2cb73c4a4257ee33045640aee8c3c849cf0725a686fa452f2cc84
diff --git a/dev-lang/mujs/files/mujs-1.0.5-flags.patch b/dev-lang/mujs/files/mujs-1.0.5-flags.patch
deleted file mode 100644
index 50de4fcff21e..000000000000
--- a/dev-lang/mujs/files/mujs-1.0.5-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile	2018-09-11 12:47:31.000000000 +0200
-+++ b/Makefile	2018-10-28 20:09:17.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- # Compiler flags for various configurations:
- 
--CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
- 
- ifeq "$(CC)" "clang"
-   CFLAGS += -Wunreachable-code
-@@ -30,9 +30,6 @@
- else ifeq "$(build)" "sanitize"
-   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
-   LDFLAGS += -fsanitize=address
--else
--  CFLAGS += -Os
--  LDFLAGS += -Wl,-s
- endif
- 
- ifeq "$(HAVE_READLINE)" "yes"
-@@ -78,7 +75,7 @@
- 
- $(OUT)/libmujs.so: one.c $(HDRS)
- 	@ mkdir -p $(dir $@)
--	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lm
- 
- $(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
- 	@ mkdir -p $(dir $@)
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
deleted file mode 100644
index 9ec22acb2d71..000000000000
--- a/dev-lang/mujs/mujs-1.0.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An embeddable JavaScript interpreter in C"
-HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
-SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# Not available right now.
-#SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
-
-LICENSE="ISC"
-# subslot matches SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.5-flags.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	# library's ABI (and API) changes in ~each release:
-	# diff 'usr/includemujs.h' across releases to validate
-	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-}
-
-src_compile() {
-	emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
-	local myemakeargs=(
-		DESTDIR="${ED}"
-		libdir="/usr/$(get_libdir)"
-		prefix="/usr"
-		VERSION="${PV}"
-		$(usex static-libs install-static '')
-	)
-
-	emake "${myemakeargs[@]}" install-shared
-
-	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-}
diff --git a/dev-lang/mujs/mujs-1.1.1.ebuild b/dev-lang/mujs/mujs-1.1.1.ebuild
index f4a97b555780..7351763bc8ea 100644
--- a/dev-lang/mujs/mujs-1.1.1.ebuild
+++ b/dev-lang/mujs/mujs-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="An embeddable JavaScript interpreter in C"
 HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
@@ -27,9 +27,15 @@ src_prepare() {
 
 	tc-export AR CC
 
+	append-cflags -fPIC
+
 	# library's ABI (and API) changes in ~each release:
 	# diff 'usr/includemujs.h' across releases to validate
-	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-cflags -Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib
+	else
+		append-cflags -Wl,-soname=lib${PN}.so.${PV}
+	fi
 }
 
 src_compile() {
@@ -44,15 +50,21 @@ src_compile() {
 src_install() {
 	local myemakeargs=(
 		DESTDIR="${ED}"
+		VERSION=${PF}
 		libdir="/usr/$(get_libdir)"
-		prefix="/usr"
-		VERSION="${PV}"
+		prefix=/usr
 	)
 
 	emake "${myemakeargs[@]}" install-shared
 
-	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+	# TODO: Tidy up this logic, improve readability
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so "${ED}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib || die
+		dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.dylib
+		dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.${PV:0:1}.dylib
+	else
+		mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
+		dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+		dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+	fi
 }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 947d8aa9326a..f15de2d1cbd3 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/fribidi/fribidi-1.0.10.ebuild b/dev-libs/fribidi/fribidi-1.0.10.ebuild
index 76ff5d8a3ec1..d0502f12ba56 100644
--- a/dev-libs/fribidi/fribidi-1.0.10.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/gom/gom-0.4.ebuild b/dev-libs/gom/gom-0.4.ebuild
index 3bcf4b239602..ed2f7c4b147f 100644
--- a/dev-libs/gom/gom-0.4.ebuild
+++ b/dev-libs/gom/gom-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org meson python-r1
 
diff --git a/dev-libs/json-glib/json-glib-1.6.2.ebuild b/dev-libs/json-glib/json-glib-1.6.2.ebuild
index 52f80fbce692..7041eea07b26 100644
--- a/dev-libs/json-glib/json-glib-1.6.2.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
deleted file mode 100644
index d2bab8e8ae01..000000000000
--- a/dev-libs/klibc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST klibc-2.0.4.tar.xz 469348 BLAKE2B 5975e3d25f72b70c4cbaa56ea5363417407e8dace1e02e2da0b835bbb2cad56648b0084e5404528206ef3facf4ffd3611e8bd729eadd80b00e30d1a70b3057cf SHA512 7a01d1744b49f3de64111fefc522b1d63f054199acf671254bc046d6f1d0b6ca68e050c99025bf8303751c2466a5e034677555649ae5909c40997858d393db8d
-DIST klibc_2.0.4-9.debian.tar.xz 28628 BLAKE2B aaad6fafb7372152987eebda5951b9f3de2e33da583e0ea7597f666461977f461303566f9e363e9c96994c7b0eb6213c6a17b2fab72df7460db3cfbc0c2e1cf8 SHA512 0fe9a6642be962fa631919850d7eeed5a87c10682766ee10fe31dec2b19a6179e0067602acb26bdc2aa8ceecfd39b1dc95a76f3b0a9bc813b172c0ffe9f0ff53
-DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
diff --git a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch
deleted file mode 100644
index a5bb91765287..000000000000
--- a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
-index c2bfd2f..8066bda 100644
---- a/usr/klibc/Kbuild
-+++ b/usr/klibc/Kbuild
-@@ -152,7 +152,7 @@ # build interp.o
- targets += interp.o
- 
- quiet_cmd_interp = BUILD   $@
--      cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__     \
-+      cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) -D__ASSEMBLY__     \
-                              -DLIBDIR=\"$(SHLIBDIR)\"         \
- 			     -DSOHASH=\"$(SOLIBHASH)\" \
- 			     -c -o $@ $<
diff --git a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
deleted file mode 100644
index 94a0caee2526..000000000000
--- a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp klibc-1.5.7-orig/klcc/klcc.in klibc-1.5.7/klcc/klcc.in
---- klibc-1.5.7-orig/klcc/klcc.in	2007-12-03 01:17:26.000000000 +0100
-+++ klibc-1.5.7/klcc/klcc.in	2007-12-03 01:18:39.000000000 +0100
-@@ -259,7 +259,7 @@ if ( $operation ne '' ) {
-     unlink(@rmobjs);
- 
-     if ( $strip && !$rv ) {
--	$rv = mysystem($STRIP, @STRIPFLAGS, $output);
-+	$rv = mysystem($STRIP, @STRIPFLAGS, $output || 'a.out');
-     }
- }
- 
diff --git a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch b/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
deleted file mode 100644
index 3ddf834d46da..000000000000
--- a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar --exclude '*.g' --exclude '*.cmd' klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c klibc-2.0.2.orig/work/klibc-2.0.2/usr/utils/mkfifo.c
---- a/usr/utils/mkfifo.c	2012-10-03 09:41:43.000000000 -0700
-+++ b/usr/utils/mkfifo.c	2013-12-26 13:19:34.270949780 -0800
-@@ -13,6 +13,11 @@
- 
- char *progname;
- 
-+int mkfifo (const char *__p, mode_t __m)
-+{
-+	return mknod(__p, (__m & ~S_IFMT) | S_IFIFO, (dev_t) 0);
-+}
-+
- static int make_fifo(char *dir)
- {
- 	if (mkfifo(dir, leaf_mode)) {
diff --git a/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch b/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch
deleted file mode 100644
index 7d253977e998..000000000000
--- a/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Update header locations for uapi & generated
-
-In the v3.6 kernel, many of the headers were split out into a uapi variant.
-klibc should be using those variants to compile.
-
-There is also a generated subdir, to seperate out generated headers.
-
-The old kernel header location needs to be included as well, because
-linux/compiler.h is available only in the base include directory.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar klibc-2.0.3.orig/scripts/Kbuild.klibc klibc-2.0.3/scripts/Kbuild.klibc
---- klibc-2.0.3.orig/scripts/Kbuild.klibc	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/scripts/Kbuild.klibc	2013-12-26 14:39:07.113906101 -0800
-@@ -77,7 +77,10 @@
- KLIBCCFLAGS       :=
- 
- # Defaults for arch to override
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include
- 
- # Arch specific definitions for klibc
- include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
-@@ -116,6 +119,9 @@
--KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)/include				    \
-+KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)/include/uapi				    \
-+                    -I$(KLIBCKERNELSRC)/include/generated/uapi				    \
-+                    -I$(KLIBCKERNELSRC)/include/generated				    \
-+                    -I$(KLIBCKERNELSRC)/include				    \
-                      $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 	    \
- 		       -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include)    \
- 		     $(KLIBCARCHINCFLAGS)
- 
- # klibc definitions
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG klibc-2.0.3/usr/klibc/arch/i386/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/i386/MCONFIG	2013-12-26 14:44:56.349161344 -0800
-@@ -34,3 +34,6 @@
- 
- # Asm includes for i386 are in the merged x86 tree
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG	2013-12-26 14:44:56.350161362 -0800
-@@ -24,6 +24,9 @@
- 
- # The kernel so far has both asm-ppc* and asm-powerpc.
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include
- 
- # The asm include files live in asm-powerpc
- KLIBCASMARCH	= powerpc
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG	2013-12-26 14:44:56.350161362 -0800
-@@ -22,6 +22,9 @@
- 
- # The kernel so far has both asm-ppc* and asm-powerpc.
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include
- 
- # The asm include files live in asm-powerpc
- KLIBCASMARCH	= powerpc
-diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG
---- klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG	2013-12-03 10:53:46.000000000 -0800
-+++ klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG	2013-12-26 14:44:54.522128579 -0800
-@@ -37,3 +37,6 @@
- 
- # Asm includes for x86_64 are in the merged x86 tree
--KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include
-+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \
-+                    -I$(KLIBCKERNELOBJ)/arch/x86/include
diff --git a/dev-libs/klibc/files/klibc.m4 b/dev-libs/klibc/files/klibc.m4
deleted file mode 100644
index 389226974506..000000000000
--- a/dev-libs/klibc/files/klibc.m4
+++ /dev/null
@@ -1,94 +0,0 @@
-# klibc.m4 serial 99
-## Copyright (C) 1995-2003 Free Software Foundation, Inc.
-## This file is free software, distributed under the terms of the GNU
-## General Public License.  As a special exception to the GNU General
-## Public License, this file may be distributed as part of a program
-## that contains a configuration script generated by Autoconf, under
-## the same distribution terms as the rest of that program.
-##
-## This file can can be used in projects which are not available under
-## the GNU General Public License or the GNU Library General Public
-## License but which still want to provide support for the GNU gettext
-## functionality.
-## Please note that the actual code of the KLIBC Library is partly covered
-## by the GNU Library General Public License, and party copyrighted by the
-## Regents of The University of California, and the rest is covered by a
-## MIT style license. 
-
-# Authors:
-#   Martin Schlemmer <azarah@nosferatu.za.org>, 2005.
-
-
-# AC_CHECK_KLIBC
-# --------------
-# Check if the user wants KLIBC support enabled.  If so, set KLIBC=yes and
-# fill in KLIBC_PREFIX, KLIBC_BINDIR, KLIBC_SBINDIR, KLIBC_LIBDIR and
-# KLIBC_INCLUDEDIR.  CC is also set to the proper klcc executable.
-# NOTE:  This should be called before AC_PROG_CC, and before header, function
-#        or type checks.
-AC_DEFUN([AC_CHECK_KLIBC],
-[AC_BEFORE([$0], [AC_PROG_CC])
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_ARG_ENABLE([klibc],
-              [AS_HELP_STRING([--enable-klibc],
-                              [Enable linking to klibc [no].  You need at
-                               least klibc-1.0 or later for this.  Set KLCC
-                               to the absolute file name of klcc if not in
-                               the PATH])],
-              [KLIBC=$enableval], [KLIBC=no])
-AC_ARG_ENABLE([klibc-layout],
-              [AS_HELP_STRING([--enable-klibc-layout],
-                              [Enable installing binaries, libraries and
-                               headers into the klibc prefix [yes] ])],
-              [if test "X$KLIBC" != Xno; then
-                 KLIBC_LAYOUT=$enableval
-               else
-                 KLIBC_LAYOUT=no
-               fi],
-              [if test "X$KLIBC" != Xno; then
-                 KLIBC_LAYOUT=yes
-               else
-                 KLIBC_LAYOUT=no
-               fi])
-
-if test "X$KLIBC" != Xno; then
-  # Basic cross compiling support.  I do not think it is wise to use
-  # AC_CHECK_TOOL, because if we are cross compiling, we do not want
-  # just 'klcc' to be returned ...
-  if test "${host_alias}" != "${build_alias}"; then
-    AC_CHECK_PROGS([KLCC], [${host_alias}-klcc], [no])
-  else
-    AC_CHECK_PROGS([KLCC], [klcc], [no])
-  fi
-  if test "X$KLCC" = Xno; then
-    AC_MSG_ERROR([cannot find klibc frontend 'klcc'!])
-  fi
-
-  CC="$KLCC"
-  CFLAGS="-Os"
-
-  KLIBC_KCROSS="$($KLCC -print-klibc-kcross 2>/dev/null)"
-  KLIBC_PREFIX="$($KLCC -print-klibc-prefix 2>/dev/null)"
-  KLIBC_BIN_DIR="$($KLCC -print-klibc-bindir 2>/dev/null)"
-  KLIBC_SBIN_DIR="${KLIBC_PREFIX}/${KLIBC_KCROSS}sbin"
-  KLIBC_LIB_DIR="$($KLCC -print-klibc-libdir 2>/dev/null)"
-  KLIBC_INCLUDE_DIR="$($KLCC -print-klibc-includedir 2>/dev/null)"
-
-  if test "X$KLIBC_LAYOUT" != Xno; then
-    prefix="$KLIBC_PREFIX"
-    bindir="$KLIBC_BIN_DIR"
-    sbindir="$KLIBC_SBIN_DIR"
-    libdir="$KLIBC_LIB_DIR"
-    includedir="$KLIBC_INCLUDE_DIR"
-  fi
-
-  # At least KLIBC_LIB_DIR should be valid, else klibc is too old or
-  # something went wrong
-  if test ! -d "$KLIBC_LIB_DIR"; then
-    AC_MSG_ERROR([your klibc installation is too old or not functional!])
-  fi
-fi
-
-AC_SUBST(KLIBC)
-])# AC_CHECK_KLIBC
-
diff --git a/dev-libs/klibc/klibc-2.0.4-r3.ebuild b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
deleted file mode 100644
index 0045f3691815..000000000000
--- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunately.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-EAPI=6
-K_TARBALL_SUFFIX="xz"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A minimal libc subset for use with initramfs"
-HOMEPAGE="https://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/"
-KV_MAJOR="4" KV_MINOR="x" KV_SUB="14"
-PKV_EXTRA=""
-if [[ ${PKV_EXTRA} ]]; then
-	if [[ ${KV_MAJOR} == 2 ]]; then
-		PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	else
-		PKV="${KV_MAJOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	fi
-	PATCH_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}"
-fi
-if [[ ${KV_MAJOR} == 2 ]]; then
-	OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-else
-	OKV="${KV_MAJOR}.${KV_SUB}"
-fi
-KERNEL_URI="
-	https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX}
-	https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}"
-DEBIAN_PV=2.0.4
-DEBIAN_PR=9
-DEBIAN_A="${PN}_${DEBIAN_PV}-${DEBIAN_PR}.debian.tar.xz"
-SRC_URI="
-	https://www.kernel.org/pub/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX}
-	mirror://debian/pool/main/k/klibc/${DEBIAN_A}
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="debug test custom-cflags"
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	sys-devel/bc"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip
-	!test? ( test )"
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86) echo i386 ;; # for build on x86 userspace & 64bit kernel
-		amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|arm64|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-src_unpack() {
-	unpack linux-${OKV}.tar.${K_TARBALL_SUFFIX} ${P}.tar.${K_TARBALL_SUFFIX} ${DEBIAN_A}
-}
-
-PATCHES=(
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	"${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-	# Fix usage of -s, bug #201006
-	"${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-	# The inline definition from sys/stat.h does not seem to get used
-	# So just copy it to make this compile for now
-	"${FILESDIR}"/klibc-2.0.2-mkfifo.patch
-	# Newer kernels have some headers in the uapi dir
-	"${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch
-)
-
-src_prepare() {
-	[[ ${PKV} ]] && eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Borrow the debian fixes too
-	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
-		PATCHES+=( "${WORKDIR}/debian/patches/${p}" )
-	done
-
-	default
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	LD="$(tc-getLD)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	HOSTLD="$(tc-getBUILD_LD)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		-e '1iCONFIG_ARM_UNWIND=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-	append-ldflags -z noexecstack
-	append-flags -nostdlib
-
-	# Parallel build intermittantly fails when doing `LIST usr/klibc/syscalls/klib.list'
-	emake -j1 \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		HOSTLD="${HOSTLD}" LD="${LD}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-		${myargs}
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		HOSTLD="${HOSTLD}" LD="${LD}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-		${myargs} \
-		install
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	# NOTE: This totally violates sandbox <asturm@gentoo.org>
-	# find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-	find "${D}"/usr/${libdir}/klibc/include -type f \
-		\( -name '.install' -o -name '..install.cmd' \) -delete || die
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/klibc/metadata.xml b/dev-libs/klibc/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/klibc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/libgusb/libgusb-0.3.6.ebuild b/dev-libs/libgusb/libgusb-0.3.6.ebuild
index 4ff3c4ea094f..2288ee798781 100644
--- a/dev-libs/libgusb/libgusb-0.3.6.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/libgweather-3.36.2.ebuild b/dev-libs/libgweather/libgweather-3.36.2.ebuild
index 8e0086d85c3e..ac0aaee8a251 100644
--- a/dev-libs/libgweather/libgweather-3.36.2.ebuild
+++ b/dev-libs/libgweather/libgweather-3.36.2.ebuild
@@ -16,7 +16,7 @@ SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libinput/libinput-1.17.1.ebuild b/dev-libs/libinput/libinput-1.17.1.ebuild
index 610b570961f9..66c9079fcdc3 100644
--- a/dev-libs/libinput/libinput-1.17.1.ebuild
+++ b/dev-libs/libinput/libinput-1.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch
new file mode 100644
index 000000000000..c7f3e66c79f9
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch
@@ -0,0 +1,25 @@
+From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Fri, 17 Jul 2020 15:38:38 +0200
+Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0
+
+---
+ src/zix/btree.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zix/btree.c b/src/zix/btree.c
+index 78a5a0d..d830008 100644
+--- a/src/zix/btree.c
++++ b/src/zix/btree.c
+@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t)
+ ZIX_API bool
+ zix_btree_iter_is_end(const ZixBTreeIter* const i)
+ {
+-	return !i || i->stack[0].node == NULL;
++	return !i || (i->level == 0 && i->stack[0].node == NULL);
+ }
+ 
+ ZIX_API void
+-- 
+GitLab
+
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8-r1.ebuild
similarity index 93%
rename from dev-libs/sord/sord-0.16.8.ebuild
rename to dev-libs/sord/sord-0.16.8-r1.ebuild
index 26bfc0bacf6b..1b9950ec3e5e 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8-r1.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 "
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
diff --git a/dev-libs/zookeeper-c/Manifest b/dev-libs/zookeeper-c/Manifest
deleted file mode 100644
index e3f6cd340120..000000000000
--- a/dev-libs/zookeeper-c/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
-DIST zookeeper-3.4.8.tar.gz 22261552 BLAKE2B 618c46dc891888275166d4ad49fb59c9247f79c9886bdd438297ad682463d56a5088471ee5e0f8935771df9f220108d36cc78d695d6b28820f23344b4623030c SHA512 a5f0eca3c66655e0116aeddd92af228402d3d68350b30f9400b3638ef09610d903b7c87a2bb49a5594b12a4d082048c259ba3da121c1c6da4752dd5f5812bfec
-DIST zookeeper-3.4.9.tar.gz 22724574 BLAKE2B 5792b79068fb98cc0ea8ba53d41bbf7b33556c7c9eb1b042acfa2f8de45381b3f0d42360686386d7254f534639f25530911f668e5aa2dd55fd48c349c69176ea SHA512 4f3e003c6ce5e3338f642f7deaa0fd2cfd1b30591d3ed4fe880492dded6c4bf01d30483e28f3a38b43bb6d2696ff4d819fc9577733224cec07e236437e88a657
diff --git a/dev-libs/zookeeper-c/metadata.xml b/dev-libs/zookeeper-c/metadata.xml
deleted file mode 100644
index d8d5cc720330..000000000000
--- a/dev-libs/zookeeper-c/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild
deleted file mode 100644
index e37688da99f4..000000000000
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-DESCRIPTION="C client interface to Zookeeper server"
-HOMEPAGE="https://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/zookeeper-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/zookeeper-${PV}/src/c"
-
-src_configure() {
-	# bug 652182
-	append-cxxflags -std=c++11
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with test cppunit)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/html/*
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
deleted file mode 100644
index 41d0ea16403d..000000000000
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C client interface to Zookeeper server"
-HOMEPAGE="https://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/zookeeper-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/zookeeper-${PV}/src/c"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with test cppunit)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/html/*
-}
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
deleted file mode 100644
index 41d0ea16403d..000000000000
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C client interface to Zookeeper server"
-HOMEPAGE="https://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/zookeeper-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/zookeeper-${PV}/src/c"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with test cppunit)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/html/*
-}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 51b47d37f515..a4852a8ec669 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest
index 2d0fc3a81478..a1d43f077e56 100644
--- a/dev-lua/lua-argparse/Manifest
+++ b/dev-lua/lua-argparse/Manifest
@@ -1,2 +1 @@
-DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1
 DIST lua-argparse-0.7.1.tar.gz 43778 BLAKE2B 6bc6a3dee3fd98cb8c00fa3ccb3ae9ffdb9f2707d80dd7f5717e1265430731957b756672ed4acd9222c686108f8a8b8c71c71285c2540e818396faf302c1d287 SHA512 f192d0c591516a74408a19c0bbf34233be180f63794211a951d19fc8d981749bc71eace16a4680c8f2bb302ab48958c6a9ffc84022a1754275fc1f9113ae32b0
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
deleted file mode 100644
index d331efad3b86..000000000000
--- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Command line argument parser for the Lua Programming Language"
-HOMEPAGE="https://github.com/mpeterv/argparse"
-SRC_URI="https://github.com/mpeterv/${PN/lua-/}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN//lua-/}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-src_compile() {
-	if use doc; then
-		sphinx-build docsrc html || die
-		rm -rf "${S}"/html/{.doctrees,_sources} || die
-	fi
-}
-
-lua_src_test() {
-	busted  --exclude-tags="unsafe" --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	insinto "$(lua_get_lmod_dir)"
-	doins src/argparse.lua
-}
-
-src_install() {
-	default
-
-	use doc && local -a HTML_DOCS=( "html/." )
-	einstalldocs
-
-	lua_foreach_impl lua_src_install
-}
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 6a4042824914..7cffc5180878 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,3 +1,3 @@
 DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952
 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
+DIST lua-openssl-0.8.0_p6.tar.gz 418000 BLAKE2B 34474c607f6e39985c17f142b1067f2438b51c7e6f62861f65fa8c471722b56dee05a7a45eae277b368ee643a1820334de03c08f09c88a17e851925d575df6d4 SHA512 56125b8a88783b48bbeabd56be4732afe22ef54224b3f03f16e3cbc1ce94f554d6d8dea8236bff34786aad2720b53cbd05dcba85ca41497db61f339014fa3b95
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild
similarity index 96%
rename from dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
rename to dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild
index 9b1d6ab9c9cc..4f76897ac481 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild
@@ -15,7 +15,7 @@ inherit lua toolchain-funcs
 DESCRIPTION="OpenSSL binding for Lua"
 HOMEPAGE="https://github.com/zhaozg/lua-openssl"
 SRC_URI="
-	https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zhaozg/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz
 	https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz
 "
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 869329f0e560..f566b7e9d8a5 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,2 +1,2 @@
 DIST luarocks-3.5.0.tar.gz 244798 BLAKE2B 24ceead8953ad6d9eefbf471fd49e0bd82256cc00c201395770919a680873544db67f062a4af93ddd390985b0b74db55e37a95516287dfc1e077a25b67c9f264 SHA512 fda01b7149839adf7c0e1c05d0f1793e79575c5d378d96ee1e197828e9b9b6e89a635f8a26a5b71db5b48465ef74b219fac18ecdbd59962cbf9da613b05dd42a
-DIST luarocks-3.6.0.tar.gz 246728 BLAKE2B 9e48a3aae391d344e514a9cda1e18db39a95d96a5e9d37a3fc6cdee72815531369c51ea24304bb86d56e46cfdf559314339575a38d9f47898118f1cf172c825e SHA512 f6c66e2bc76899e5153a352274109f3e5d90f9cd2d22ca257b91fb96f53761cc52852aa063e1326416cbe5eb4328207cbbd9310dcb4699dac9a650fb50263135
+DIST luarocks-3.7.0.tar.gz 247576 BLAKE2B b1e119ec897bc8122441445dc215e628d2415dacba9b23c2b075f82a01e21e6e9a8eeab5a3345355d85c566ff9f85ab29194580674521d4d92725b01377ee940 SHA512 cc3c555c488da9f95a118eedb74cb9e2a38b572e172958843dabebce125524e58a13ac65e89a349deb8fef13b6de751074fc3adbb430ab55d4e4109288119153
diff --git a/dev-lua/luarocks/luarocks-3.6.0.ebuild b/dev-lua/luarocks/luarocks-3.7.0.ebuild
similarity index 100%
rename from dev-lua/luarocks/luarocks-3.6.0.ebuild
rename to dev-lua/luarocks/luarocks-3.7.0.ebuild
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 18e893af29a9..2ceb032db9ed 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Config/Manifest b/dev-php/PEAR-Config/Manifest
deleted file mode 100644
index 490f5af63c62..000000000000
--- a/dev-php/PEAR-Config/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Config-2.0.0_pre20140323.tar.gz 34309 BLAKE2B 4c9af6b488f874f58a54a6051a41dbbfd04d2ca042089ce1433b5a11ec2e3e7d35c0b4a08bae7cb5081a7da0d5d08c5f14e982178e1cc409194f80cc46cd4e32 SHA512 7056724cde7d39f5a2ac69c8e2dffd0ff57cb8caba6f014b5cb2a3b047946ca160fb4c30c01cf1986286d885893c9e0f504cee8920b46324987f707b5408be24
diff --git a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
deleted file mode 100644
index 441cc05883f8..000000000000
--- a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2 vcs-snapshot
-
-DESCRIPTION="Provides multiple methods for configuration manipulation"
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test xml"
-RESTRICT="!test? ( test )"
-RDEPEND="xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util )"
-DEPEND="test? ( ${RDEPEND} )"
-SRC_URI="https://github.com/pear/Config/archive/606a24034ad80f9d6ccb5a8b698b702b392e4674.tar.gz -> ${PEAR_P}.tar.gz"
-DOCS=( docs/TODO )
-HTML_DOCS=( docs/Apache.php docs/IniCommented.php docs/IniFromScratch.php )
-
-src_prepare() {
-	# Move snapshot location to where the eclass expects
-	mv "${S}/package.xml" "${WORKDIR}/package.xml" || die
-	sed -i 's/&new/new/' test/phpt_test.php.inc || die
-	sed -i 's/& new/ new/' test/bug6441.phpt || die
-	eapply_user
-}
-
-src_test() {
-	pear run-tests test || die "Tests failed"
-}
diff --git a/dev-php/PEAR-Config/metadata.xml b/dev-php/PEAR-Config/metadata.xml
deleted file mode 100644
index b86acf66c756..000000000000
--- a/dev-php/PEAR-Config/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0e50eadca939..06740596e95e 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 98bf31eda357..68a8f767af23 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,2 +1,3 @@
 DIST bitarray-1.7.1.tar.gz 58441 BLAKE2B f09fa3ffe2cc6534984e9da05ddff767dcca59075f5f08977237eab592a8e3e28ebec2d2bde89a21bba14f4c59a5e0411be50abfe562ebfbaaeca01339786dec SHA512 f45461699f5e48b97001c64c514cdafe208fe31f7cf6c211aa0fb2f32d46028717fcbeb38b812bc8f349226537a3ec6dfec97bc7ecf7253d484332307504abd0
 DIST bitarray-1.9.2.tar.gz 69814 BLAKE2B 7fbe6acf844c35101881216a771729a232ba022fbc0c82c3445c21de2bdba3fa62693109b45b928abbf81ab14442e329ae016cfc703cdeb9d868b5b6146447e1 SHA512 25c0135c166f5d5b8de8448f95b12ae56a10ed5154c6e06bafdc47523cf382da30797c12797692e61b27b1a26104dfac58b08ccf5a1917bf26c7dc4a32da795c
+DIST bitarray-2.0.0.tar.gz 70098 BLAKE2B 3189ca9bc7bb5c765994d85c827e30019d33ecf062fa0aae0158487c61c1bd4316e094ca35276b4f59a55049035bec68b37ca349bed18e27dbd666b7816fdb1a SHA512 564b80b2e22cc04df0b6a2a48a594d0891aecd77cc6644c10bfea9db241cb6f8c92f87be98d1055ba2a71749721f1de6c591794623a5201aed0bded6909dff41
diff --git a/dev-python/bitarray/bitarray-2.0.0.ebuild b/dev-python/bitarray/bitarray-2.0.0.ebuild
new file mode 100644
index 000000000000..c91313e20b97
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e809cb4e6fa1..506ce3608c2c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.17.44.tar.gz 358816 BLAKE2B 1739762cf4723d6fde30080d468732dd6fb9bc9
 DIST boto3-1.17.49.tar.gz 360898 BLAKE2B 6fa6fddf1f5df4d28ed2163feef1f3e3349c9096a9aaa2d07a9ed0c82c893a40227b8f714fec95bf271622e3243faf6b2f6d087bb0b09094ad99e1ae764c7795 SHA512 ed49d19cc9076828c01665af616d12e7b8466aaccaafb263ee845bec6dc3e49c79a85347c68230358658b39b8ff656b674f8812c69b820bb455b584152ce39d6
 DIST boto3-1.17.50.tar.gz 361144 BLAKE2B 2c8549cfb2017e0a2aa6a164c286685e71abe8c7a773baeabc50603ab243b993db88f85a1e5d7d0d9e1c9541df8ed3bab70077d2890f73c1ef760f2bcae85894 SHA512 1cb9405de5b960f55f01ec5d13f3385e8ea99354fc465ae342d3b072ebe179be800ce3100304068731a0a9912b7ea09099c94fe9cf736d0e8a5c88c28d4c9b93
 DIST boto3-1.17.51.tar.gz 361593 BLAKE2B de24e833330b4dc1f3011c824745af6cf521d166cacee0dd01884e23490441c12d78c868cb59635e73f2a0b0765339973ff98cb3db63d34444d426555a32a38a SHA512 c17047c24a1973ea34aec381c0a86e6c4ddac79aa4d1485a155fd92e5d21bc726659d14c829c2f1b4869341537adf4c03cfbcfd32aa8ced4d2966a8fe03256c2
+DIST boto3-1.17.52.tar.gz 361931 BLAKE2B d7660d9e304faeec4f0922a03df2805ee8e619ca0c7c0a822f9defa46ac3f1bf53158ae83034e885dd11382383365b6ef901e6f8c0f985fa327d9ebeb1ba54bd SHA512 76f02eb6bd8e70a6b9c7a44ac14a479b23ba50f37ced6644c511e2bd3e8cd19f803c59e900f47918f52cb0be2522843d6a0c7dae18f595c7ac9f35ceee93c50a
diff --git a/dev-python/boto3/boto3-1.17.52.ebuild b/dev-python/boto3/boto3-1.17.52.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.52.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 43bf804fd6c4..ad8af08031e7 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.20.44.tar.gz 7596878 BLAKE2B 935d4ea1c5212d29566c3344761b00d2eb0
 DIST botocore-1.20.49.tar.gz 7630973 BLAKE2B 89d10ece5cd645d6904046804c2b2d789d7d09c2aa231856f7b5529f54a4933c2bdcc800a64d3bbc27d9f4a7de7debcb3fbc37ead1923b7fa3dbb44b40dd97e8 SHA512 994f9ee04d0b7c99aee12be5823c29fdafe145b7db71df765ba798ba33650b2189fbbfd274aec1051a7e9be1d1ac0ebf19b61ce4d8afd98635e108bbb2c63351
 DIST botocore-1.20.50.tar.gz 7632505 BLAKE2B e52668e217d7dd9769df9cd8e45ee6b50dbc7c4e2f5cc2e05006e9770b45a10bf4f952fa2365511c92223e38b8a440950495ba435cd1a52b190f43f39a56ee73 SHA512 b6d564852d832269be9a553aa629fa5ec77185e997ebe6df16bbd5bd738982ddd8f25378d52286abb24f49bcc494829b9a40735125d62750878534f70c5b718e
 DIST botocore-1.20.51.tar.gz 7636119 BLAKE2B 3c2892b1bdd7697232a3426874178b248aa7d026cd3559f46e5dc2e552cc5f9c7fc2a37575e69f31674e26eeaf2eae6015c8fc60e4b735e9c421dc2d47aa117b SHA512 98a816632f618df85b8d4fe5b1871856e9b77e4b3c627fd189fb36e8170380fa7e2304178a5e3bfcea206e9a6829bc0eab2455e16e7f21fd7271a7491fc8faf0
+DIST botocore-1.20.52.tar.gz 7649448 BLAKE2B 3b27f838ca985df19ab97200c57eea65e43202170aacec270974cd29c8b7f6ea4cab9ad9d53332059aba0d1736fcbb3dd5048b076d8d23ef71f542f734325fc2 SHA512 68a0a66ef0fb732b66ce81043b87dff9174a83edcb2bdfa4779bed05c76738e51f9934f29873cb7d8daf111750e7e5fc12229eb9838c96d3fc8e58b3290b2ca6
diff --git a/dev-python/botocore/botocore-1.20.52.ebuild b/dev-python/botocore/botocore-1.20.52.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.52.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 434af0421116..7e77cd41b1f6 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,2 +1,3 @@
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 DIST cython-0.29.22.gh.tar.gz 2091955 BLAKE2B 8225fa6073d43de1e44e8cd22d52f9bde5d3b6e6e766c74d5ef18d77b57c0e1b22a21cae5b133b0b22f7207aa51dc0e76f1073db977190d42c2b55cc2d7e148e SHA512 b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6
+DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild
new file mode 100644
index 000000000000..d2fe1b9af4ef
--- /dev/null
+++ b/dev-python/cython/cython-0.29.23.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.14-sphinx-update.patch"
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index c707abcbdfff..b900f9ce820d 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1 +1,2 @@
 DIST django-debug-toolbar-3.1.tar.gz 228867 BLAKE2B af3d8011136ba30e690e03548d757405e9cd89fb5473b277720a3151149e92be212e50a6ec3d95903382716c9594405a1e93a7a1bf231f220f4b5c8ae1e38480 SHA512 c4cfa3cd98adfba7362e259e18a0240b886f294ba10f5c64e12887b00d4dc952e9b80cac0f78e7193a15566585f43d988f6d287e4d0dcc84c4f8395c7006e2b0
+DIST django-debug-toolbar-3.2.1.tar.gz 231177 BLAKE2B b07ed03a92b5799dafd1b15b41335c5da6994be1001b579c85e0923ccc092e617ce04c9a2f4344716213cdd62425737838a8539ca5b566928bf8b4c133e8451e SHA512 d28e13cc2e3bbb27e9c728037229adac444180e3831b88c9ac1aa0e139bd1e85f9190c7a324afe3292bde4ad0c919bd17fbde4998be266f81314b9b22c4a28e6
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.1.ebuild
new file mode 100644
index 000000000000..06f03d13eb93
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.org/project/django-debug-toolbar/
+	https://github.com/jazzband/django-debug-toolbar/"
+SRC_URI="https://github.com/jazzband/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	emake TEST_ARGS='-v 2 tests' test
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index bf1f5fd435c2..36c6caebfdbe 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,2 +1,3 @@
 DIST ebuildtester-0.1.16.tar.gz 15564 BLAKE2B ae9c304fcdb9450c0b99eb75128d7e17790b87c541c87ef484a04eb1e74b18df44996e6a2d2ecfea11568f1e028d9279ac708bfa61978b4d8f176dd0183b8a69 SHA512 3e30894f6260b82a97e0000e65ab6a556c2055ab50ebbc7140b6716166b783574b87f333738d87e3ff11672f1b055df2acf483384e616e7bd9ffa42467c79743
 DIST ebuildtester-0.1.27.tar.gz 17347 BLAKE2B 4b4b97235b073bfa1fc78dd3e4f5d03a2e64b277a8675669061beef3185e87c01f882ae830fc5c11b1ba97ea5deb50e93b7cc02b78cef5a0046bb7f2c7ac3433 SHA512 f50fb020e47750c318d0198628721adf166ee3d8544be50169b2012ad72370f063b1367e521af842df0574e491d469e5c2a6aba1576a9f364c95e72a9579950d
+DIST ebuildtester-0.1.29.tar.gz 17446 BLAKE2B d0dccc4e290e9907b90d93ecd87cb263e842ee60944ea9e8a0cb3864029595a5979c16e3c13d59dfd6d5bdc989a6211bf56262b88bbf2f28a86b236f1c305fd9 SHA512 4093df87f85fc581dc1b286b7377929f111d0f1efc960d7623ff3cbd833ef997174b0508422567de819490c30a8246a431d6a29bf71f1e828064b3987bd129a4
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.29.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.29.ebuild
new file mode 100644
index 000000000000..b6204349693b
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.29.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emulation/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index 9017b86e0366..17518b905cdb 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,3 +1,2 @@
-DIST gsd-v1.5.3.tar.gz 240114 BLAKE2B 076d888f03350fba2388c907787354e878a1536c7d85c759eb3513102ee2abffe2c9313a6e9e208726d66d6324dac02ae70d8872342f9bcb162ad13d9a23dbc3 SHA512 893db74dc481da47d6c51ea0d0d9faefbe164edfaeb5a2ed73e25acbd9dc42c3cf28cbc0d9257c6bf0cc0e9911ab85cfa72997886350c0e7c125d30636ec432a
-DIST gsd-v2.4.0.tar.gz 112743 BLAKE2B d35a1108cb12f58f8b6cc980c156ae2dceb0c0d2c4d41d35ae29bae1bc342654e148616e64a6dfcb07bdbb1156299d8d05914d028dfb877979c8a17f299feb06 SHA512 47e136018d813f48c5d78cc31786a5bb33992f488a4d907b450a570bb90f9ffeb233e82f9686d09aeb3541fca1518294d5bf63c6a896635f30ad369350012458
 DIST gsd-v2.4.1.tar.gz 113343 BLAKE2B 5d87fe5dbac037aeccf2ef800fc18accb1888606ed904b15910480032edaaa21bed3adf264e17ea5dc42f6600321c838c15e73617a1d8f49fb9a8e5e79a0bff4 SHA512 47982500160dc2a125ae2d796fccb1fb31fa501f059c8dee9be1342713d62e3d6ce71b534dbc91daedbf6981299efa4b81382afa13283d647c0848bbd3591c91
+DIST gsd-v2.4.2.tar.gz 111622 BLAKE2B a4e08cc03ced2158818cf35e3f827d819b2248de52a21060e06a8d47810e2cf80fc25c9033c8b231b58c723ae794b9066261fdfcc5d19713a916ec9aa31adddc SHA512 8db05903bfcfc45bf1ffc326ffe67ce4d980a2b91596256fa29d006c73f742ac69b829ea2f4b7e1508bf5279c584fd66316e2e0776236bdce791e2cb46093ed3
diff --git a/dev-python/gsd/gsd-1.5.3-r1.ebuild b/dev-python/gsd/gsd-1.5.3-r1.ebuild
deleted file mode 100644
index 0d4d9bf3e1f7..000000000000
--- a/dev-python/gsd/gsd-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="GSD - file format specification and a library to read and write it"
-HOMEPAGE="https://bitbucket.org/glotzer/gsd"
-SRC_URI="https://glotzerlab.engin.umich.edu/Downloads/${PN}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/gsd/gsd-2.4.0.ebuild b/dev-python/gsd/gsd-2.4.0.ebuild
deleted file mode 100644
index 2924812926e4..000000000000
--- a/dev-python/gsd/gsd-2.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="GSD - file format specification and a library to read and write it"
-HOMEPAGE="https://github.com/glotzerlab/gsd"
-SRC_URI="https://github.com/glotzerlab/gsd/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/gsd/gsd-2.4.2.ebuild b/dev-python/gsd/gsd-2.4.2.ebuild
new file mode 100644
index 000000000000..b121fb8f35c3
--- /dev/null
+++ b/dev-python/gsd/gsd-2.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="https://github.com/glotzerlab/gsd"
+SRC_URI="
+	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND=${DEPEND}
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	epytest gsd/test
+	rm -rf .pytest_cache .hypothesis || die
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 6a36410fa85e..ba00d93d4825 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-python-6.8.1.tar.gz 9119495 BLAKE2B 4d98e30a04f652af79dd49e921b8
 DIST hypothesis-python-6.8.9.tar.gz 9122168 BLAKE2B 2568dcfcbc7182071247d0b7d978abf2184be4583937a42568c3e199eac6ce538adb7b3687747979fc6ab9da1e61088db7d1a01294982e75cb04992cdc10537a SHA512 4dc3884e2487f27a3b6b362e04cecd281f9072fdd2e8e91738899baf589d6d48df9eeacb9a158251c20b210d1190b78eadd191aa95f151023bd81091131dff66
 DIST hypothesis-python-6.9.0.tar.gz 9123041 BLAKE2B 5c9a4d1bed02417dd35e67f7f8e63accc7a9c071fde03b7c38b835945605377d8898fbc760fa8149e8476beb247ce19ec946f5365065dfa66b2cb52381760373 SHA512 8d63b22ec3ac9418dde758f70f2a8b65b455cffa32fbbf1fc99c2e64ca40f73436ee9eddea7ada34d8d68a41e88b50d54166babee9869fc03b32926bd85a4507
 DIST hypothesis-python-6.9.1.tar.gz 9123088 BLAKE2B 6a960622fc14d507d5ac66737b88e7b7184c827f31c505797be33766ac8d1721191e48334b58d1d73ef1058eaf94d88ef9d7ddf256948180a12c707b6963d1de SHA512 ad5f18ecbb0376b04eb26f58ad2b72ae6789029bf89f36d4880e5212a4cf7d669a048bb8d4f0bdeb0f5c1f1cc053d054d60235224f5154803fd0319d7b140b3b
+DIST hypothesis-python-6.9.2.tar.gz 9124848 BLAKE2B f1d13f37ee2c9fa4d2716e6c4df412cf652704c1fecda575be2959cde10c9e8b9e54b4a772bda4f1c476936817e6d47d8c17880fa13714daaa9e7b7fd0eca56d SHA512 c209e921e89b5b5863e7b103462cf34a0fd5d06c373c4d880b2aafd8b9521fcd95f58cd00f55eff81804352721b1114f208ce0e19f9142783834e93867ba336b
diff --git a/dev-python/hypothesis/hypothesis-6.9.2.ebuild b/dev-python/hypothesis/hypothesis-6.9.2.ebuild
new file mode 100644
index 000000000000..75d02aad2bd3
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.9.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 408f4b9ca039..c4f14401421b 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,2 +1,3 @@
 DIST py-cpuinfo-6.0.0.tar.gz 145260 BLAKE2B 58cfeb698619f2f51dada63b236969393e387f6e66fffe853ab633e438b4b893489c097211a20ece597a06d3c0cf89d285b5ab34e80029510e86b1a322ff1f06 SHA512 4941a5193cc376a44e99bc82644ec9d7e8f9f11b4e5fb1ad22a71c959959dde7f67290b436dfad2f26c68ef17d08e33538cf80443f763268c503af17b8479438
 DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998efd602b6228f21db6e5b3257563b4f7352221eb7f354ebe431910b0b8dadd52558233261df557c6a7943b7ec138c4 SHA512 fd291533dc5e78d75851e61ef2a754d9bdb62cbb5e04c86db0d6ea2d074a1e920b1ff50c136df3dd640cb64deaccd4f187c5af02c586a3d28b8c74dfe4143893
+DIST py-cpuinfo-8.0.0.tar.gz 99791 BLAKE2B 95024b488142e3bbb2eaa69ffef229ac27f1cb55e297fb8de050ec4c410c1b13dbf674936365d84c5c473158338dd047f6dfba58c2a7dde4e21232af356ab20c SHA512 77351f9f2fd33b09d0ee998dd2b3eb971bbe9094bee5636356d5a5a2747ebba3c112cccfdf929f77e3b7de3c745f98ecfac8edeb0d84fede100b637b554d4fd9
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
new file mode 100644
index 000000000000..944389530103
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="
+	https://github.com/workhorsy/py-cpuinfo/
+	https://pypi.org/project/py-cpuinfo/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 4f06a1829514..b51a4bea978b 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,2 +1 @@
-DIST python-nbxmpp-1.0.2.tar.bz2 112977 BLAKE2B 950d0046e0c01b3e501ca36fbe6e50e383e807d866e83b64d011c4f398d89e6feb2adbee52122a43b307b6c231693d1e9cd2dad36c580ec40c26c1301886a83a SHA512 a20f5e3f55ec6afe2f8846467c45740a3acff2c9f7e3c94ca000113a6f95486abcbb73e78a12901039d019179afb0611e83c245357614474f42286d8f95803d6
 DIST python-nbxmpp-nbxmpp-2.0.2.tar.bz2 121999 BLAKE2B 70116ab89fc99ed5a8bff7cf350f578673c54ee5c38a4cf58cdfa63645e142ad2d1163846989ad8eabd6ce6e9738b84f9e95f42dcce7703202c659c2c9ec29b6 SHA512 31fac81d856a993a7ca014519305c74c342c89e049d779386292e9dc73cde70d924d3fe2903cdb14231b60a583d92406a7830f61a29d2a9cf159a247b8e88509
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild
deleted file mode 100644
index 8d754b8a9ac4..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-1.0.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild
index b8dec3fe4292..b45110cf392a 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index edc0b02a62cd..5b3f6ed93d8f 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,7 +1,3 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.5.60.tar.gz 2905122 BLAKE2B 8863e910dac03d5fd1d53880bb9fe83d218641156e481c97b498e462cf9e1e5c6826f2f25fcef7c65cee3dbc7551401bfd1dba6a319532363b7c9cbc9c37e618 SHA512 395ad0c904215ba3ae16efa52140b7cc6f751efd04c70f687a8891806b346d78c75bb29df5aa0d6d49adb6f5638da58704e713ee1500df05424c9dddc38afad2
-DIST reportlab-3.5.63.tar.gz 2908785 BLAKE2B 0af6f72063e4a1f4464bf8d847575e23b5d96ced3bdbafa518e56503194e98aed5e07c17fbf6cf07d3d95ef91b3d0d450233024b40368889dc1ef5d8792050fe SHA512 39c940a585695752095b868fa631396193083d9d270512e0e89e766e02d749745b6d0438f2d9f5ec2ea58c7da6aa538a0315fbd7483571ebc2c460035e12a1bf
-DIST reportlab-3.5.64.tar.gz 2909252 BLAKE2B 5922ec3083238c2884d7ebede5593a15fa537a8bd72f5cf9b6a84bf1673fe43be2df9f2125f033400c766fdf78a07f4c919b331bbd2215acb950dbbcb971bced SHA512 ac4eb9a7c337ebdde81dcfa9e6b9609aec7fca8451d383c28b9d58e0ea73bd71c328fb2362ba5805b96e10c95dc166d5806eb763c5c325a6d72a9474dce3c422
-DIST reportlab-3.5.65.tar.gz 2909468 BLAKE2B cec88aa00299d329a44379798824a8694f7547a9bb35685b202873387d0b40cdb2bfc864257ee2749c8cc24ed1d26e1ef22c1059fe2e27df38cedae71d55ceda SHA512 a143ff277ab4e9bf667d8334aca9d5b0c959b64eebbd5eda8d6fed95b09cd28544a33bbe5f630753f167b54e63a1a5e04f841c8892712e93d2f8739e9651269a
 DIST reportlab-3.5.66.tar.gz 2911372 BLAKE2B 58bc718157066a82eece18141e08547b8360dd653d2365fdbe1708fee2f1f8dffeced60500b4e866c31947fae00b78ab9853983563fb89e5b34827173c71a534 SHA512 81fac9fd751a451bd5bf6c91efcf9e250ec1c028587c9ed76129d7fd20c4efa17ea0ae45f08dd43a33adf6f4a2c5338a557e869b85d0b6405626720b0e9221a8
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
diff --git a/dev-python/reportlab/reportlab-3.5.60.ebuild b/dev-python/reportlab/reportlab-3.5.60.ebuild
deleted file mode 100644
index dcfc62e7a273..000000000000
--- a/dev-python/reportlab/reportlab-3.5.60.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip
-	test? ( ${RDEPEND} )"
-
-distutils_enable_sphinx docs/source
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	# tests requiring Internet access
-	sed -i -e 's:test0:_&:' \
-		tests/test_platypus_general.py \
-		tests/test_platypus_images.py || die
-	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.5.63.ebuild b/dev-python/reportlab/reportlab-3.5.63.ebuild
deleted file mode 100644
index 71dd8dad099d..000000000000
--- a/dev-python/reportlab/reportlab-3.5.63.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests unittest
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	# tests requiring Internet access
-	sed -i -e 's:test0:_&:' \
-		tests/test_platypus_general.py \
-		tests/test_platypus_images.py || die
-	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	mydistutilsargs=(
-		--no-download-t1-files
-		--use-system-libart
-	)
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.5.64.ebuild b/dev-python/reportlab/reportlab-3.5.64.ebuild
deleted file mode 100644
index 71dd8dad099d..000000000000
--- a/dev-python/reportlab/reportlab-3.5.64.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests unittest
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	# tests requiring Internet access
-	sed -i -e 's:test0:_&:' \
-		tests/test_platypus_general.py \
-		tests/test_platypus_images.py || die
-	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	mydistutilsargs=(
-		--no-download-t1-files
-		--use-system-libart
-	)
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.5.65.ebuild b/dev-python/reportlab/reportlab-3.5.65.ebuild
deleted file mode 100644
index 71dd8dad099d..000000000000
--- a/dev-python/reportlab/reportlab-3.5.65.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests unittest
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	# tests requiring Internet access
-	sed -i -e 's:test0:_&:' \
-		tests/test_platypus_general.py \
-		tests/test_platypus_images.py || die
-	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	mydistutilsargs=(
-		--no-download-t1-files
-		--use-system-libart
-	)
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.5.66.ebuild b/dev-python/reportlab/reportlab-3.5.66.ebuild
index 5eb5d00ddd82..af6ca2578080 100644
--- a/dev-python/reportlab/reportlab-3.5.66.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.66.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 4bbb2d044a75..845cbc1a369e 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,3 +1,4 @@
 DIST requests-cache-0.5.2.tar.gz 31159 BLAKE2B 4fca146a751064baf70954a71df64dbb7f8c9a4e27fec5dbea3620496ce78e7ccfb3785fb63705f513ff6fa938376b0c6acc4a2f584856060b1bc8388517df46 SHA512 355cc571a46b768615606a907a69ed065b3c4b5e74bb6c311abc7a28d9406f32fdea1db0dfd2b1c32dcdc82ed817ef7e0b30086c069de57307254617604c5177
 DIST requests-cache-0.6.0.tar.gz 52342 BLAKE2B 12af89721fcf1ae2e4ab14d7ac377f119ef312c64d3b9e5d80a36f26f3a9a798cf090835ee2c9bf886d0baa9b472f4c439d5a032573d442feecbbad930c239fd SHA512 b5b32b9cb99ec51cee67defde715df66b7c50a26f4124cbaf893685048fe188af0cf664232150e3b4fafe3b7a927716966efafadd711be01118d67ad802acef6
 DIST requests-cache-0.6.1.gh.tar.gz 47919 BLAKE2B 022fd94a332feae043cf646cefc368fdb6ca1833dcd58621a07425bfb0d7bcb5ff9913c8b53f2bc0769fd23e8f364c437ee10f16fd37d1d340e8c46bcba9d53e SHA512 f8bea03b05b2f1e55fe6c975b5f5caacff55250d81f41cf953052c77101fc726ff39f9d95e1fd2829ddb59215226026bdddfd93918feb478395375ac0e0a4439
+DIST requests-cache-0.6.2.gh.tar.gz 47962 BLAKE2B f0597f3c5f4a678b94f3b15023e3aba5247de3d79043e7e1cbd4ab0f2d4457e2f5feab130665129ae87baba56576312b1420ae16c2a34b44dc780bf05351615c SHA512 c97119127b1e80e6eec02938b2e0e8de785875f46d348215e05ee2d668feb77ed40f0dad4ed4a3ae53fb8e6708c8d7b13788e54694a38cef3ce22e83f13f97e2
diff --git a/dev-python/requests-cache/requests-cache-0.6.2.ebuild b/dev-python/requests-cache/requests-cache-0.6.2.ebuild
new file mode 100644
index 000000000000..dd9fdcadae1e
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.6.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+
+		# TODO
+#		'tests/integration/test_cache.py::test_all_response_formats[json]'
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest ${skipped_tests[@]/#/--deselect }
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 44c15d978a1d..eb8b391d6273 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,2 +1,3 @@
 DIST XlsxWriter-RELEASE_1.3.8.tar.gz 32860748 BLAKE2B ef60f0a28cf07c3cf9f13ead3dd02ac952ae6fbd92cb88a2e8ee7593ddb53cc705e1cc4315e943e4c2634bf7a1520184951972b19b7c8d0ba9d70f0814020cbe SHA512 1c2826daf3ed68a1148bf690defe1ba3d2af2640fe398e7741d12f146198823f27659bf8d604ac05c02fb262db218651ad57baf470623ba41009a0b5f4d8f598
+DIST XlsxWriter-RELEASE_1.3.9.tar.gz 32931982 BLAKE2B 3cf4d6497e615b8404da6bcfb610f1a728d6a47a5c70feee82098bf30be46a2b0fcbfaa5ba5fb88544a96bf9bd4c0187721b2db27484e1e293fa3fc45c0ebeef SHA512 1227788c98381fbbfee02c31d846d54ab769bdb8feeb179fa8462278614d8c75d71ee6d2fc4204e8677ebe949add14b1a5448c36bf0e8721eec5b8789da0b676
 DIST xlsxwriter-1.3.7-tests.tar.gz 32545996 BLAKE2B 789ee62a955422629f5a1ab80924774a98c34b2276f9fbc865d6a9d0e31778a49c5b4be72b3f7db55a13ff1d265514bd1dfaadb9243b21faa8ed2740db60ebd7 SHA512 516be34f5f5fd64835a4015c6eb23c23e8aabb34adc189a50f6ff4afe5cb31f01282870ce037679d14e0c40757f1ed51d26b4cb8fecdf952b4c38b6638d1d72f
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.9.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.9.ebuild
new file mode 100644
index 000000000000..c262df7065c5
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index 623d9cb8a8af..480d1039a078 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1 +1,2 @@
 DIST xxhash-2.0.0.tar.gz 64099 BLAKE2B bf4a013b70f02945b00b01043b34ff32bda0ce8aac5a533a0c7c606665a4054f443a46b1f60454b4d19a064db276ea66370a159d4037df49d5213dfc33703421 SHA512 c0d303f2705542ef8edb78ccccf42e3da6904e81cecb52f45861d0f0215f0882ad1617167273781c19bb5ff7ed776ec41a36a380eab2ce59e02636fc76f4b009
+DIST xxhash-2.0.2.tar.gz 64283 BLAKE2B 01fe9868b45f0be762c233a80b550e4069bd7f259fac8aeb90407864ac1fa6cda314880c87ce03d8854bedbecea1eba665ec4e00b27b68a8573c398238c5ce97 SHA512 8908e78207ff7b835259e359e2617f6b96555bd9dbc5bb079c850e9de22fd33c15396fbde0cd824cf8af2a195217f3ddc1aa8e62f1ed4071408b4a29bab31f2c
diff --git a/dev-python/xxhash/xxhash-2.0.2.ebuild b/dev-python/xxhash/xxhash-2.0.2.ebuild
new file mode 100644
index 000000000000..0249b086214b
--- /dev/null
+++ b/dev-python/xxhash/xxhash-2.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding for the xxHash library"
+HOMEPAGE="https://github.com/ifduyue/python-xxhash
+	https://pypi.org/project/xxhash/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND=">=dev-libs/xxhash-0.8.0"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+python_configure_all() {
+	export XXHASH_LINK_SO=1
+}
+
+python_test() {
+	cd tests || die
+	eunittest
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 5d1f9ad32544..ff83a1289b32 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 09b5aaedf423..69d2d81a2398 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -3,3 +3,4 @@ DIST pkg-config-1.4.2.gem 22016 BLAKE2B fb8f32c811f856d11653fc0450e5615d83dea07f
 DIST pkg-config-1.4.3.gem 22016 BLAKE2B a23bfee3790a03d4224efe16439b1c43a6174336b567d7c84d429e848035f7c77d96340e677a7f75e3cef415f236cc1d09cc0f75bee5d8769e9490bc2fc5f4c8 SHA512 4952636442d585b555d048666937e568f237789329ed6110475efe149d607f4b1946ce1b616574a91de7e4c17ef9cc5cc3b4bb2867a7dc08344183a41303f42d
 DIST pkg-config-1.4.4.gem 22016 BLAKE2B 6514405160fdfaa2be0938cb976ae779b964fdf54f0c49f6480ca09d3877459cf88af1f7b17519ee511d24c9b9bdc21087091b3050fcb252487d880f330a7beb SHA512 bb355e2183c9077d0e940d768b7eb12dff2b31fa518b1d28be751c52ecbbb16a99b326c7d6953501056074156faef9f30682dc82c3350da00f80f9a55d491550
 DIST pkg-config-1.4.5.gem 22016 BLAKE2B adbe2447e676c04eaf5e2d7dc6b1a165278f309d01c3d1b34b2a528d6639b525307cc40a62c06026e0c16fea5b7d48f2813f9b8617332586065e2f66ae3e2037 SHA512 4c3f4dc8d414efc9a140f3438c6977c6b534b7944356ac0c4a95233924dbe372c47b15296ba0f8e35cd6520664f28381131cbaafb33f8d004bb34adfdcc5c236
+DIST pkg-config-1.4.6.gem 22528 BLAKE2B 7d040576e0d035af75218e7efee6d3a8ee27206de8e12ef112c6fa7c5917f300c07149c08d510f26f89299cb73c384775403ff7f863379c195fb524c8127c59a SHA512 328fbc46bb549d4cbcd4995cb91545bd13f00f3d24610f9a70b39ea3b58c595d96801fcfe9ca9848d6664d7c9dfce44ce2702a58b894b80744619678e10b0e50
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
new file mode 100644
index 000000000000..6ad94f426799
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild b/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
index e8c48b65a05d..ea503d423b9d 100644
--- a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 83808bc5ce3c..0951240cd6cf 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cutter/cutter-2.0.1.ebuild b/dev-util/cutter/cutter-2.0.1.ebuild
index a4c98cbaf844..c5eb669d8b49 100644
--- a/dev-util/cutter/cutter-2.0.1.ebuild
+++ b/dev-util/cutter/cutter-2.0.1.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="CC-BY-SA-3.0 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="${PYTHON_DEPS}
@@ -24,7 +25,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	dev-util/rizin"
+	dev-util/rizin
+	graphviz? ( media-gfx/graphviz )"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5"
 RDEPEND="${COMMON_DEPEND}"
@@ -42,9 +44,10 @@ src_configure() {
 		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
 		-DCMAKE_C_COMPILER="$(tc-getCC)"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ=OFF
+		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
 		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
 		-DCUTTER_ENABLE_PYTHON=ON
+		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
 		-DCUTTER_USE_BUNDLED_RIZIN=OFF
 	)
 
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 26f785e814d9..91ddf5a6a52b 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1 +1,2 @@
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
+DIST d-feet-0.3.15.tar.xz 231672 BLAKE2B c00352dcec6ef753d888fb7255dfe614a848012aa7b1ed2269ad2f21434219315e10510a6cc60f08108d7d9332a1b5b6cbb73978b9746d3939bf880ce12f2f34 SHA512 c8ac20b91dfa5fea2282099a772c3668ebe75b0e4977b08adc3ee9591e00e391398835af5486b32d8d65e558c58f55cc26523b0e4a3ff1745b722ee90000de87
diff --git a/dev-util/d-feet/d-feet-0.3.15.ebuild b/dev-util/d-feet/d-feet-0.3.15.ebuild
new file mode 100644
index 000000000000..7ffd4b2190b4
--- /dev/null
+++ b/dev-util/d-feet/d-feet-0.3.15.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome2 meson python-single-r1 virtualx
+
+DESCRIPTION="D-Feet is a powerful D-Bus debugger"
+HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test +X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.9.4:3[introspection]
+	>=dev-libs/gobject-introspection-0.9.6:=
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-libs/glib-2.34:2
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.3.91:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=sys-apps/dbus-1
+	X? ( x11-libs/libwnck:3[introspection] )
+"
+BDEPEND="
+	dev-util/itstool
+	>=dev-util/intltool-0.40.0
+	test? ( dev-python/pycodestyle )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 5408454ea12b..8544b1841439 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/optfeature.eclass b/eclass/optfeature.eclass
index b558e8c9084f..06776da922d9 100644
--- a/eclass/optfeature.eclass
+++ b/eclass/optfeature.eclass
@@ -52,11 +52,13 @@ _OPTFEATURE_DOHEADER=true
 # two optfeature calls. Then a custom header is set that is going to be
 # displayed in case dev-db/a or dev-db/b are not installed.
 # @CODE
+# pkg_postinst() {
 #	optfeature "foo support" app-misc/foo
 #	optfeature "bar support" app-misc/bar
 #	optfeature_header "Install optional database backends:"
 #	optfeature "a DB backend" dev-db/a
 #	optfeature "b DB backend" dev-db/b
+# }
 # @CODE
 optfeature_header() {
 	debug-print-function ${FUNCNAME} "$@"
@@ -74,9 +76,11 @@ optfeature_header() {
 # app-misc/bar or app-misc/baz[bar] for optional bar support
 # and either both app-misc/a and app-misc/b or app-misc/c for alphabet support.
 # @CODE
+# pkg_postinst() {
 #	optfeature "foo support" app-misc/foo
 #	optfeature "bar support" app-misc/bar app-misc/baz[bar]
 #	optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
+# }
 # @CODE
 optfeature() {
 	debug-print-function ${FUNCNAME} "$@"
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 9c1d10284999..42c45a9dde71 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 3dd06573d258..489883be377f 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1 +1,2 @@
 DIST minetest-5.4.0.tar.gz 11205196 BLAKE2B 4fd03cf75c6ace4a8e3b1fc81826a43df4a6ea68c7dbdc33cda948e5c81fb49440341f148943c7300036d4063fafb0104fc42a8a29a0495df65d4c66f0d4eb46 SHA512 4cb43678c56ee2ccf9d5dd9c1fc0007119d598a4a56df43fc2a1b827efe08feba0008a30bdb1a1fcd4efe0ada88484b7be0c9e46f108d5424451adb0999b0bcb
+DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
diff --git a/games-action/minetest/minetest-5.4.1.ebuild b/games-action/minetest/minetest-5.4.1.ebuild
new file mode 100644
index 000000000000..6304747349ed
--- /dev/null
+++ b/games-action/minetest/minetest-5.4.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit cmake lua-single xdg
+
+DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	|| ( client server )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+	dev-libs/jsoncpp:=
+	sys-libs/zlib
+	client? (
+		app-arch/bzip2
+		dev-games/irrlicht
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libogg
+			media-libs/libvorbis
+			media-libs/openal
+		)
+		truetype? ( media-libs/freetype:2 )
+	)
+	curl? ( net-misc/curl )
+	leveldb? ( dev-libs/leveldb:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	prometheus? ( dev-cpp/prometheus-cpp )
+	redis? ( dev-libs/hiredis:= )
+	server? (
+		acct-group/minetest
+		acct-user/minetest
+		dev-games/irrlicht-headers
+	)
+	spatial? ( sci-libs/libspatialindex:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# set paths
+	sed \
+		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+		-e "s#@GROUP@#${PN}#g" \
+		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+
+	# remove bundled libraries
+	rm -rf lib || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_UNITTESTS=$(usex test)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=0
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=1
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_PROMETHEUS=$(usex prometheus)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_GMP=1
+		-DENABLE_SYSTEM_JSONCPP=1
+		-DRUN_IN_PLACE=0
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server ; then
+		keepdir /var/log/minetest
+		fowners minetest:minetest /var/log/minetest
+
+		newconfd "${T}"/minetestserver.confd minetest-server
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use server ; then
+		elog
+		elog "Configure your server via /etc/conf.d/minetest-server"
+		elog
+	fi
+
+	elog
+	elog "The version 5.x series is not compatible to the version 0.4 series."
+	elog "This applies to clients and servers, other content such as mods,"
+	elog "texture packs and worlds is unaffected and backwards-compatible"
+	elog "as usual."
+	elog
+}
diff --git a/games-action/xpilot/xpilot-4.5.5-r1.ebuild b/games-action/xpilot/xpilot-4.5.5-r1.ebuild
index d2003e60dd12..c90d59c476c1 100644
--- a/games-action/xpilot/xpilot-4.5.5-r1.ebuild
+++ b/games-action/xpilot/xpilot-4.5.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 	app-text/rman
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
 	#default
@@ -38,12 +38,18 @@ src_prepare() {
 		src/client/textinterface.c || die
 }
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+}
+
 src_compile() {
-	xmkmf || die
-	emake Makefiles
-	emake includes
-	emake depend
-	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS} ${LDFLAGS}"
+	emake \
+		AR="$(tc-getAR) cq" \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4b250b8e4d89..da584e658e5a 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild
index d47824221347..48583653f806 100644
--- a/games-arcade/xboing/xboing-2.4-r3.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic eutils
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks"
 HOMEPAGE="http://www.techrescue.org/xboing/"
@@ -20,7 +20,7 @@ RDEPEND="acct-group/gamestat
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-misc/gccmakedep
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
 S=${WORKDIR}/${PN}
@@ -34,26 +34,29 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf -a || die
 	sed -i -e "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die
 	append-cflags -fcommon
+
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
-		CXXOPTIONS="${CXXFLAGS}" \
+		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
 		XBOING_DIR="/usr/share/${PN}"
 }
 
 src_install() {
-	make \
+	emake \
+		CC="$(tc-getCC)" \
 		PREFIX="${D}" \
 		BINDIR="${D}/usr/bin" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
 		XBOING_DIR="/usr/share/${PN}" \
-		install || die
+		install
 	newman xboing.man xboing.6
 	dodoc README docs/*.doc
 
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
index 78c6be00a5a6..26f6aeae2f8d 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-BDEPEND="x11-misc/imake"
+BDEPEND=">=x11-misc/imake-1.0.8-r1"
 RDEPEND="x11-libs/libXext"
 DEPEND="${RDEPEND}"
 
@@ -33,7 +33,8 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 6772ec657189..c7bab1c58a60 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/xgammon/xgammon-0.98-r2.ebuild b/games-board/xgammon/xgammon-0.98-r2.ebuild
index bc9581d4f527..f06e57934f4d 100644
--- a/games-board/xgammon/xgammon-0.98-r2.ebuild
+++ b/games-board/xgammon/xgammon-0.98-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 S="${WORKDIR}/${P}a"
 
@@ -32,7 +32,8 @@ PATCHES=(
 )
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/games-board/xmille/xmille-2.0-r4.ebuild b/games-board/xmille/xmille-2.0-r4.ebuild
index 4ca1f38b7603..966fec4aec02 100644
--- a/games-board/xmille/xmille-2.0-r4.ebuild
+++ b/games-board/xmille/xmille-2.0-r4.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	app-text/rman
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 RDEPEND="x11-libs/libXext"
 DEPEND="${RDEPEND}"
@@ -29,12 +29,13 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
 	emake -j1 \
-		AR="$(tc-getAR) clq" \
+		AR="$(tc-getAR) cq" \
 		RANLIB="$(tc-getRANLIB)" \
 		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
diff --git a/games-board/xscrabble/xscrabble-2.10-r3.ebuild b/games-board/xscrabble/xscrabble-2.10-r3.ebuild
index fd0c07b9bb08..90d352cb9718 100644
--- a/games-board/xscrabble/xscrabble-2.10-r3.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 BDEPEND="
 	x11-misc/gccmakedep
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
 PATCHES=(
@@ -47,11 +47,12 @@ src_prepare() {
 	# Don't strip binaries
 	sed -i '/install/s/-s //' build || die
 	# Respect AR, RANLIB
-	sed -i 's/CC="${CC}"/& AR="${AR} clq" RANLIB="${RANLIB}"/' build || die
+	sed -i 's/CC="${CC}"/& AR="${AR} cq" RANLIB="${RANLIB}"/' build || die
 }
 
 src_configure() {
-	tc-export AR CC RANLIB
+	tc-export AR CC LD RANLIB
+	export IMAKECPP=${IMAKECPP:-$(tc-getCPP)}
 }
 
 src_compile() {
diff --git a/games-board/xskat/xskat-4.0-r1.ebuild b/games-board/xskat/xskat-4.0-r1.ebuild
index 517567ee1cf1..20a59e4c87ba 100644
--- a/games-board/xskat/xskat-4.0-r1.ebuild
+++ b/games-board/xskat/xskat-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,11 +18,11 @@ RDEPEND="media-fonts/font-misc-misc
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
-src_prepare() {
-	default
-	xmkmf -a || die
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 54b1f9f8fa44..6565afaf010c 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/xcruiser/xcruiser-0.30-r1.ebuild b/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
index c5f7a85927f4..154660e87178 100644
--- a/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
+++ b/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,11 +18,15 @@ RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
+
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+}
 
 src_compile() {
-	xmkmf -a
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index ab573fcaaa56..ff37f1f6b8f7 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 0b22242856cc..148d8b2cfe0f 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,2 +1,2 @@
-DIST bedrock-server-1.16.201.02.zip 89832697 BLAKE2B 055d19866daabf8479fa051dd9ddec0b89e620c02713cf6b98299eaa9b1423c92fa15bdf0a2203e9580ce38e82321e2f2b5420ad11ea45bb01606487c5477a01 SHA512 6238dfccde26780d22337a7f0a1e1fbe75b86e43c4ecd77a551dc7d31bf22fad3705f0f9e328c00cf5ffbee252a70e94f586606aa26e23b32101e3e6a23636a3
 DIST bedrock-server-1.16.210.06.zip 90731004 BLAKE2B a3fcdbb55d4394ae2239efa7ecb6160dce05e72f407695f4e5d39f0184d4b054f73dc362df9354f67bcd99d02a98c6a873754ed8938c3942be7ff2c4a64a37a2 SHA512 bb1bad199d22cd02c4496be811a7e2d3c8ae27ad7283837332a9a3fd3f7fe79402350dca09076b53f452da90a3a30fd74b592615986865b582d404e2f21fae04
+DIST bedrock-server-1.16.220.02.zip 54271561 BLAKE2B 41d1a082299220952960231bf40601043d81129bc168aec75c73eeb14707ae5c7d94498cbdf49a2bac73c700d06bd80c1e5245e49958702e8651239eb0f20f56 SHA512 caee2c9932157f2dd68fb8cd72a1442c95b36ad333762b84979ac8625a758a6c78d776787ac67a0b479c0918d008d288cfaee32a5a2ba426448f4cd4c64ed3a0
diff --git a/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild b/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
index 57b7a7bb616d..63ced0dc4c9e 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild b/games-server/bedrock-server/bedrock-server-1.16.220.02.ebuild
similarity index 98%
rename from games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild
rename to games-server/bedrock-server/bedrock-server-1.16.220.02.ebuild
index 63ced0dc4c9e..57b7a7bb616d 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.220.02.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 5e7d3c1c26a4..7cefe92b8abf 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 79fad4bc25d7..8aa3f5a9dcf0 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,7 +1,5 @@
-DIST openrct2-0.3.2.tar.gz 12749225 BLAKE2B de79fefdb860dae1bf2962f9359d1ea46ab073c80206b6687ef40386725c84d1d048eafbd3f3aeb3fcae3136528568943e4cb88ae0f78b4f6c04d127726254e8 SHA512 e9986ce1fb7e57b4ac80b1de6c99f6b9d26a7a37b4e7fe081528f4faac41833871f9bcf8df864302b8d902271561fc44e606acf8d9adfaf789f69fbc4ae379a7
 DIST openrct2-0.3.3.tar.gz 14107179 BLAKE2B 9c19bf8f88ef7aa33c345ec46c3dc70ae1221fcad075880a86bd3a577835640002126018d2a5251e063d6259cdd3cd4bde58097feb9095b793538b363b827c5d SHA512 de270f043aa9c0c8955eda060c52e430556f212443f4ebb01d2a19012ad84ae81547b65a906bbcf4f04e7a816477abbd05866ddd635903194f6444e8c3cc58f8
-DIST openrct2-objects-1.0.18.zip 3117675 BLAKE2B faccbd11ff7995977b45cc81df07fde8eeecd781141cab813026bc551fb0d867edd078627cc83a6317fddccd025ed3019e14596bf107f48d287110d69c6f73bd SHA512 12deb118740e83a1dcd64b5196371f0fd4f57a3593ab58cb71867ccd35e7a9b0641bb797ab15266ec932c96f1fc208daa7b0e8683ac7e7ef48342733d8b58aa4
 DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
-DIST openrct2-replays-0.0.19.zip 1825303 BLAKE2B d7ddbe090fe041f5bdeab435d223a40f5e8a231850393aa0274813c1b5db0abc2086dcf5b0e807232edf9ceaa05ce98efca14869a01742820366460353c29320 SHA512 09615b9687da0de1fd690765305a413b8e57b1de48d42a8707a9e4167ac20566b39b2abb6112b200ac0caab45001b7cd2896df71205d64df0c61e7742e082de5
 DIST openrct2-replays-0.0.31.zip 1783829 BLAKE2B 70ef5a5ad89b531baefecfa4c673a4d41e18c4ef5586f045a2174bf39d61bc59ebd5deee23abbba138bd9b943f056134845c8710397b84fc388a5e268025b7d2 SHA512 cb26543ad44a9d2c5d4a22e666c9efce605b0de34ac7cc8f42853792f50b8eda9eb551d2e6d0724fc4d282c83043718fa074cdd5081a9f12aebdc62efd2c082c
+DIST openrct2-replays-0.0.38.zip 1765056 BLAKE2B b42fcca434c353e2d5a58e81bfc867221e23e357d334474f5c71d82b6046b7c8fee7e2b41f8c1e3180169125ba897c49af954e3074ca17499dec778e4c7be0ae SHA512 625249b1708bc5530699c1e9b7afee409d42691c0b6214c6a8f8acb2bcdcd3cf28468496d5b56e3ae1620af8e865d314bbdc65209ed1392a84ad62ea0ffd8900
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
diff --git a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
deleted file mode 100644
index ab825ca0f215..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.18"
-MY_PV_RPL="0.0.19"
-MY_PV_TS="0.1.2c"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
-	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
-	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson
-	dev-libs/libzip:=
-	media-libs/libpng:0=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-	)
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	if use test; then
-		mkdir -p "${S}"/testdata/replays || die
-		cd "${S}"/testdata/replays || die
-		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Don't treat warnings as errors.
-	sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Note: There is currently no support for Disord-RPC and Google Benchmark,
-	# as both packages do not exist in Gentoo, so support for them has been disabled.
-	local mycmakeargs=(
-		-DDISABLE_DISCORD_RPC=ON
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_LIGHTFX=$(usex lightfx)
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Since the tests need the OpenRCT2 data,
-	# we need to symlink them into the build directory,
-	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
-	# It is currently not possible to override that path.
-	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
-	ln -s "${S}"/data "${BUILD_DIR}" || die
-
-	cmake_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_src_install
-
-	if use dedicated; then
-		newinitd "${FILESDIR}"/openrct2.initd openrct2
-		newconfd "${FILESDIR}"/openrct2.confd openrct2
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-0.3.3.ebuild b/games-simulation/openrct2/openrct2-0.3.3.ebuild
index 54af75482582..820c8e5deb39 100644
--- a/games-simulation/openrct2/openrct2-0.3.3.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
 
 COMMON_DEPEND="
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 67f3ef57ee5a..bce8ca40fdd6 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -13,7 +13,7 @@ MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
 MY_PV_OBJ="1.0.21"
-MY_PV_RPL="0.0.31"
+MY_PV_RPL="0.0.38"
 MY_PV_TS="0.1.2c"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index e4ef692b8dab..a233cc921a4c 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
deleted file mode 100644
index 7b5d8c5aefc0..000000000000
--- a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <diegoe@gnome.org>
-Date: Thu, 31 Oct 2019 05:51:22 -0500
-Subject: [PATCH] build: Update use of link_whole for meson-0.52
-
-A regression in meson-0.52 caused uses of link_whole to expose scenarios
-where duplicate symbols issues could appear. In particular
-libdconf_client_dep was being link_whole'd to itself, which recursively
-already included libdconf_common which was also a link_whole.
-
-This change does not modify the available symbols in libdconf.so, and is
-compatible with meson-0.52 and 0.51.
-
-See: https://github.com/mesonbuild/meson/pull/6030
-Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
----
- client/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/meson.build b/client/meson.build
-index f3b7122..de6387e 100644
---- a/client/meson.build
-+++ b/client/meson.build
-@@ -28,7 +28,7 @@ libdconf_client = static_library(
- 
- libdconf_client_dep = declare_dependency(
-   dependencies: gio_dep,
--  link_whole: libdconf_client,
-+  link_with: libdconf_client,
- )
- 
- libdconf = shared_library(
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild
index ac894c3d8ce2..164c4de68f62 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.38.5.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	flickr? ( gnome-online-accounts )
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
index 6ec27d919253..706a013f6ea9 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
index 88737c316d3d..9d0bc54583fa 100644
--- a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
index c34921539525..b7a6ba9e7f2b 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.4.ebuild
@@ -15,7 +15,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 379cb36a3db3..f9191306088b 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 81ed4f3ad8df..88a2d6ed82eb 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-frippery-3.38.0.tgz 82248 BLAKE2B c36b7e01b15cfe61af93377b22a2baa967846dbc69c0a9667352a80a7db62f554e9f66d3990cdbc932096d371c1bf46d300c25a2eb523adc6cbb90d8e9c4d9d0 SHA512 16d212a0fd6ce1625eabf6dced3d64bfb9635e4a67c131c5a9c57041cb53530bb9e514af24190599ff7324016ae86524455091c507f0bfef39ed2d57b3b1cbed
+DIST gnome-shell-frippery-40.0.tgz 82308 BLAKE2B 2466880cc04a46a8177640a19fa9ed89d784a34fbaa7a65d6948732d0794f270573df8d108c9a74c78296d2bd1565c4d3493caf4086a6f574e7e17b950eeb7db SHA512 68e2cc452df26a7c806f62b3ed2864ebaf766495ba47991531167e63aa87b2baeb301b83d2f288ad87802e7b2220576108d6962386ac5ee08fb3d89024d8bca2
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.0.ebuild
new file mode 100644
index 000000000000..fc8efefccf22
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.38
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
index c71dcb2c2a96..1590ddd10d26 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/gnome-extra/sushi/sushi-3.38.0.ebuild b/gnome-extra/sushi/sushi-3.38.0.ebuild
index 9a2dfada0ca0..2773a6d6bfed 100644
--- a/gnome-extra/sushi/sushi-3.38.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="office wayland +X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild
index 29a5e84f6294..08f7b3920576 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.38.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/yelp-3.38.3.ebuild b/gnome-extra/yelp/yelp-3.38.3.ebuild
index ff02c223d184..34af0767f4ae 100644
--- a/gnome-extra/yelp/yelp-3.38.3.ebuild
+++ b/gnome-extra/yelp/yelp-3.38.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index f93cdaacaf06..a669082e9658 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 3c0678bad6e7..265eb6c4d807 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,4 @@
 DIST libhandy-1.0.3.tar.xz 389068 BLAKE2B 2892103a672551f9a48a2f877568548fe771aeddbf156427baf03f8654488b5a0a8218f621366a47097030eb0ecf5abeb4f021d320046602cda0a028d91ec566 SHA512 cc304acc53e0819dce4931292e395ba44c1eb8630ebfa56390637bf376de226f4545906892967815c3e144423409b5a85e293568d3ed8069a6c4775307aeef4f
 DIST libhandy-1.2.0.tar.xz 481120 BLAKE2B 327a2b1d9bec68a705f0e1cd7ebecc35706a95fd9964482244ebc6fd36f84e1563918286e507b77ec70ba4bab118b0e508a2cebef7514685221b918994d2fa6a SHA512 34f84479fcef6fdd3b46a03a0b4806887708ce8295461eae655e34febdec5b62de56e34e58696545f086be8de1e2c0ac13a61a4bbe0a945a87e7d8e860a5f919
+DIST libhandy-1.2.1.tar.xz 488324 BLAKE2B 9266671b0503971b80d9466673431624600c1ed0d061693187ab2dfe5a017235c985ba997882493f03bd7d6bb0d32c78a8858591dc57f6c101e64987d37eef4a SHA512 0474d1f15a1572ab3f622ec703fc4167beb3ed6062f566d8b50c20894a217c66d00c5b4616d54e65fac312b9836428e8cb83753566cf67abffb9eafbb87dc926
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
diff --git a/gui-libs/libhandy/libhandy-1.2.1.ebuild b/gui-libs/libhandy/libhandy-1.2.1.ebuild
new file mode 100644
index 000000000000..1df7e54eddb4
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.24.1:3[introspection?]
+	glade? ( dev-util/glade:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofiling=false # -pg passing
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use examples)
+		$(meson_feature glade glade_catalog)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index d59cf9ee6f6d..3df5bbd73f06 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
index 317f1719d5b2..d3fb28b81da8 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index e1d5676e8300..03cf7d8fc2d0 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
index a93ce57a9f47..0673462a08fd 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit font
+inherit font toolchain-funcs
 
 MY_P="jmk-x11-fonts-${PV}"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 
 BDEPEND="
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	>=x11-apps/mkfontscale-1.2.0
 	x11-apps/bdftopcf"
 
@@ -25,9 +25,9 @@ PATCHES=( "${FILESDIR}"/gzip.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	xmkmf || die
-	default
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_install() {
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6d3a189c515f..893e35c8f1b3 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/eog/eog-3.38.2.ebuild b/media-gfx/eog/eog-3.38.2.ebuild
index e0fd2241d634..8b0331ef5a00 100644
--- a/media-gfx/eog/eog-3.38.2.ebuild
+++ b/media-gfx/eog/eog-3.38.2.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 2455bcce9116..595bd98db344 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1 @@
-DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
diff --git a/media-gfx/inkscape/files/glib-2.67.3.patch b/media-gfx/inkscape/files/glib-2.67.3.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/media-gfx/inkscape/files/glib-2.67.3.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h     | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+ 
+ #include <stdio.h>
+ 
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif                          /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+  * Typedefs
+  * ===================================================================== */
+ 
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with.  */
+   enum _at_polynomial_degree {
+     AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif                          /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+   guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+ 
++#ifdef __cplusplus
++}
++#endif                          /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/files/missing_atomic_include.patch b/media-gfx/inkscape/files/missing_atomic_include.patch
deleted file mode 100644
index b298550c5c89..000000000000
--- a/media-gfx/inkscape/files/missing_atomic_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ui/tool/node.cpp	2020-05-01 15:18:52.000000000 +0200
-+++ b/src/ui/tool/node.cpp	2020-08-18 01:25:05.266412299 +0200
-@@ -7,6 +7,7 @@
-  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
-  */
- 
-+#include <atomic>
- #include <iostream>
- #include <stdexcept>
- #include <boost/utility.hpp>
diff --git a/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
deleted file mode 100644
index 861ac2210cd7..000000000000
--- a/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}/missing_atomic_include.patch"
-)
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	net-libs/libsoup
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${P}_2020-09-07_3bc2e813f5
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DENABLE_POPPLER=ON
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}
diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index 6e4e248cea3a..d70335ea2fbb 100644
--- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
@@ -100,6 +100,10 @@ RESTRICT="test"
 
 S="${WORKDIR}"/${P}_2021-01-15_e86c870879
 
+PATCHES=(
+	"${FILESDIR}"/glib-2.67.3.patch
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index 6be4674857ca..dd86242cd42f 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -20,9 +20,10 @@ RDEPEND="x11-libs/libXpm
 	virtual/jpeg
 	media-libs/libpng
 	x11-apps/rgb"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	app-text/rman"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/rman
+	>=x11-misc/imake-1.0.8-r1"
 
 S=${WORKDIR}/${MY_P}
 
@@ -61,11 +62,6 @@ sed_Imakefile() {
 src_prepare() {
 	default
 
-	# Create wrapper for gcc, bug #720820
-	printf '#!/bin/sh\n%s ${*}\n' "$(tc-getCC)" > "${T}"/gcc
-	chmod +x "${T}"/gcc
-	export PATH="${T}:${PATH}"
-
 	find . -type f -exec chmod a-x '{}' \; || die
 	find . -name Makefile -delete || die
 
@@ -75,11 +71,14 @@ src_prepare() {
 	sed_Imakefile fig2dev/Imakefile fig2dev/dev/Imakefile
 }
 
-src_compile() {
-	xmkmf || die "xmkmf failed"
-	emake Makefiles
+src_configure() {
+	export IMAKECPP=${IMAKECPP:-$(tc-getCPP)}
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die
+}
 
-	emake CC="$(tc-getCC)" AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
+src_compile() {
+	emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles
+	emake CC="$(tc-getCC)" AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" \
 		LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
 		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 9439e0b09532..d68f42ffcf6e 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -23,7 +23,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	!media-gfx/xloadimage"
 
 S=${WORKDIR}/${PN}-${SNAPSHOT}
@@ -53,8 +53,12 @@ src_prepare() {
 		"${FILESDIR}"/${P}-libpng14.patch
 }
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+}
+
 src_compile() {
-	xmkmf || die
 	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4d9b9ed130c8..385ed758a80f 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 6364aaca1aa4..513893a8cd31 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,13 +24,14 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXpm
 	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
@@ -51,13 +52,14 @@ multilib_src_configure() {
 	pushd config || die
 	econf
 	popd || die
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 multilib_src_compile() {
 	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
 	local emakeopts=(
-		AR="$(tc-getAR) clq"
+		AR="$(tc-getAR) cq"
 		AS="$(tc-getAS)"
 		CC="$(tc-getCC)"
 		CDEBUGFLAGS="${CFLAGS}"
@@ -82,7 +84,7 @@ multilib_src_compile() {
 			Makefile || die
 	fi
 
-	emake "${emakeopts[@]}" World
+	emake "${emakeopts[@]}"
 }
 
 multilib_src_install() {
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 7cc4f8fccac4..a6ae642d2e86 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -10,6 +10,7 @@
 		support, but also used by GIS and other imaging tools.
 	</longdescription>
 	<upstream>
+		<remote-id type="gitlab">libtiff/libtiff</remote-id>
 		<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
 		<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
 	</upstream>
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index 11406fce52cc..714507392efe 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Tag Image File Format (TIFF) library"
 HOMEPAGE="http://libtiff.maptools.org"
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0.ebuild
index a3d7588a87d7..1a2174a6add7 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
 	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
 "
 BDEPEND="
 	dev-libs/libxslt
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index a3d7588a87d7..1a2174a6add7 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
 	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
 "
 BDEPEND="
 	dev-libs/libxslt
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index d9e169b1a1be..e6cbe050ec96 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r1.ebuild
index 0d4596ba3e93..a02af617b34f 100644
--- a/media-radio/ibp/ibp-0.21-r1.ebuild
+++ b/media-radio/ibp/ibp-0.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ IUSE="X"
 RDEPEND="sys-libs/ncurses:0
 	X? ( x11-libs/libX11  )"
 DEPEND="${RDEPEND}
-	X? ( x11-misc/imake )"
+	X? ( >=x11-misc/imake-1.0.8-r1 )"
 
 src_prepare() {
 	# respect CFLAGS if built without USE=X
@@ -31,7 +31,8 @@ src_prepare() {
 
 src_configure() {
 	if use X ;then
-		xmkmf || die
+		CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+			IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 	fi
 }
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 29121439f268..ac1aa590d8f6 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild b/media-sound/csound/csound-6.15.0-r101.ebuild
new file mode 100644
index 000000000000..6705f7c34293
--- /dev/null
+++ b/media-sound/csound/csound-6.15.0-r101.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound${PV}"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+	alsa? ( threads )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+CDEPEND="
+	dev-cpp/eigen:3
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	hdf5? ( sci-libs/hdf5 )
+	image? ( media-libs/libpng:0= )
+	jack? ( virtual/jack )
+	java? ( >=virtual/jdk-1.8:* )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( =sci-mathematics/gmm-5.1* )
+	lua? ( ${LUA_DEPS} )
+	mp3? ( >=media-sound/lame-3.100-r3 )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+	"${FILESDIR}/${PN}-6.15.0-lame.patch"
+	"${FILESDIR}/${PN}-6.15.0-fix-soname.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use doc; then
+		local png="${WORKDIR}/html/images/delayk.png"
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FAUST_OPCODES=OFF
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_RELEASE=ON
+		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+		-DBUILD_SELECT_OPCODE=ON
+		-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STACK_OPCODES=ON
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_VST4CS_OPCODES=OFF
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
+
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COREMIDI=OFF # Apple specific
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		-DUSE_IPMIDI=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
+		-DUSE_LRINT=ON
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+	)
+
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
+
+	use lua && mycmakeargs+=(
+		-DLUA_H_PATH="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
+		# so it must NOT be installed into cmod_dir.
+	)
+
+	use python && mycmakeargs+=(
+		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index cdc5d7cf5933..f0b572659996 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -244,6 +244,8 @@ src_install() {
 
 	use python && python_optimize
 
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
 	# install docs
 	if [[ ${PV} != "9999" ]] && use doc ; then
 		dodoc "${WORKDIR}"/*.pdf
diff --git a/media-sound/csound/files/csound-6.15.0-fix-soname.patch b/media-sound/csound/files/csound-6.15.0-fix-soname.patch
new file mode 100644
index 000000000000..7bac87082565
--- /dev/null
+++ b/media-sound/csound/files/csound-6.15.0-fix-soname.patch
@@ -0,0 +1,21 @@
+From 20daf5f4edbbf7291ad32dd623a335be1de0c54f Mon Sep 17 00:00:00 2001
+From: vlazzarini <victor.lazzarini@mu.ie>
+Date: Tue, 13 Apr 2021 21:04:05 +0100
+Subject: [PATCH] issue #1449
+
+---
+ interfaces/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
+index d72c4ffdc6..3da25b627a 100644
+--- a/interfaces/CMakeLists.txt
++++ b/interfaces/CMakeLists.txt
+@@ -216,6 +216,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
+             ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR})
+         if(${CMAKE_COMPILER_IS_GNUCC})
+             target_compile_options(_jcsound6 PRIVATE "-Wno-error")
++             target_link_options(_jcsound6 PRIVATE "-Wl,-soname,lib_jcsound.so.1")
+         endif()
+ 
+         install(TARGETS _jcsound6
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.0-r1.ebuild
similarity index 99%
rename from media-sound/fluidsynth/fluidsynth-2.2.0.ebuild
rename to media-sound/fluidsynth/fluidsynth-2.2.0-r1.ebuild
index a56c09092f91..781c4e52a80f 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fluidsynth.org"
 SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-SLOT="0/2"
+SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index a92a923b07b8..2650aa8061a8 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # The order is important here! Both, cmake and xdg define src_prepare.
 # We need the one from cmake
-inherit xdg cmake
+inherit bash-completion-r1 xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -70,6 +70,7 @@ DOCS=( README.md doc/AUTHORS )
 
 src_configure() {
 	local mycmakeargs+=(
+		-DBASHCOMP_PKG_PATH="$(get_bashcompdir)"
 		-DUSE_WERROR=FALSE
 		-DWANT_CAPS=FALSE
 		-DWANT_TAP=FALSE
@@ -92,15 +93,3 @@ src_configure() {
 	)
 	cmake_src_configure
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 76683ea368a0..b792ef60d40a 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/cheese/cheese-3.38.0.ebuild b/media-video/cheese/cheese-3.38.0.ebuild
index c12f4984c2fb..5541bb6e01ac 100644
--- a/media-video/cheese/cheese-3.38.0.ebuild
+++ b/media-video/cheese/cheese-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild b/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
index e033177c23fd..fac1f7bccb13 100644
--- a/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
+++ b/media-video/gnome-video-effects/gnome-video-effects-0.5.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeVideoEffects"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 9f0cd88446b2..6e4c76eea570 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,2 +1 @@
-DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
diff --git a/media-video/motion/files/motion.confd-r4 b/media-video/motion/files/motion.confd-r4
deleted file mode 100644
index 8a200d14928c..000000000000
--- a/media-video/motion/files/motion.confd-r4
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# Motion OpenRC conf.d file
-# All settings are optional
-
-# Set the user and group under which motion will be run
-#MOTION_USER="motion"
-#MOTION_GROUP="motion"
-
-#Set motion's config file:
-#MOTION_CONFIGFILE="/etc/motion/motion.conf"
-
-#Set motion's log file. Leave unset for syslog:
-#MOTION_LOGFILE="/var/log/motion/motion.log"
-
-#Set log type:  1-9 for COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL
-#MOTION_LOGTYPE="9"
-
-#Set log level: 1-9 for EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL
-#MOTION_LOGLEVEL="6"
-
-#Set a default dir where motion places its output
-#MOTION_DIR="/var/lib/motion"
-
-#Set the umask for the output files, for additonal security
-#MOTION_UMASK="007"
-
diff --git a/media-video/motion/files/motion.initd-r4 b/media-video/motion/files/motion.initd-r4
deleted file mode 100644
index 30d5e25cb08e..000000000000
--- a/media-video/motion/files/motion.initd-r4
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${MOTION_USER:="motion"}
-: ${MOTION_GROUP:="motion"}
-
-[ "${MOTION_UMASK}" ] && umask="${MOTION_UMASK}"
-[ "${MOTION_CONFIGFILE}" ] && command_args="-c ${MOTION_CONFIGFILE}"
-[ "${MOTION_LOGFILE}" ] && command_args="${command_args} -l ${MOTION_LOGFILE}"
-[ "${MOTION_LOGTYPE}" ] && command_args="${command_args} -k ${MOTION_LOGTYPE}"
-[ "${MOTION_LOGLEVEL}" ] && command_args="${command_args} -d ${MOTION_LOGLEVEL}"
-
-command=/usr/bin/motion
-command_user="${MOTION_USER}:${MOTION_GROUP}"
-
-start_pre() {
-  if [ "${MOTION_DIR}" ] ; then
-    mkdir -p "${MOTION_DIR}"
-    checkpath -d -o "${MOTION_USER}" "${MOTION_DIR}"
-    directory="${MOTION_DIR}"
-  fi
-  if [ "${MOTION_LOGFILE}" ] ; then
-    local LOGFILE=${MOTION_LOGFILE##*/}
-    local LOGDIR=${MOTION_LOGFILE%$LOGFILE} 
-    mkdir -p "${LOGDIR}"
-    checkpath -d -o "${MOTION_USER}" "${LOGDIR}"
-  fi
-}
-
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index 45dcbfba21ef..cec3a16a5f2f 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="mariadb">Add mariadb database support</flag>
 		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
-		<flag name="supervise-daemon">Add experimental suppport for OpenRC's supervise-daemon process supervision</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Motion-Project/motion</remote-id>
diff --git a/media-video/motion/motion-4.3.1.ebuild b/media-video/motion/motion-4.3.1.ebuild
deleted file mode 100644
index fcb7435c91e5..000000000000
--- a/media-video/motion/motion-4.3.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="A software motion detector"
-HOMEPAGE="https://motion-project.github.io"
-SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp"
-
-RDEPEND="
-	acct-group/motion
-	acct-user/motion
-	virtual/jpeg:=
-	ffmpeg? ( media-video/ffmpeg:0= )
-	mariadb? ( dev-db/mariadb-connector-c )
-	mmal? ( media-libs/raspberrypi-userland )
-	mysql? ( dev-db/mysql-connector-c )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="${RDEPEND}
-	net-libs/libmicrohttpd
-	v4l? (
-		media-libs/libv4l
-		virtual/os-headers
-	)
-"
-
-# Breaks src_install(), #727056
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to setup a configuraton file (/etc/motion/motion.conf) before
-running motion for the first time.
-
-If motion is built with the mysql or mariadb use flags then please make
-sure to configure a matching database_type in the config file.
-
-Motion runs by default under user motion and group motion:
-- change this if needed in /etc/conf.d/motion
-- or add users who need access to the output files to the motion group
-
-To install motion as a service, use:
-- rc-update add motion default # with OpenRC
-- systemctl enable motion.service # with systemd
-"
-
-S="${WORKDIR}"/${PN}-release-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ffmpeg) \
-		$(use_with mariadb) \
-		$(use_with mmal) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3) \
-		$(use_with v4l v4l2) \
-		$(use_with webp) \
-		--without-optimizecpu
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		examplesdir=/usr/share/doc/${PF}/examples \
-		install
-
-	# build INITDAD string cwto be added to initd based on use flags, eg
-	# "depend() {
-	#   use mysql
-	# }
-	#
-	# supervisor=supervise-daemon"
-	local INITDADJ=""
-	( use mysql || use mariadb ) && INITDADJ=" use mysql\n"
-	use postgres && INITDADJ="${INITDADJ}  use postgresql\n"
-	[ "${#INITDADJ}" -gt 0 ] && INITDADJ="depend() {\n${INITDADJ}}\n"
-	if use supervise-daemon ; then
-		INITDADJ="${INITDADJ}\nsupervisor=supervise-daemon\n"
-	else
-		INITDADJ="${INITDADJ}\npidfile=/run/\${RC_SVCNAME}.pid\ncommand_background=true\n"
-	fi
-	cp "${FILESDIR}/${PN}.initd-r4" "${T}/initd" || die
-	echo -e ${INITDADJ} >> "${T}/initd" || die
-
-	newinitd "${T}/initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	readme.gentoo_create_doc
-	readme.gentoo_print_elog
-}
diff --git a/media-video/motion/motion-4.3.2.ebuild b/media-video/motion/motion-4.3.2-r1.ebuild
similarity index 98%
rename from media-video/motion/motion-4.3.2.ebuild
rename to media-video/motion/motion-4.3.2-r1.ebuild
index 10749fd8c447..19c0917b4e13 100644
--- a/media-video/motion/motion-4.3.2.ebuild
+++ b/media-video/motion/motion-4.3.2-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="ffmpeg mariadb mmal mysql postgres sqlite v4l webp"
 RDEPEND="
 	acct-group/motion
 	acct-user/motion
+	net-libs/libmicrohttpd:=
 	virtual/jpeg:=
 	ffmpeg? ( media-video/ffmpeg:0= )
 	mariadb? ( dev-db/mariadb-connector-c )
@@ -27,7 +28,6 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )
 "
 DEPEND="${RDEPEND}
-	net-libs/libmicrohttpd
 	v4l? (
 		media-libs/libv4l
 		virtual/os-headers
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 699b824f3ad8..2b3cfd60a913 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2f1b6538e618..8df68041ff80 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Apr 2021 08:08:31 +0000
+Thu, 15 Apr 2021 09:08:28 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2f1b6538e618..8df68041ff80 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Apr 2021 08:08:31 +0000
+Thu, 15 Apr 2021 09:08:28 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 742f3e49d7f9..ac19bfb54bf2 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 7636ac0d4c1e..e6afcccf4b59 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/accerciser-3.38.0 b/metadata/md5-cache/app-accessibility/accerciser-3.38.0
index bd0d0308a940..340dc5582ccf 100644
--- a/metadata/md5-cache/app-accessibility/accerciser-3.38.0
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.38.0
@@ -5,11 +5,11 @@ DESCRIPTION=Interactive Python accessibility explorer
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Accerciser
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD CC-BY-SA-3.0
 RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=x11-libs/gtk+-3.1.13:3[introspection] python_single_target_python3_7? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_7(-)] >=dev-python/ipython-0.11[python_targets_python3_7(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/python-xlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] >=dev-python/ipython-0.11[python_targets_python3_8(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] >=dev-python/ipython-0.11[python_targets_python3_9(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] ) dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] gnome-base/librsvg[introspection] python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/accerciser/3.38/accerciser-3.38.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d2c3ed72497f3830987bc78231bb377
+_md5_=fdd7189af6e8969fe2363b66ea0ddf62
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 4f4c92468a6b..67458e492819 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/exo-1.27.1 b/metadata/md5-cache/app-admin/exo-1.27.2
similarity index 77%
rename from metadata/md5-cache/app-admin/exo-1.27.1
rename to metadata/md5-cache/app-admin/exo-1.27.2
index c38440a08a3d..7de60facc3ee 100644
--- a/metadata/md5-cache/app-admin/exo-1.27.1
+++ b/metadata/md5-cache/app-admin/exo-1.27.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.27.1.tar.gz -> exo-1.27.1.tar.gz
+SRC_URI=https://github.com/exoscale/cli/archive/v1.27.2.tar.gz -> exo-1.27.2.tar.gz
 _md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/gopass-1.12.5 b/metadata/md5-cache/app-admin/gopass-1.12.5
index 19f0918ebb53..ba515b86ec13 100644
--- a/metadata/md5-cache/app-admin/gopass-1.12.5
+++ b/metadata/md5-cache/app-admin/gopass-1.12.5
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/gopasspw/gopass/archive/v1.12.5.tar.gz -> gopass-1.12.5.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//filippo.io/age/@v/v1.0.0-rc.1.zip -> filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.zip mirror://goproxy//filippo.io/age/@v/v1.0.0-rc.1.mod -> filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.4.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.4.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.zip -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.mod -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.zip -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.mod -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.10.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.10.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.zip mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopasspw/pinentry/@v/v0.0.2.zip -> github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/gopasspw/pinentry/@v/v0.0.2.mod -> github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.zip -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.zip mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.4.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210326060303-6b1517762897.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210326060303-6b1517762897.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210326060303-6b1517762897.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210326060303-6b1517762897.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b	optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=go-module	92660621959e7fab813173772987588b	optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=9d9c66517d1d704425c6e6c8233afe4b
diff --git a/metadata/md5-cache/app-admin/keepass-2.46 b/metadata/md5-cache/app-admin/keepass-2.46
index 1578703a1e25..70df6f44f598 100644
--- a/metadata/md5-cache/app-admin/keepass-2.46
+++ b/metadata/md5-cache/app-admin/keepass-2.46
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.46-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	a3678a005063e7c50aed4e37d04197ab	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	2e90be23a14db1ea432d6b216eb2a81e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b9290ef5e2b58cb3ffbaee0ed5b4a0d
diff --git a/metadata/md5-cache/app-admin/keepass-2.47 b/metadata/md5-cache/app-admin/keepass-2.47
index 5b645e349d88..21eac6515c96 100644
--- a/metadata/md5-cache/app-admin/keepass-2.47
+++ b/metadata/md5-cache/app-admin/keepass-2.47
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.47-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	a3678a005063e7c50aed4e37d04197ab	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	2e90be23a14db1ea432d6b216eb2a81e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a769291097e04fe4ae5cfc7670d419dd
diff --git a/metadata/md5-cache/app-admin/kpcli-3.6 b/metadata/md5-cache/app-admin/kpcli-3.6
index eaa482e3694e..3089f84435c7 100644
--- a/metadata/md5-cache/app-admin/kpcli-3.6
+++ b/metadata/md5-cache/app-admin/kpcli-3.6
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-perl/Crypt-Rijndael dev-perl/File-KeePass dev-perl/Math-Random-ISAAC dev-perl/Sort-Naturally dev-perl/Sub-Install dev-perl/TermReadKey dev-perl/Term-ReadLine-Gnu dev-perl/Term-ShellUI
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/kpcli/kpcli-3.6.pl
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=977cb61c78bff916acec2e905235b921
diff --git a/metadata/md5-cache/app-admin/openrc-settingsd-1.0.1-r1 b/metadata/md5-cache/app-admin/openrc-settingsd-1.0.1-r1
index f715bcee307d..1cf698f919e4 100644
--- a/metadata/md5-cache/app-admin/openrc-settingsd-1.0.1-r1
+++ b/metadata/md5-cache/app-admin/openrc-settingsd-1.0.1-r1
@@ -1,5 +1,6 @@
+BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.30:2 dev-libs/libdaemon:0= sys-apps/dbus sys-apps/openrc:= sys-auth/polkit dev-util/gdbus-codegen virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.30:2 dev-libs/libdaemon:0= sys-apps/dbus sys-apps/openrc:= sys-auth/polkit
 DESCRIPTION=System settings D-Bus service for OpenRC
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/openrc-settingsd.git
@@ -9,4 +10,4 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.30:2 dev-libs/libdaemon:0= sys-apps/dbus sys-apps/openrc:= sys-auth/polkit systemd? ( >=sys-apps/systemd-197 ) !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/openrc-settingsd/openrc-settingsd-1.0.1.tar.xz
-_md5_=8f219b0263baaaff7f94b879120a1205
+_md5_=ecbe949f584cc044741cfbdb3af1c181
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1 b/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1
index f53801c93237..13fc981b2126 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl sys-apps/file sys-apps/util-linux x11-libs/libXt x11-libs/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.12.0.tar.gz -> passwordsafe-1.12.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c09101519b71a5ba9e07edb07616470
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.13.0 b/metadata/md5-cache/app-admin/passwordsafe-1.13.0
index c141500073e7..0c34fa5c2b2d 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.13.0
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.13.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0= net-misc/curl sys-apps/file sys-apps/util-linux x11-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.13.0.tar.gz -> passwordsafe-1.13.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5af85f6d43c5a65057b29a27228ef6cb
diff --git a/metadata/md5-cache/app-admin/pwman3-0.10.0-r1 b/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
index 0ab77497e2fd..dccb271f6110 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
+++ b/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.10.0.tar.gz -> pwman3-0.10.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a8964b3c747bbb4c8b8da81debdda5dc
diff --git a/metadata/md5-cache/app-admin/pwman3-0.11.1 b/metadata/md5-cache/app-admin/pwman3-0.11.1
index 4d1344ec22a4..c413883b1c5e 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.11.1
+++ b/metadata/md5-cache/app-admin/pwman3-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.11.1.tar.gz -> pwman3-0.11.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a8964b3c747bbb4c8b8da81debdda5dc
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index f11048554535..0d728353776d 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/engrampa-1.24.0-r1 b/metadata/md5-cache/app-arch/engrampa-1.24.0-r1
index 1db32180b614..af0a885b5d42 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.24.0-r1
+++ b/metadata/md5-cache/app-arch/engrampa-1.24.0-r1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) virtual/libintl !!app-arch/mate-file-archiver
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/engrampa-1.24.0.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f80f3115fe2f2f56eeba0b351bf7202
diff --git a/metadata/md5-cache/app-arch/engrampa-1.24.1 b/metadata/md5-cache/app-arch/engrampa-1.24.1
index dad068bee4de..3b54da61ecb0 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.24.1
+++ b/metadata/md5-cache/app-arch/engrampa-1.24.1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) virtual/libintl !!app-arch/mate-file-archiver
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/engrampa-1.24.1.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=633f602d1779b6b0bea9a120e9377327
diff --git a/metadata/md5-cache/app-arch/lrzip-0.641 b/metadata/md5-cache/app-arch/lrzip-0.641
index fcef0ac35bd5..109079a9daa9 100644
--- a/metadata/md5-cache/app-arch/lrzip-0.641
+++ b/metadata/md5-cache/app-arch/lrzip-0.641
@@ -5,10 +5,10 @@ DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
 EAPI=7
 HOMEPAGE=https://github.com/ckolivas/lrzip
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/lzo app-arch/lz4 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/ckolivas/lrzip/archive/v0.641.tar.gz -> lrzip-0.641.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=938a97109fb1ade1c1e21c1c9c445263
+_md5_=07c1531628e058b65aad8cc6e4df5204
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.3 b/metadata/md5-cache/app-arch/makeself-2.4.3
index 65b281faaa61..3989b442d06b 100644
--- a/metadata/md5-cache/app-arch/makeself-2.4.3
+++ b/metadata/md5-cache/app-arch/makeself-2.4.3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.3.tar.gz -> makeself-2.4.3.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=0555fe97272f07ab15ed98ccb6a501cb
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index c76e7f413b25..77056180fb37 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/duply-2.3.1 b/metadata/md5-cache/app-backup/duply-2.3.1
index 0ba0805d20b9..3d2e4805edce 100644
--- a/metadata/md5-cache/app-backup/duply-2.3.1
+++ b/metadata/md5-cache/app-backup/duply-2.3.1
@@ -3,9 +3,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A shell frontend for duplicity
 EAPI=7
 HOMEPAGE=https://duply.net
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=https://jztkft.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_2.3.1.tgz
-_md5_=8202593ddd63e5dfa2ad79299735ac3c
+_md5_=7fc04a8554c81f61bfdcbf3dd2296d89
diff --git a/metadata/md5-cache/app-backup/rear-2.6 b/metadata/md5-cache/app-backup/rear-2.6
index e3dae5948dfd..5a6599de3f97 100644
--- a/metadata/md5-cache/app-backup/rear-2.6
+++ b/metadata/md5-cache/app-backup/rear-2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-cdr/cdrtools app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/rear/rear/archive/2.6.tar.gz -> rear-2.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=0617ff109ed59fbf44492ef4a2337b13
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 1d39d564bfc5..11ee1f495fdf 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.06 b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.06
index f7b715afff3e..2d9921f5e649 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.06
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.06
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
 SLOT=0
 SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.12.06.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2baf4be5f6f9f27d6843b100c4f03a16
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 634c2b4ba9b5..31a569325134 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-sh-2.8.8-r1 b/metadata/md5-cache/app-crypt/acme-sh-2.8.8-r1
index c994ba1f3ec7..f8d5d3a185fd 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-2.8.8-r1
+++ b/metadata/md5-cache/app-crypt/acme-sh-2.8.8-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:0 net-misc/curl net-misc/socat
 SLOT=0
 SRC_URI=https://github.com/acmesh-official/acme.sh/archive/2.8.8.tar.gz -> acme.sh-2.8.8.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=21f0793beb84d422b981d7e31225d55d
diff --git a/metadata/md5-cache/app-crypt/acme-sh-9999 b/metadata/md5-cache/app-crypt/acme-sh-9999
index 587e306f4f56..b5c9a3ae6f23 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-9999
+++ b/metadata/md5-cache/app-crypt/acme-sh-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/openssl:0 net-misc/curl net-misc/socat
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=ee004e0718575e50827ee7f7b7bec29d
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.38.1 b/metadata/md5-cache/app-crypt/seahorse-3.38.1
index d9e13ec4e4c2..4084dc4bee3d 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.38.1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.38.1
@@ -5,10 +5,10 @@ DESCRIPTION=Manage your passwords and encryption keys
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
 IUSE=ldap zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.58:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 gui-libs/libhandy:1= >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.38/seahorse-3.38.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0334da7335895b9d5f1ff2cae6dbe5c
+_md5_=03dd7ab6736dedb6da5109003497e77c
diff --git a/metadata/md5-cache/app-crypt/seahorse-40.0-r1 b/metadata/md5-cache/app-crypt/seahorse-40.0-r1
new file mode 100644
index 000000000000..b547998a955d
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/seahorse-40.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.58:2 >=app-crypt/gcr-3.38:= >=app-crypt/gpgme-1.14.0 >=x11-libs/gtk+-3.24.0:3 >=app-crypt/gnupg-2.2 >=gui-libs/libhandy-1.1:1= >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-libs/libxml2:2 app-crypt/gcr[vala] app-crypt/libsecret[vala] gui-libs/libhandy:1[vala] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage your passwords and encryption keys
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
+IUSE=ldap zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.58:2 >=app-crypt/gcr-3.38:= >=app-crypt/gpgme-1.14.0 >=x11-libs/gtk+-3.24.0:3 >=app-crypt/gnupg-2.2 >=gui-libs/libhandy-1.1:1= >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+SLOT=0
+SRC_URI=mirror://gnome/sources/seahorse/40/seahorse-40.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4a72b9632c4adfca6b5275d9189e7844
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 3aa9a3a63a88..0294058652da 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.4 b/metadata/md5-cache/app-doc/gnucash-docs-4.4
index f17354d12bb8..fa8a25abdfae 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-4.4
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.4
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 FDL-1.1
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.4.tar.gz -> gnucash-docs-4.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e74eae164bf6539f22ae5c05c0126622
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 6a8c3252c731..43abf13dc0b6 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/gnome-latex-3.38.0 b/metadata/md5-cache/app-editors/gnome-latex-3.38.0
index 3360b2031480..2a3e5ed62299 100644
--- a/metadata/md5-cache/app-editors/gnome-latex-3.38.0
+++ b/metadata/md5-cache/app-editors/gnome-latex-3.38.0
@@ -5,10 +5,10 @@ DESCRIPTION=Integrated LaTeX environment for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/GNOME-LaTeX
 IUSE=+introspection +latexmk rubber
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-text/gspell-1.8:0= >=dev-libs/glib-2.56:2 >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0:4 >=gui-libs/amtk-5.2:5 >=gui-libs/tepl-5.0:5 x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) gnome-base/dconf virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-latex/3.38/gnome-latex-3.38.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fe0e62be663a2248ecbc397d433fea8
+_md5_=448b1aebfc62a6f51ae1c39d46959a79
diff --git a/metadata/md5-cache/app-editors/neovim-0.4.4-r100 b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
index 785f8a80bdf8..1a2413b6f0a1 100644
--- a/metadata/md5-cache/app-editors/neovim-0.4.4-r100
+++ b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.4.4.tar.gz -> neovim-0.4.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=664dd33cc93500cd78fdb3785f864d2c
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index a0aeb17b9618..5aab748026a9 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lpeg[lua_targets_lua5-2(-)] dev-lua/mpack[lua_targets_lua5-2(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) dev-libs/libutf8proc:= dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= net-libs/libnsl tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f19d2c16f4020f9868305609469c250f
diff --git a/metadata/md5-cache/app-editors/retext-7.1.0 b/metadata/md5-cache/app-editors/retext-7.1.0
index a1c357a403b8..ed3211415513 100644
--- a/metadata/md5-cache/app-editors/retext-7.1.0
+++ b/metadata/md5-cache/app-editors/retext-7.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.1.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0824207b064200567f14d24308008bf9
diff --git a/metadata/md5-cache/app-editors/retext-7.2.1 b/metadata/md5-cache/app-editors/retext-7.2.1
index 8b46627c2687..9b98a614fa66 100644
--- a/metadata/md5-cache/app-editors/retext-7.2.1
+++ b/metadata/md5-cache/app-editors/retext-7.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.2.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15883466f143b8f61feb4993a825dc2a
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index 69ab2481579a..337fa349b15d 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15883466f143b8f61feb4993a825dc2a
diff --git a/metadata/md5-cache/app-editors/vis-0.7 b/metadata/md5-cache/app-editors/vis-0.7
index 86b2a962391e..7fd65d29d742 100644
--- a/metadata/md5-cache/app-editors/vis-0.7
+++ b/metadata/md5-cache/app-editors/vis-0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martanne/vis/releases/download/v0.7/vis-0.7.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.5/vis-test-0.5.tar.gz )
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6ee89dcf77db426c2180ac2fbe41a4a4
diff --git a/metadata/md5-cache/app-editors/vis-9999 b/metadata/md5-cache/app-editors/vis-9999
index b10c5c55ab80..7708cf0930d3 100644
--- a/metadata/md5-cache/app-editors/vis-9999
+++ b/metadata/md5-cache/app-editors/vis-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_t
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ffd5bf87d8774c9306883bce09661f68
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 61fcd706a993..ff7a30181c12 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.1 b/metadata/md5-cache/app-emulation/docker-compose-1.29.1
new file mode 100644
index 000000000000..342314457cc0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.1
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] >=dev-python/cached-property-1.2.0[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(-)] >=dev-python/distro-1.5.0[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(-)] >=dev-python/docker-py-5[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(-)] >=dev-python/dockerpty-0.4.1[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(-)] >=dev-python/docopt-0.6.1[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(-)] >=dev-python/python-dotenv-0.13.0[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(-)] >=dev-python/jsonschema-2.5.1[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(-)] dev-python/paramiko[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(-)] >=dev-python/PySocks-1.6.0[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(-)] >=dev-python/pyyaml-3.10[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(-)] >=dev-python/requests-2.20.0[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(-)] >=dev-python/six-1.3.0[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(-)] >=dev-python/texttable-0.9.0[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(-)] >=dev-python/websocket-client-0.32.0[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(-)] test? ( >=dev-python/pytest-5[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(-)] >=dev-python/ddt-1.2.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(-)] )
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=7
+HOMEPAGE=https://github.com/docker/compose
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[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(-)] >=dev-python/cached-property-1.2.0[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(-)] >=dev-python/distro-1.5.0[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(-)] >=dev-python/docker-py-5[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(-)] >=dev-python/dockerpty-0.4.1[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(-)] >=dev-python/docopt-0.6.1[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(-)] >=dev-python/python-dotenv-0.13.0[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(-)] >=dev-python/jsonschema-2.5.1[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(-)] dev-python/paramiko[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(-)] >=dev-python/PySocks-1.6.0[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(-)] >=dev-python/pyyaml-3.10[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(-)] >=dev-python/requests-2.20.0[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(-)] >=dev-python/six-1.3.0[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(-)] >=dev-python/texttable-0.9.0[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(-)] >=dev-python/websocket-client-0.32.0[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(-)] >=dev-python/setuptools-42.0.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/docker/compose/archive/1.29.1.tar.gz -> docker-compose-1.29.1.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5a52ffcbdc0a6301c5fe7b55d88acf17
diff --git a/metadata/md5-cache/app-emulation/img-0.5.11 b/metadata/md5-cache/app-emulation/img-0.5.11
new file mode 100644
index 000000000000..0f46e71f5d04
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/img-0.5.11
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
+EAPI=7
+HOMEPAGE=https://github.com/genuinetools/img
+IUSE=seccomp
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=seccomp? ( sys-libs/libseccomp ) app-emulation/runc
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/genuinetools/img/archive/v0.5.11.tar.gz -> img-0.5.11.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!akihiro!suda/containerd-fuse-overlayfs/@v/v0.0.0-20200220082720-bb896865146c.mod -> github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv0.0.0-20200220082720-bb896865146c.mod mirror://goproxy//github.com/!akihiro!suda/containerd-fuse-overlayfs/@v/v1.0.0.zip -> github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!akihiro!suda/containerd-fuse-overlayfs/@v/v1.0.0.mod -> github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.mod -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/apache/thrift/@v/v0.0.0-20161221203622-b2a4d4ae21c7.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.0.0-20161221203622-b2a4d4ae21c7.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20160425231609-f8ad88b59a58.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20160425231609-f8ad88b59a58.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200217135630-d732e370d46d.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200217135630-d732e370d46d.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200217135630-d732e370d46d.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200217135630-d732e370d46d.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191219165238-8375c3424e4d.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191219165238-8375c3424e4d.zip mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191219165238-8375c3424e4d.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191219165238-8375c3424e4d.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20200227195959-4d242818bf55.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20200227195959-4d242818bf55.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20200227195959-4d242818bf55.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20200227195959-4d242818bf55.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20180921161001-7f53d412b9eb.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20180921161001-7f53d412b9eb.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20181001140422-bd77b46c8352.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20181001140422-bd77b46c8352.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20191213151349-ff969a566b00.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20191213151349-ff969a566b00.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20191213151349-ff969a566b00.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20191213151349-ff969a566b00.mod mirror://goproxy//github.com/containerd/go-cni/@v/v0.0.0-20200107172653-c154a49e2c75.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv0.0.0-20200107172653-c154a49e2c75.zip mirror://goproxy//github.com/containerd/go-cni/@v/v0.0.0-20200107172653-c154a49e2c75.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv0.0.0-20200107172653-c154a49e2c75.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.zip mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.zip mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20200121165050-0be804eadb15.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20200121165050-0be804eadb15.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20200121165050-0be804eadb15.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20200121165050-0be804eadb15.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20200205145503-b45ef1f1f737.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20200205145503-b45ef1f1f737.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20200205145503-b45ef1f1f737.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20200205145503-b45ef1f1f737.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/coreos/clair/@v/v0.0.0-20180919182544-44ae4bc9590a.mod -> github.com%2Fcoreos%2Fclair%2F@v%2Fv0.0.0-20180919182544-44ae4bc9590a.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20180920165730-54c19e67f69c.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20180920165730-54c19e67f69c.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200227165822-2298e6a3fe24.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200227165822-2298e6a3fe24.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200227165822-2298e6a3fe24.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200227165822-2298e6a3fe24.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20180920194744-16128bbac47f.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20180920194744-16128bbac47f.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20200223014041-6b972e50feee.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20200223014041-6b972e50feee.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200227233006-38f52c9fec82.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200227233006-38f52c9fec82.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200227233006-38f52c9fec82.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200227233006-38f52c9fec82.mod mirror://goproxy//github.com/docker/docker-ce/@v/v0.0.0-20180924210327-f53bd8bb8e43.zip -> github.com%2Fdocker%2Fdocker-ce%2F@v%2Fv0.0.0-20180924210327-f53bd8bb8e43.zip mirror://goproxy//github.com/docker/docker-ce/@v/v0.0.0-20180924210327-f53bd8bb8e43.mod -> github.com%2Fdocker%2Fdocker-ce%2F@v%2Fv0.0.0-20180924210327-f53bd8bb8e43.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.0.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.1.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.1.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.0.0-20180821093606-97c2040d34df.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.0.0-20180821093606-97c2040d34df.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.1.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libnetwork/@v/v0.8.0-dev.2.0.20200226230617-d8334ccdb9be.zip -> github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20200226230617-d8334ccdb9be.zip mirror://goproxy//github.com/docker/libnetwork/@v/v0.8.0-dev.2.0.20200226230617-d8334ccdb9be.mod -> github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20200226230617-d8334ccdb9be.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20160708172513-aabc10ec26b7.zip -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.zip mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20160708172513-aabc10ec26b7.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fernet/fernet-go/@v/v0.0.0-20180830025343-9eac43b88a5e.mod -> github.com%2Ffernet%2Ffernet-go%2F@v%2Fv0.0.0-20180830025343-9eac43b88a5e.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/genuinetools/pkg/@v/v0.0.0-20180910213200-1c141f661797.mod -> github.com%2Fgenuinetools%2Fpkg%2F@v%2Fv0.0.0-20180910213200-1c141f661797.mod mirror://goproxy//github.com/genuinetools/reg/@v/v0.16.0.zip -> github.com%2Fgenuinetools%2Freg%2F@v%2Fv0.16.0.zip mirror://goproxy//github.com/genuinetools/reg/@v/v0.16.0.mod -> github.com%2Fgenuinetools%2Freg%2F@v%2Fv0.16.0.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.0.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.0.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20150127133951-6f45313302b9.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20150127133951-6f45313302b9.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20150127133951-6f45313302b9.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20150127133951-6f45313302b9.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.mod -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-opentracing/@v/v0.0.0-20180507213350-8e809c8a8645.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-opentracing%2F@v%2Fv0.0.0-20180507213350-8e809c8a8645.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-opentracing/@v/v0.0.0-20180507213350-8e809c8a8645.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-opentracing%2F@v%2Fv0.0.0-20180507213350-8e809c8a8645.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/uuid/@v/v0.0.0-20160311170451-ebb0a03e909c.zip -> github.com%2Fhashicorp%2Fuuid%2F@v%2Fv0.0.0-20160311170451-ebb0a03e909c.zip mirror://goproxy//github.com/hashicorp/uuid/@v/v0.0.0-20160311170451-ebb0a03e909c.mod -> github.com%2Fhashicorp%2Fuuid%2F@v%2Fv0.0.0-20160311170451-ebb0a03e909c.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20191218070446-00ab2ac2db07.zip -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20191218070446-00ab2ac2db07.zip mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20191218070446-00ab2ac2db07.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20191218070446-00ab2ac2db07.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/buildkit/@v/v0.7.2.zip -> github.com%2Fmoby%2Fbuildkit%2F@v%2Fv0.7.2.zip mirror://goproxy//github.com/moby/buildkit/@v/v0.7.2.mod -> github.com%2Fmoby%2Fbuildkit%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/morikuni/aec/@v/v0.0.0-20170113033406-39771216ff4c.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.zip mirror://goproxy//github.com/morikuni/aec/@v/v0.0.0-20170113033406-39771216ff4c.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc6.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.0.20200102164712-2b52db75279c.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.0.20200102164712-2b52db75279c.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.0.20200221051241-688cf6d43cc4.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.0.20200221051241-688cf6d43cc4.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.0.20200221051241-688cf6d43cc4.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.0.20200221051241-688cf6d43cc4.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.2.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/opentracing-contrib/go-stdlib/@v/v0.0.0-20171029140428-b1a47cfbdd75.mod -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20171029140428-b1a47cfbdd75.mod mirror://goproxy//github.com/opentracing-contrib/go-stdlib/@v/v0.0.0-20180702182724-07a764486eb1.zip -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20180702182724-07a764486eb1.zip mirror://goproxy//github.com/opentracing-contrib/go-stdlib/@v/v0.0.0-20180702182724-07a764486eb1.mod -> github.com%2Fopentracing-contrib%2Fgo-stdlib%2F@v%2Fv0.0.0-20180702182724-07a764486eb1.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v0.0.0-20171003133519-1361b9cd60be.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv0.0.0-20171003133519-1361b9cd60be.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterhellberg/link/@v/v1.0.0.zip -> github.com%2Fpeterhellberg%2Flink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/peterhellberg/link/@v/v1.0.0.mod -> github.com%2Fpeterhellberg%2Flink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180924113449-f69c853d21c1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180924113449-f69c853d21c1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180924113449-f69c853d21c1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180924113449-f69c853d21c1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180920065004-418d78d0b9a7.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180920065004-418d78d0b9a7.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180920065004-418d78d0b9a7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180920065004-418d78d0b9a7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/serialx/hashring/@v/v0.0.0-20190422032157-8b2912629002.mod -> github.com%2Fserialx%2Fhashring%2F@v%2Fv0.0.0-20190422032157-8b2912629002.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.3.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tonistiigi/fsutil/@v/v0.0.0-20200326231323-c2c7d7b0e144.zip -> github.com%2Ftonistiigi%2Ffsutil%2F@v%2Fv0.0.0-20200326231323-c2c7d7b0e144.zip mirror://goproxy//github.com/tonistiigi/fsutil/@v/v0.0.0-20200326231323-c2c7d7b0e144.mod -> github.com%2Ftonistiigi%2Ffsutil%2F@v%2Fv0.0.0-20200326231323-c2c7d7b0e144.mod mirror://goproxy//github.com/tonistiigi/go-immutable-radix/@v/v0.0.0-20170803185627-826af9ccf0fe.zip -> github.com%2Ftonistiigi%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20170803185627-826af9ccf0fe.zip mirror://goproxy//github.com/tonistiigi/go-immutable-radix/@v/v0.0.0-20170803185627-826af9ccf0fe.mod -> github.com%2Ftonistiigi%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20170803185627-826af9ccf0fe.mod mirror://goproxy//github.com/tonistiigi/units/@v/v0.0.0-20180711220420-6950e57a87ea.zip -> github.com%2Ftonistiigi%2Funits%2F@v%2Fv0.0.0-20180711220420-6950e57a87ea.zip mirror://goproxy//github.com/tonistiigi/units/@v/v0.0.0-20180711220420-6950e57a87ea.mod -> github.com%2Ftonistiigi%2Funits%2F@v%2Fv0.0.0-20180711220420-6950e57a87ea.mod mirror://goproxy//github.com/tonistiigi/vt100/@v/v0.0.0-20190402012908-ad4c4a574305.zip -> github.com%2Ftonistiigi%2Fvt100%2F@v%2Fv0.0.0-20190402012908-ad4c4a574305.zip mirror://goproxy//github.com/tonistiigi/vt100/@v/v0.0.0-20190402012908-ad4c4a574305.mod -> github.com%2Ftonistiigi%2Fvt100%2F@v%2Fv0.0.0-20190402012908-ad4c4a574305.mod mirror://goproxy//github.com/uber/jaeger-client-go/@v/v0.0.0-20180103221425-e02c85f9069e.mod -> github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv0.0.0-20180103221425-e02c85f9069e.mod mirror://goproxy//github.com/uber/jaeger-lib/@v/v1.2.1.mod -> github.com%2Fuber%2Fjaeger-lib%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.zip mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180910181607-0e37d006457b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180910181607-0e37d006457b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200128174031-69ecbb4d6d5d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180925072008-f04abc6bdfa7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180925072008-f04abc6bdfa7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180925072008-f04abc6bdfa7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180925072008-f04abc6bdfa7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180925112736-b09afc3d579e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180925112736-b09afc3d579e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180924164928-221a8d4f7494.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180924164928-221a8d4f7494.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180924164928-221a8d4f7494.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180924164928-221a8d4f7494.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200227132054-3f1135a288c9.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200227132054-3f1135a288c9.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200227132054-3f1135a288c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200227132054-3f1135a288c9.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.15.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.15.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.15.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.15.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gotest.tools/@v/v2.1.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=99390bdd7d0c1cfd7fd9beeb307fe2f6
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.6 b/metadata/md5-cache/app-emulation/lxc-4.0.6
index 68182aaa72f5..510dc240f809 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.6
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap sys-libs/libseccomp virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.6.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.6.tar.gz.asc )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	pam	b097695df28f3974e3af860d6704d4f2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pam	b097695df28f3974e3af860d6704d4f2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da220759558333084bdfe5142f4edf58
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.4-r7 b/metadata/md5-cache/app-emulation/lxd-4.0.4-r7
index b9da40268aa3..e583d370efdd 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.4-r7
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.4-r7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:0= sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.4.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.4.tar.gz.asc )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=5acc761a5805490fa5b1259c98469d1a
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.5 b/metadata/md5-cache/app-emulation/lxd-4.0.5
index 88e4543a8674..f6980f1b8292 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.5
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.5
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.5.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.5.tar.gz.asc )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=caf4ec395e472a9e8b715eef34ea29eb
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index e4677a33a06c..746ff42e14e2 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/kinput2-3.1-r2 b/metadata/md5-cache/app-i18n/kinput2-3.1-r2
index 134b6ee98e0f..ccc85368f156 100644
--- a/metadata/md5-cache/app-i18n/kinput2-3.1-r2
+++ b/metadata/md5-cache/app-i18n/kinput2-3.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt !freewnn? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) x11-misc/gccmakedep x11-misc/imake
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt !freewnn? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn ) x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=A Japanese input server which supports the XIM protocol
 EAPI=6
 HOMEPAGE=http://www.nec.co.jp/canna
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57058f99f61d55f223e269591d7eec29
+_md5_=c7b678b96e0525fa74fa111830302ac5
diff --git a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11 b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11
index b430d574aebe..d85d97d6862a 100644
--- a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11
+++ b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/gawk
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.11.tar.gz -> translate-shell-0.9.6.11.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=27dc73f1cb0d95c988515aeee026b41c
diff --git a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12 b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12
index 5cfe297284bf..dabeb97e01df 100644
--- a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12
+++ b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/gawk
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.12.tar.gz -> translate-shell-0.9.6.12.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=27dc73f1cb0d95c988515aeee026b41c
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index f529661c2c9b..3b9a48e57bb6 100644
Binary files a/metadata/md5-cache/app-laptop/Manifest.gz and b/metadata/md5-cache/app-laptop/Manifest.gz differ
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
index f6c6f9f8c43f..f841e5267eff 100644
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/ethtool sys-apps/iproute2 sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.74/laptop-mode-tools_1.74.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=998cb8745c3c64d862fb34cef69f38ed
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index b707293750f8..5c08d39a66b0 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/anki-2.1.15 b/metadata/md5-cache/app-misc/anki-2.1.15
index cf5769a432c3..81a87c800c08 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.15
+++ b/metadata/md5-cache/app-misc/anki-2.1.15
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/archive/anki-2.1.15-source.tgz -> anki-2.1.15.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a2e52c8c84354b2ca6fd4f53680ef98
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-2.0.2 b/metadata/md5-cache/app-misc/graphlcd-base-2.0.2
index e312dede959c..59c4f34643a5 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-2.0.2
+++ b/metadata/md5-cache/app-misc/graphlcd-base-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2=
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/graphlcd-base.git/snapshot/graphlcd-base-2.0.2.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=5d334f691156953722d88acca5004128
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
index 06035ee74345..f0a9954dee75 100644
--- a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/gccmakedep x11-misc/imake
+BDEPEND=app-text/rman x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=359801083db587c29a1da6d05a4ba2fc
+_md5_=a56bf6a836285280bc878df8d2517ef3
diff --git a/metadata/md5-cache/app-misc/recoll-1.25.19 b/metadata/md5-cache/app-misc/recoll-1.25.19
index 3df299e66406..e89afe190c95 100644
--- a/metadata/md5-cache/app-misc/recoll-1.25.19
+++ b/metadata/md5-cache/app-misc/recoll-1.25.19
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.25.19.tar.gz
-_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4113876cf0d8da3b96fc0106c5eb1b0b
diff --git a/metadata/md5-cache/app-misc/recoll-1.27.12 b/metadata/md5-cache/app-misc/recoll-1.27.12
index 28a22365619a..53e8d65e42ee 100644
--- a/metadata/md5-cache/app-misc/recoll-1.27.12
+++ b/metadata/md5-cache/app-misc/recoll-1.27.12
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.27.12.tar.gz
-_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a5f9f0a7e7c073e5d66bdcab8b3b389b
diff --git a/metadata/md5-cache/app-misc/recoll-1.28.5 b/metadata/md5-cache/app-misc/recoll-1.28.5
index 9930c00ddeda..88c178b22462 100644
--- a/metadata/md5-cache/app-misc/recoll-1.28.5
+++ b/metadata/md5-cache/app-misc/recoll-1.28.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.28.5.tar.gz
-_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=69ccfe6c27801ba67b237e200b3415a1
diff --git a/metadata/md5-cache/app-misc/recoll-1.29.2 b/metadata/md5-cache/app-misc/recoll-1.29.2
index 41c6c824ddab..305f63f2b97a 100644
--- a/metadata/md5-cache/app-misc/recoll-1.29.2
+++ b/metadata/md5-cache/app-misc/recoll-1.29.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.29.2.tar.gz
-_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=69ccfe6c27801ba67b237e200b3415a1
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.1-r1 b/metadata/md5-cache/app-misc/solaar-1.0.1-r1
deleted file mode 100644
index 42298b7d7385..000000000000
--- a/metadata/md5-cache/app-misc/solaar-1.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A Linux device manager for Logitech's Unifying Receiver peripherals
-EAPI=7
-HOMEPAGE=https://pwr-solaar.github.io/Solaar/
-IUSE=doc kernel_linux python_targets_python3_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyudev-0.13[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.1.tar.gz -> solaar-1.0.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4bce915cc3ca6c25af5afbc5645a89c
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.2 b/metadata/md5-cache/app-misc/solaar-1.0.2
deleted file mode 100644
index 9960c28af699..000000000000
--- a/metadata/md5-cache/app-misc/solaar-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig 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(-)]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Linux Device Manager for Logitech Unifying Receivers and Paired Devices
-EAPI=7
-HOMEPAGE=https://pwr-solaar.github.io/Solaar/
-IUSE=doc appindicator libnotify kernel_linux python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyudev-0.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] appindicator? ( dev-libs/libappindicator:3 ) libnotify? ( x11-libs/libnotify ) 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.2.tar.gz -> solaar-1.0.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=888c1ef63f94a56fefe1fec5931b5bdb
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.3_rc1 b/metadata/md5-cache/app-misc/solaar-1.0.3_rc1
deleted file mode 100644
index 9e3beb7c13b9..000000000000
--- a/metadata/md5-cache/app-misc/solaar-1.0.3_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig 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(-)]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Linux Device Manager for Logitech Unifying Receivers and Paired Devices
-EAPI=7
-HOMEPAGE=https://pwr-solaar.github.io/Solaar/
-IUSE=doc appindicator libnotify kernel_linux python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyudev-0.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] appindicator? ( dev-libs/libappindicator:3 ) libnotify? ( x11-libs/libnotify ) 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.3rc1.tar.gz -> solaar-1.0.3rc1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b79f1d161ac63c39f2939910aa6c70f
diff --git a/metadata/md5-cache/app-misc/tracker-3.1.1 b/metadata/md5-cache/app-misc/tracker-3.1.1
index 80b3c0f97ee1..0d6269c55879 100644
--- a/metadata/md5-cache/app-misc/tracker-3.1.1
+++ b/metadata/md5-cache/app-misc/tracker-3.1.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=miners? ( >=app-misc/tracker-miners-3.1 )
 RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0 stemmer? ( dev-libs/snowball-stemmer )
+RESTRICT=!test? ( test )
 SLOT=3/0
 SRC_URI=mirror://gnome/sources/tracker/3.1/tracker-3.1.1.tar.xz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8dc656b35818b44489f0f7cd60625a04
+_md5_=b63b601449bee5042236f533166467cd
diff --git a/metadata/md5-cache/app-misc/tracker-miners-3.1.1 b/metadata/md5-cache/app-misc/tracker-miners-3.1.1
index 640d2339c416..542c1b92fdaa 100644
--- a/metadata/md5-cache/app-misc/tracker-miners-3.1.1
+++ b/metadata/md5-cache/app-misc/tracker-miners-3.1.1
@@ -1,16 +1,16 @@
 BDEPEND=app-text/asciidoc dev-libs/libxslt dev-util/glib-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) || ( ( dev-lang/python:3.9 dev-python/tappy[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/tappy[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/tappy[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.62:2 >=app-misc/tracker-3.0:0= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.62:2 >=app-misc/tracker-3.0:3= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.62:2 >=app-misc/tracker-3.0:0= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
+RDEPEND=>=dev-libs/glib-2.62:2 >=app-misc/tracker-3.0:3= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
 REQUIRED_USE=cue? ( gstreamer )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/tracker-miners/3.1/tracker-miners-3.1.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=893284de1302ce5e1cc61dfaceba29cb
+_md5_=70a69b3efe16721c28c9c68d9cf0940a
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
index dd61e32550da..197266c48741 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	font	0667878c2b594871023dd1833d05996f	optfeature	a3678a005063e7c50aed4e37d04197ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	font	0667878c2b594871023dd1833d05996f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c60592840d8f05b147bd8225c421ff4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e4ca112bca54..7249ed0bb292 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/impressive-0.13.0_beta2 b/metadata/md5-cache/app-office/impressive-0.13.0_beta2
index 7d7e6266852c..b52ef74338b3 100644
--- a/metadata/md5-cache/app-office/impressive-0.13.0_beta2
+++ b/metadata/md5-cache/app-office/impressive-0.13.0_beta2
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/impressive/Impressive/0.13.0-beta2/Impressive-0.13.0-beta2.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=df356fa031301da735dc9fd6ce49302e
diff --git a/metadata/md5-cache/app-office/kmymoney-5.1.1 b/metadata/md5-cache/app-office/kmymoney-5.1.1
index 461b0ed0ad3e..0e12d00f440d 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.1.1
+++ b/metadata/md5-cache/app-office/kmymoney-5.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-db/s
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.1.1/src/kmymoney-5.1.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=119865fe7d14a780d4ed0eb8e1fdba13
diff --git a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1 b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
index 8b3cd45b5cb0..b7ad79ff2794 100644
--- a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
+++ b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu imlib? ( media-libs/imlib2[X] ) !imlib? ( gif? ( media-libs/giflib:= ) png? ( >=media-libs/libpng-1.4:0= ) ) truetype? ( x11-libs/libXft media-libs/fontconfig ) emacs? ( >=app-editors/emacs-23.1:* ) m17n-lib? ( dev-libs/m17n-lib fontconfig? ( media-libs/fontconfig ) ) mng? ( media-libs/libmng ) sys-devel/autoconf x11-base/xorg-proto x11-libs/libxkbfile app-text/rman x11-misc/imake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu imlib? ( media-libs/imlib2[X] ) !imlib? ( gif? ( media-libs/giflib:= ) png? ( >=media-libs/libpng-1.4:0= ) ) truetype? ( x11-libs/libXft media-libs/fontconfig ) emacs? ( >=app-editors/emacs-23.1:* ) m17n-lib? ( dev-libs/m17n-lib fontconfig? ( media-libs/fontconfig ) ) mng? ( media-libs/libmng ) sys-devel/autoconf x11-base/xorg-proto x11-libs/libxkbfile app-text/rman >=x11-misc/imake-1.0.8-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An X11 based presentation tool
 EAPI=5
 HOMEPAGE=http://member.wide.ad.jp/wg/mgp/
@@ -11,4 +11,4 @@ REQUIRED_USE=imlib? ( !gif !png )
 SLOT=0
 SRC_URI=ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/mgp-snap-20121015.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=813d41c60a085f55b818185fc51ba55c
+_md5_=b8bc2067c752df617c5356d58af3142b
diff --git a/metadata/md5-cache/app-office/moneyguru-3.0.1-r2 b/metadata/md5-cache/app-office/moneyguru-3.0.1-r2
deleted file mode 100644
index c02aab88e3f8..000000000000
--- a/metadata/md5-cache/app-office/moneyguru-3.0.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),gui,widgets,printsupport] ) dev-qt/qttranslations test? ( python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] ) dev-util/cunit )
-DESCRIPTION=Future-aware personal finances management
-EAPI=7
-HOMEPAGE=https://hardcoded.net/moneyguru
-IUSE=test +python_single_target_python3_7
-KEYWORDS=amd64
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),gui,widgets,printsupport] ) dev-qt/qttranslations
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.hardcoded.net/moneyguru-3.0.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bc415cd49178e7c07cb7da6e8d9c8887
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index caea4cdb7ce3..b371295c7a72 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/fzy-1.0-r1 b/metadata/md5-cache/app-shells/fzy-1.0-r1
index e2fb99648306..a76a8dc275f5 100644
--- a/metadata/md5-cache/app-shells/fzy-1.0-r1
+++ b/metadata/md5-cache/app-shells/fzy-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=08990bab88e65de187b15c9b4972ab7e
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index a5927e00f53e..dab3983e5bb5 100644
--- a/metadata/md5-cache/app-shells/fzy-9999
+++ b/metadata/md5-cache/app-shells/fzy-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2421989c22825cae87a5dfd62ed8879a
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 3a90b82ff9d2..40c29161a03f 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.2-r1 b/metadata/md5-cache/app-text/asciidoc-9.0.2-r1
index bfd8305bcfaf..1ac0bbe77192 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.2-r1
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_7 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.0.2/asciidoc-9.0.2.tar.gz -> asciidoc-9.0.2.new.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d93c1bb85a536c7a0d65238451bed67c
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.4-r1 b/metadata/md5-cache/app-text/asciidoc-9.0.4-r1
index f96b88b743ce..51838c6cc56b 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.4-r1
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_7 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.0.4/asciidoc-9.0.4.tar.gz -> asciidoc-9.0.4.new.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0700d9c05428c2840a7305c5e5a2a515
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.5-r1 b/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
index 5409c5485c63..46fedfdefbe0 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_7 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.0.5/asciidoc-9.0.5.tar.gz -> asciidoc-9.0.5.new.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=78a66868b4195bf2743fd6647b9fe5ca
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27-r2 b/metadata/md5-cache/app-text/djvu-3.5.27-r2
index 6bf6e8155bb1..422aca1ac6ce 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.27-r2
+++ b/metadata/md5-cache/app-text/djvu-3.5.27-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=https://ajakk.github.io/djvu-3.5.27-a00b7618c22fb35b030582147a4479c4cf41c349.zip -> djvu-3.5.27.zip
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f35b01e31f4ae456366c89e1cc226ddc
diff --git a/metadata/md5-cache/app-text/djvu-3.5.28 b/metadata/md5-cache/app-text/djvu-3.5.28
index 17b890c4d924..41150014091d 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.28
+++ b/metadata/md5-cache/app-text/djvu-3.5.28
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/djvu/djvulibre-3.5.28.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaaa23b7c6c13d8c04b12f10fcd1754c
diff --git a/metadata/md5-cache/app-text/iso-codes-4.6.0 b/metadata/md5-cache/app-text/iso-codes-4.6.0
index 1ba2254b7c3f..3c4056bb9cc4 100644
--- a/metadata/md5-cache/app-text/iso-codes-4.6.0
+++ b/metadata/md5-cache/app-text/iso-codes-4.6.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=prepare setup
 DESCRIPTION=ISO language, territory, currency, script codes and their translations
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/iso-codes-4.6.0/iso-codes-iso-codes-4.6.0.tar.gz -> iso-codes-4.6.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=67cf6b8ef1f92ced91ecec5c3a4f3c82
+_md5_=75c5c49c030f41d8c8f72a3ef691722f
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.2 b/metadata/md5-cache/app-text/libgxps-0.3.2
index 4653d87a391a..cb6a37a11d28 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.2
+++ b/metadata/md5-cache/app-text/libgxps-0.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for handling and rendering XPS documents
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgxps
 IUSE=gtk-doc +introspection jpeg lcms tiff
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff:0[zlib] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.2.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57592102074e379b6b0a590c34b277f6
+_md5_=b27dfcf54dcb8b8a3b2c361129f19762
diff --git a/metadata/md5-cache/app-text/multitail-6.4.2 b/metadata/md5-cache/app-text/multitail-6.4.2
index 356aa0b5339c..24f136cf962c 100644
--- a/metadata/md5-cache/app-text/multitail-6.4.2
+++ b/metadata/md5-cache/app-text/multitail-6.4.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/ncurses:0=[unicode?]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=741ff8213cd641af839c7920145fc5f9
diff --git a/metadata/md5-cache/app-text/mupdf-1.18.0-r3 b/metadata/md5-cache/app-text/mupdf-1.18.0-r4
similarity index 71%
rename from metadata/md5-cache/app-text/mupdf-1.18.0-r3
rename to metadata/md5-cache/app-text/mupdf-1.18.0-r4
index 53d5814c10ca..052e2d9c95b5 100644
--- a/metadata/md5-cache/app-text/mupdf-1.18.0-r3
+++ b/metadata/md5-cache/app-text/mupdf-1.18.0-r4
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( libressl? ( >=dev-libs/libressl-3.1.4:0= ) !libressl? ( >=dev-libs/openssl-1.1:0= ) ) X? ( x11-libs/libX11 x11-libs/libXext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
 EAPI=7
 HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
-IUSE=+javascript libressl opengl ssl X
+IUSE=+javascript opengl ssl X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86
 LICENSE=AGPL-3
-RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( libressl? ( >=dev-libs/libressl-3.1.4:0= ) !libressl? ( >=dev-libs/openssl-1.1:0= ) ) X? ( x11-libs/libX11 x11-libs/libXext )
+RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.18.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33586d90395012434e178e60a6f8011d
+_md5_=12c39b30043342e725304899b7221746
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.6.2 b/metadata/md5-cache/app-text/pdfarranger-1.6.2
index ba0ef41f0902..e2425c099bff 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.6.2
+++ b/metadata/md5-cache/app-text/pdfarranger-1.6.2
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection,cairo] dev-python/pikepdf[python_targets_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.6.2.tar.gz -> pdfarranger-1.6.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed930a1f13d20051a64da2574afceadd
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.7.0 b/metadata/md5-cache/app-text/pdfarranger-1.7.0
index 72897395d0f7..3757a62084ba 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.7.0
+++ b/metadata/md5-cache/app-text/pdfarranger-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection,cairo] dev-python/pikepdf[python_targets_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.7.0.tar.gz -> pdfarranger-1.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8e459822356949c29de6e23d1097322
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.38.0 b/metadata/md5-cache/app-text/yelp-tools-3.38.0
index 22776f0d8b22..bda3c5eeec0f 100644
--- a/metadata/md5-cache/app-text/yelp-tools-3.38.0
+++ b/metadata/md5-cache/app-text/yelp-tools-3.38.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gno
 DESCRIPTION=Collection of tools for building and converting documentation
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ freedist ) GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/3.38/yelp-tools-3.38.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f10b494da11769be32c347e16fcc7111
+_md5_=31367b47b5e309de21fda4a8ee7af3ba
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 5c09b1bde0f5..77eee44f9d44 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r2 b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
index a0c0d66b3e16..25521a8d2ee3 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r2
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-editors/vim app-editors/gvim[netbeans] ) app-arch/vimball || (
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	estack	055c42df72f76a4f45ec92b35e83cd56	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	estack	055c42df72f76a4f45ec92b35e83cd56	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=5ca0e887c12059045347fa0a5711b357
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 33d1c93fbd1f..a32ac1e8ddfb 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.9-r4 b/metadata/md5-cache/dev-db/mariadb-10.5.9-r5
similarity index 98%
rename from metadata/md5-cache/dev-db/mariadb-10.5.9-r4
rename to metadata/md5-cache/dev-db/mariadb-10.5.9-r5
index dee96f133a57..7d6f98632bf2 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.9-r4
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.9-r5
@@ -12,6 +12,6 @@ RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 s
 REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.5/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.9/source/mariadb-10.5.9.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.9-patches-04.tar.xz
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.9/source/mariadb-10.5.9.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.9-patches-05.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b77d000140b3b350e6a17267fc069628
+_md5_=ce1f464995598965457d8aa6c0949a2f
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.1.1 b/metadata/md5-cache/dev-db/timescaledb-2.1.1
new file mode 100644
index 000000000000..528e24e7147e
--- /dev/null
+++ b/metadata/md5-cache/dev-db/timescaledb-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) dev-libs/openssl
+DESCRIPTION=Open-source time-series SQL database
+EAPI=7
+HOMEPAGE=https://www.timescale.com/
+IUSE=proprietary-extensions postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) dev-libs/openssl
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/timescale/timescaledb/archive/2.1.1.tar.gz -> timescaledb-2.1.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a521f488ac3d9696766ef1d3ea5f9f02
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index dd0066f47f87..65f03e9a3271 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r2 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r2
new file mode 100644
index 000000000000..c70aadad8362
--- /dev/null
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Apple eAWT and eIO APIs for Java on Mac OS X
+EAPI=7
+HOMEPAGE=http://developer.apple.com/samplecode/AppleJavaExtensions/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apple
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> apple-java-extensions-bin-1.5.zip
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=e0c458eae0377e11a916bce713ff9437
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1 b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
index 6e0f1ae0f968..6b676649a06f 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
+++ b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/asm:4 dev-java/commons-logging:0 >=dev-java/j
 SLOT=0
 SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> aspectj-1.7.3.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=413f95a9691d43ec03695e3f1a4aaf33
+_md5_=609796e2b885cb20553a5aa6b963d4db
diff --git a/metadata/md5-cache/dev-java/bcel-6.0_rc3 b/metadata/md5-cache/dev-java/bcel-6.0_rc3
deleted file mode 100644
index 348efd1056b0..000000000000
--- a/metadata/md5-cache/dev-java/bcel-6.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Byte Code Engineering Library: analyze, create, manipulate Java class files
-EAPI=5
-HOMEPAGE=http://commons.apache.org/bcel/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/apache/commons-bcel/archive/BCEL_6_0_RC3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4eeaca6e2f568b6b533ded89675737c4
diff --git a/metadata/md5-cache/dev-java/bcel-6.5.0 b/metadata/md5-cache/dev-java/bcel-6.5.0
index a040e71a56dc..7ee972e54115 100644
--- a/metadata/md5-cache/dev-java/bcel-6.5.0
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Commons Bytecode Engineering Library
 EAPI=7
 HOMEPAGE=https://commons.apache.org/proper/commons-bcel
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/bcel/source/bcel-6.5.0-src.tar.gz -> bcel-6.5.0-sources.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=4b72d5b535329a9f05c7386d83ea654d
+_md5_=1b41fb3dc0aebc4198e00ba8011f3914
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6 b/metadata/md5-cache/dev-java/jaxen-1.1.6
deleted file mode 100644
index e818a7fd493e..000000000000
--- a/metadata/md5-cache/dev-java/jaxen-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java XPath Engine
-EAPI=5
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=JDOM
-RDEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b510acf3b3cd34f078dd2e29a52e5f83
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6-r1 b/metadata/md5-cache/dev-java/jaxen-1.1.6-r1
deleted file mode 100644
index 5de8d34363b6..000000000000
--- a/metadata/md5-cache/dev-java/jaxen-1.1.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jdom:0 dev-java/dom4j:1 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java XPath Engine
-EAPI=6
-HOMEPAGE=https://github.com/codehaus
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=JDOM
-RDEPEND=dev-java/jdom:0 dev-java/dom4j:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8eeed3f2eedfe2cfd38ae4948eb96b3
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6-r2 b/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
new file mode 100644
index 000000000000..16e1407dbfb0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A Java XPath Engine
+EAPI=7
+HOMEPAGE=https://github.com/codehaus
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=JDOM
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=1.1
+SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=fc11e167faeab06d4e7fb4c23bf30f9a
diff --git a/metadata/md5-cache/dev-java/jaxen-1.2.0 b/metadata/md5-cache/dev-java/jaxen-1.2.0
new file mode 100644
index 000000000000..d7c20a834826
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxen-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/xerces-2.12.0:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:0 )
+DESCRIPTION=Jaxen is a universal XPath engine for Java.
+EAPI=7
+HOMEPAGE=http://www.cafeconleche.org/jaxen/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=1.2
+SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz -> jaxen-1.2.0.tar.gz
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=9fd718847b9042ed7943128e8fbe6ba0
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
similarity index 67%
rename from metadata/md5-cache/dev-java/wsdl4j-1.6.2
rename to metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
index 203e6c2c4484..580c1ba75ea5 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 ) app-arch/unzip >=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
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:0 ) app-arch/unzip >=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=Web Services Description Language for Java Toolkit (WSDL4J)
 EAPI=7
 HOMEPAGE=http://wsdl4j.sourceforge.net
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
 _eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=415efdcbcc494ca9447ceb62be3fcebe
+_md5_=9aa326432167919e4687c68b1949b92b
diff --git a/metadata/md5-cache/dev-java/xom-1.3.7 b/metadata/md5-cache/dev-java/xom-1.3.7
new file mode 100644
index 000000000000..276e52ff6ca9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xom-1.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 dev-java/junit:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:0 )
+DESCRIPTION=XML Object Model
+EAPI=7
+HOMEPAGE=https://xom.nu
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2
+RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.7/xom-1.3.7-src.tar.gz
+_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
+_md5_=6c2878c014c542ad0609fec8d95422d9
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3
index f36631d9a1ab..f383196b22bf 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r3
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=76f47e5a4f440de063c1e29cf8e77c60
+_md5_=82ac5b422dd52fc416cdc216b5f84840
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1 b/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
index 895bcdf53509..8c05d543e79a 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
-SRC_URI=https://github.com/luben/zstd-jni/archive/v1.4.9-1.tar.gz
+SRC_URI=https://github.com/luben/zstd-jni/archive/v1.4.9-1.tar.gz -> zstd-jni-1.4.9.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=082776de3915030a44883df594a8f824
+_md5_=e3ad284b45fdb8404bbbc95b8181b263
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 349246d37804..f6833533aec8 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.9 b/metadata/md5-cache/dev-lang/mujs-1.0.9
deleted file mode 100644
index 36c55730eccf..000000000000
--- a/metadata/md5-cache/dev-lang/mujs-1.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable JavaScript interpreter in C
-EAPI=7
-HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=ISC
-RDEPEND=sys-libs/readline:0=
-SLOT=0/1.0.9
-SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.9.tar.gz -> mujs-1.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b09355eb71b70a2b3209e55a67654f34
diff --git a/metadata/md5-cache/dev-lang/mujs-1.1.1 b/metadata/md5-cache/dev-lang/mujs-1.1.1
index f7c62028cd3b..7c302cddc3c3 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.1.1
+++ b/metadata/md5-cache/dev-lang/mujs-1.1.1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/readline:0=
 SLOT=0/1.1.1
 SRC_URI=https://mujs.com/downloads/mujs-1.1.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ad77276dfc2a3da8dfeca99a13928ce
+_md5_=c18130e0787266561c85907904af80ac
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 2c570f1bcd21..3c2d4b652fc5 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.10 b/metadata/md5-cache/dev-libs/fribidi-1.0.10
index 3de49d917dd1..62212780ce68 100644
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.10
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.10
@@ -4,9 +4,9 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=7
 HOMEPAGE=https://fribidi.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a77d05501a47853502f93e6e1ae593a
+_md5_=cba5561dbda748301f9cbd0357fe9d0d
diff --git a/metadata/md5-cache/dev-libs/gom-0.4 b/metadata/md5-cache/dev-libs/gom-0.4
index 43c893845184..21c9c20d5a47 100644
--- a/metadata/md5-cache/dev-libs/gom-0.4
+++ b/metadata/md5-cache/dev-libs/gom-0.4
@@ -1,16 +1,16 @@
 BDEPEND=app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( 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/pygobject-3.16:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig test? ( x11-libs/gdk-pixbuf:2 )
+DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( 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(-)] >=dev-python/pygobject-3.16:3[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(-)] ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) virtual/pkgconfig test? ( x11-libs/gdk-pixbuf:2 )
 DESCRIPTION=GObject to SQLite object mapper library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gom
-IUSE=gtk-doc +introspection python test python_targets_python3_7 python_targets_python3_8
+IUSE=gtk-doc +introspection python test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( 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/pygobject-3.16:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=python? ( introspection || ( python_targets_python3_7 python_targets_python3_8 ) )
+RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( 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(-)] >=dev-python/pygobject-3.16:3[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? ( introspection || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gom/0.4/gom-0.4.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8fe658e544e4e3550cfcdc859109304f
+_md5_=3b0c39ef8b8f87c81e5397b40930614b
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.6.2 b/metadata/md5-cache/dev-libs/json-glib-1.6.2
index 6de5952808b4..c6394a749482 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.6.2
+++ b/metadata/md5-cache/dev-libs/json-glib-1.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=Library providing GLib serialization and deserialization for the JSO
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.6/json-glib-1.6.2.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e826353e4c030c2666bf338e25c1416
+_md5_=66f74fe615b57117ef3a97a8cdc8de4e
diff --git a/metadata/md5-cache/dev-libs/klibc-2.0.4-r3 b/metadata/md5-cache/dev-libs/klibc-2.0.4-r3
deleted file mode 100644
index 1160fb03f8d1..000000000000
--- a/metadata/md5-cache/dev-libs/klibc-2.0.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-lang/perl sys-devel/bc
-DESCRIPTION=A minimal libc subset for use with initramfs
-EAPI=6
-HOMEPAGE=https://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/
-IUSE=debug test custom-cflags
-KEYWORDS=~alpha amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=dev-lang/perl
-RESTRICT=strip !test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/klibc/2.0/klibc-2.0.4.tar.xz mirror://debian/pool/main/k/klibc/klibc_2.0.4-9.debian.tar.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.14.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a72b54a37f27a56c8d56a308892a7f03
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.6 b/metadata/md5-cache/dev-libs/libgusb-0.3.6
index 0b8a3ead99e2..f601c964fba1 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.6
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.6
@@ -5,7 +5,7 @@ DESCRIPTION=GObject wrapper for libusb
 EAPI=7
 HOMEPAGE=https://github.com/hughsie/libgusb
 IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f1c88b72e377d9105cc907f55d982397
+_md5_=ef1c34593a3814fd6ba59a49cfb67ad2
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.36.2 b/metadata/md5-cache/dev-libs/libgweather-3.36.2
index 67d3dafeea1f..ea9d729556dd 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.36.2
+++ b/metadata/md5-cache/dev-libs/libgweather-3.36.2
@@ -5,11 +5,11 @@ DESCRIPTION=Location and timezone database and weather-lookup library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
 IUSE=glade gtk-doc +introspection +vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-16-2
 SRC_URI=mirror://gnome/sources/libgweather/3.36/libgweather-3.36.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27a1680fd2ae2cd2ce08c9bc477fc50e
+_md5_=dcaf1c9d325cb4f04bf15e0e4eab7f24
diff --git a/metadata/md5-cache/dev-libs/libinput-1.17.1 b/metadata/md5-cache/dev-libs/libinput-1.17.1
index 5098b792ddcb..3126aa0f6fd1 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.17.1
+++ b/metadata/md5-cache/dev-libs/libinput-1.17.1
@@ -5,11 +5,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.17.1.tar.xz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=6a74d8917c099759af7744ffcf4fe0c2
+_md5_=33a01670cc64e07b23dc2dd7bf8760b8
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.8 b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
similarity index 96%
rename from metadata/md5-cache/dev-libs/sord-0.16.8
rename to metadata/md5-cache/dev-libs/sord-0.16.8-r1
index 5ef2864c4082..3d2e1484a1e6 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.8
+++ b/metadata/md5-cache/dev-libs/sord-0.16.8-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.8.tar.bz2
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91
-_md5_=7aa8281e30fd5723daab0f4df3f4976f
+_md5_=cf0ae49f16780aa437a508fa52af9ac8
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
deleted file mode 100644
index 930e01899dd8..000000000000
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=C client interface to Zookeeper server
-EAPI=5
-HOMEPAGE=https://zookeeper.apache.org/
-IUSE=doc static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b912e2974d800d9bed99290f458a304
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8
deleted file mode 100644
index f6070505cb5a..000000000000
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=C client interface to Zookeeper server
-EAPI=5
-HOMEPAGE=https://zookeeper.apache.org/
-IUSE=doc static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.8/zookeeper-3.4.8.tar.gz
-_md5_=726e3967ba030d286fe29bed7bf89bdd
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9
deleted file mode 100644
index 7f79350bcff5..000000000000
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=C client interface to Zookeeper server
-EAPI=5
-HOMEPAGE=https://zookeeper.apache.org/
-IUSE=doc static-libs test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.9/zookeeper-3.4.9.tar.gz
-_md5_=726e3967ba030d286fe29bed7bf89bdd
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index e52128ae751d..728f22286b7b 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100 b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
deleted file mode 100644
index 7ed480d08dee..000000000000
--- a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
-DEFINED_PHASES=compile install test
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-DESCRIPTION=Command line argument parser for the Lua Programming Language
-EAPI=7
-HOMEPAGE=https://github.com/mpeterv/argparse
-IUSE=doc test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mpeterv/argparse/archive/0.6.0.tar.gz -> lua-argparse-0.6.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8c3e1d876f1a38039bd0bb3fa0109c0c
diff --git a/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101 b/metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
similarity index 80%
rename from metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
rename to metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
index 967425373a64..148f1a2a0932 100644
--- a/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
+++ b/metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
@@ -11,6 +11,6 @@ RDEPEND=!dev-lua/luaossl !dev-lua/luasec libressl? ( dev-libs/libressl:0= ) !lib
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/zhaozg/lua-openssl/archive/0.7.8-0.tar.gz -> lua-openssl-0.7.8_p0.tar.gz https://github.com/zhaozg/lua-auxiliar/archive/8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz -> lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
+SRC_URI=https://github.com/zhaozg/lua-openssl/archive/refs/tags/0.8.0-6.tar.gz -> lua-openssl-0.8.0_p6.tar.gz https://github.com/zhaozg/lua-auxiliar/archive/8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz -> lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=852e588fd2b7172d168a398d6ef9d4ad
+_md5_=8a1e6471b49a4561a3e122edd582a8b3
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.6.0 b/metadata/md5-cache/dev-lua/luarocks-3.7.0
similarity index 97%
rename from metadata/md5-cache/dev-lua/luarocks-3.6.0
rename to metadata/md5-cache/dev-lua/luarocks-3.7.0
index ce46c195976b..2d5ccfa86cbe 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.6.0
+++ b/metadata/md5-cache/dev-lua/luarocks-3.7.0
@@ -11,6 +11,6 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://luarocks.org/releases/luarocks-3.6.0.tar.gz
+SRC_URI=https://luarocks.org/releases/luarocks-3.7.0.tar.gz
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=99aeb7ab77933e371cc3a1612e39bfc3
diff --git a/metadata/md5-cache/dev-perl/AnyEvent-7.170.0 b/metadata/md5-cache/dev-perl/AnyEvent-7.170.0
index aa2e5de38d30..487606c251fc 100644
--- a/metadata/md5-cache/dev-perl/AnyEvent-7.170.0
+++ b/metadata/md5-cache/dev-perl/AnyEvent-7.170.0
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.17.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=d08b20ffeefb0d43ae179260061cd5db
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 20ab37d2cb08..8d0c9bcfe1f9 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Term-Table-0.8.0 b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
index d4f4e0e6c085..074656b22b6f 100644
--- a/metadata/md5-cache/dev-perl/Term-Table-0.8.0
+++ b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Ut
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.008.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
 _md5_=340de0c2e020ea8e492b0081ea685271
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 669fda8c50df..d92aee5fa8be 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1 b/metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
deleted file mode 100644
index 0fc238ac5b5b..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test unpack
-DEPEND=test? ( xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util ) )
-DESCRIPTION=Provides multiple methods for configuration manipulation
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Config
-IUSE=test xml
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-2.02
-RDEPEND=xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util ) >=dev-php/pear-1.8.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pear/Config/archive/606a24034ad80f9d6ccb5a8b698b702b392e4674.tar.gz -> Config-2.0.0_pre20140323.tar.gz
-_eclasses_=php-pear-r2	4a7c293febeea04349068d5716ad29ff	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=11985c8731416a88891e3549d881dc0d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 7ba7b801a7f7..3e2f3dc1e206 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.1-r1 b/metadata/md5-cache/dev-python/aesara-2.0.1-r1
index 1cb53dc28288..d12e6be3a88c 100644
--- a/metadata/md5-cache/dev-python/aesara-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/aesara-2.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/aesara/archive/rel-2.0.1.tar.gz -> aesara-rel-2.0.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e01e55c470c84f0a71be692deaa77db3
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.2 b/metadata/md5-cache/dev-python/aesara-2.0.2
index b24a17e0f17b..dafde686bda5 100644
--- a/metadata/md5-cache/dev-python/aesara-2.0.2
+++ b/metadata/md5-cache/dev-python/aesara-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/aesara/archive/rel-2.0.2.tar.gz -> aesara-rel-2.0.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e01e55c470c84f0a71be692deaa77db3
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.3 b/metadata/md5-cache/dev-python/aesara-2.0.3
index 07e81f0c7982..b127cb45abb5 100644
--- a/metadata/md5-cache/dev-python/aesara-2.0.3
+++ b/metadata/md5-cache/dev-python/aesara-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/aesara/archive/rel-2.0.3.tar.gz -> aesara-rel-2.0.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e01e55c470c84f0a71be692deaa77db3
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.4 b/metadata/md5-cache/dev-python/aesara-2.0.4
index 0dac0ab66728..d1e4664b4691 100644
--- a/metadata/md5-cache/dev-python/aesara-2.0.4
+++ b/metadata/md5-cache/dev-python/aesara-2.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/aesara/archive/rel-2.0.4.tar.gz -> aesara-rel-2.0.4.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e01e55c470c84f0a71be692deaa77db3
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.5 b/metadata/md5-cache/dev-python/aesara-2.0.5
index b863d84729d8..9316739711c2 100644
--- a/metadata/md5-cache/dev-python/aesara-2.0.5
+++ b/metadata/md5-cache/dev-python/aesara-2.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/aesara/archive/rel-2.0.5.tar.gz -> aesara-rel-2.0.5.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e01e55c470c84f0a71be692deaa77db3
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.6 b/metadata/md5-cache/dev-python/aesara-2.0.6
index c8886b9256f4..a9dadd718643 100644
--- a/metadata/md5-cache/dev-python/aesara-2.0.6
+++ b/metadata/md5-cache/dev-python/aesara-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/aesara/archive/rel-2.0.6.tar.gz -> aesara-rel-2.0.6.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e01e55c470c84f0a71be692deaa77db3
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-1.0.2 b/metadata/md5-cache/dev-python/bitarray-2.0.0
similarity index 60%
rename from metadata/md5-cache/dev-python/python-nbxmpp-1.0.2
rename to metadata/md5-cache/dev-python/bitarray-2.0.0
index b3a77f4ec5e5..ee13a32c06c5 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-1.0.2
+++ b/metadata/md5-cache/dev-python/bitarray-2.0.0
@@ -1,14 +1,14 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.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(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Efficient arrays of booleans -- C extension
 EAPI=7
-HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
+HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
 RDEPEND=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 )
 SLOT=0
-SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-1.0.2/python-nbxmpp-nbxmpp-1.0.2.tar.bz2 -> python-nbxmpp-1.0.2.tar.bz2
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=09e59d3019fb829c2ed19d1da168d7cf
+SRC_URI=mirror://pypi/b/bitarray/bitarray-2.0.0.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8f2d41f7dc0ab545165cca726a202e11
diff --git a/metadata/md5-cache/dev-python/black-20.8_beta1 b/metadata/md5-cache/dev-python/black-20.8_beta1
index de45d0af94b7..ccdd78e35c6c 100644
--- a/metadata/md5-cache/dev-python/black-20.8_beta1
+++ b/metadata/md5-cache/dev-python/black-20.8_beta1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/20.8b1.tar.gz -> black-20.8b1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=261589f9b3c1fa008792e5f173129c40
diff --git a/metadata/md5-cache/dev-python/blockdiag-2.0.1 b/metadata/md5-cache/dev-python/blockdiag-2.0.1
index dadfa171c825..b07898167cf7 100644
--- a/metadata/md5-cache/dev-python/blockdiag-2.0.1
+++ b/metadata/md5-cache/dev-python/blockdiag-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-2.0.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7d008fb21441a336850721647e6c4568
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.52 b/metadata/md5-cache/dev-python/boto3-1.17.52
new file mode 100644
index 000000000000..5aae18e4d0e7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.52
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[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(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.52[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(-)] >=dev-python/jmespath-0.7.1[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(-)] >=dev-python/s3transfer-0.3.0[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(-)] >=dev-python/nose-1.3.7-r4[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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.52[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(-)] >=dev-python/jmespath-0.7.1[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(-)] >=dev-python/s3transfer-0.3.0[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/boto/boto3/archive/1.17.52.tar.gz -> boto3-1.17.52.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.52 b/metadata/md5-cache/dev-python/botocore-1.20.52
new file mode 100644
index 000000000000..8d65eab670c7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.52
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[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(-)] dev-python/jsonschema[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(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[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(-)] dev-python/jmespath[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(-)] dev-python/python-dateutil[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(-)] >=dev-python/urllib3-1.25.4[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(-)] >=dev-python/nose-1.3.7-r4[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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[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(-)] dev-python/jmespath[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(-)] dev-python/python-dateutil[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(-)] >=dev-python/urllib3-1.25.4[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=mirror://pypi/b/botocore/botocore-1.20.52.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.19 b/metadata/md5-cache/dev-python/bottle-0.12.19
index 586d50664fc7..0e07dcd0882c 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.19
+++ b/metadata/md5-cache/dev-python/bottle-0.12.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.19.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=88cf19f8371f45038c4d343633204419
diff --git a/metadata/md5-cache/dev-python/cython-0.29.23 b/metadata/md5-cache/dev-python/cython-0.29.23
new file mode 100644
index 000000000000..c5e8e8e1bff8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-0.29.23
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( python_targets_python3_7? ( dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=A Python to C compiler
+EAPI=7
+HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
+IUSE=emacs test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cython/cython/archive/0.29.23.tar.gz -> cython-0.29.23.gh.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d64df0abf5f2fdff41a7f97910afe4e3
diff --git a/metadata/md5-cache/dev-python/django-2.2.20 b/metadata/md5-cache/dev-python/django-2.2.20
index 50eb18da59ac..4a1d597c3664 100644
--- a/metadata/md5-cache/dev-python/django-2.2.20
+++ b/metadata/md5-cache/dev-python/django-2.2.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.20.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.20.checksum.txt )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=6530fdd22d1c8f18667cead96cd04826
diff --git a/metadata/md5-cache/dev-python/django-3.0.14-r1 b/metadata/md5-cache/dev-python/django-3.0.14-r1
index 0706c149fc47..ba523b07fe15 100644
--- a/metadata/md5-cache/dev-python/django-3.0.14-r1
+++ b/metadata/md5-cache/dev-python/django-3.0.14-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.0/Django-3.0.14.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.0.14.checksum.txt )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=3f868257e86cff40191cef8c82e30d7e
diff --git a/metadata/md5-cache/dev-python/django-3.1.8-r1 b/metadata/md5-cache/dev-python/django-3.1.8-r1
index b2e959d2b0da..6825fa835989 100644
--- a/metadata/md5-cache/dev-python/django-3.1.8-r1
+++ b/metadata/md5-cache/dev-python/django-3.1.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.8.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.8.checksum.txt )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=cb8eb21d3c6ce3f60fb85dd71284c556
diff --git a/metadata/md5-cache/dev-python/django-3.2 b/metadata/md5-cache/dev-python/django-3.2
index 54d6d57b4993..0aa9ce1c07b3 100644
--- a/metadata/md5-cache/dev-python/django-3.2
+++ b/metadata/md5-cache/dev-python/django-3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.checksum.txt )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=b091e1a4ddbde92a70099a00afb4edd4
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1 b/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1
new file mode 100644
index 000000000000..058d1e64bd94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) 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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-python/django-1.11[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(-)] >=dev-python/sqlparse-0.2.0[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(-)] )
+DESCRIPTION=A configurable set of panels that display debug information
+EAPI=7
+HOMEPAGE=https://pypi.org/project/django-debug-toolbar/ https://github.com/jazzband/django-debug-toolbar/
+IUSE=doc examples test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.11[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(-)] >=dev-python/sqlparse-0.2.0[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/jazzband/django-debug-toolbar/archive/3.2.1.tar.gz -> django-debug-toolbar-3.2.1.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=13820a860a6706f0baa73cb3398a275f
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.0.5 b/metadata/md5-cache/dev-python/dkimpy-1.0.5
index 71abd0a1ddc1..b1d8802fa38e 100644
--- a/metadata/md5-cache/dev-python/dkimpy-1.0.5
+++ b/metadata/md5-cache/dev-python/dkimpy-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dkimpy/dkimpy-1.0.5.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8aad9d4405b7d25304cfd5972dfa2b66
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.29 b/metadata/md5-cache/dev-python/ebuildtester-0.1.29
new file mode 100644
index 000000000000..f3b318449c51
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.29
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools_scm[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(-)] dev-python/sphinx[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(-)]
+DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3 container
+EAPI=7
+HOMEPAGE=https://ebuildtester.readthedocs.io/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-emulation/docker sys-fs/fuse 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=mirror://pypi/e/ebuildtester/ebuildtester-0.1.29.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0834cd53aa49fcb2c636ba9f6ff623c1
diff --git a/metadata/md5-cache/dev-python/fs-2.4.12 b/metadata/md5-cache/dev-python/fs-2.4.12
index 065e3d95f43e..2145eb5fdd41 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.12
+++ b/metadata/md5-cache/dev-python/fs-2.4.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyFilesystem/pyfilesystem2/archive/v2.4.12.tar.gz -> fs-2.4.12.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e1af84df743da33ea0c0dea4ce57b74f
diff --git a/metadata/md5-cache/dev-python/fs-2.4.13 b/metadata/md5-cache/dev-python/fs-2.4.13
index dfcff3338640..706a1ab8ce9f 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.13
+++ b/metadata/md5-cache/dev-python/fs-2.4.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyFilesystem/pyfilesystem2/archive/v2.4.13.tar.gz -> fs-2.4.13.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=31e1836749c164f8cd78df2e087c0dd2
diff --git a/metadata/md5-cache/dev-python/gsd-1.5.3-r1 b/metadata/md5-cache/dev-python/gsd-1.5.3-r1
deleted file mode 100644
index 2c587b460ef6..000000000000
--- a/metadata/md5-cache/dev-python/gsd-1.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=GSD - file format specification and a library to read and write it
-EAPI=7
-HOMEPAGE=https://bitbucket.org/glotzer/gsd
-IUSE=python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://glotzerlab.engin.umich.edu/Downloads/gsd/gsd-v1.5.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0ac0eaaa74a21e847fc3aa856dff9660
diff --git a/metadata/md5-cache/dev-python/gsd-2.4.0 b/metadata/md5-cache/dev-python/gsd-2.4.0
deleted file mode 100644
index a2c470c1aaa1..000000000000
--- a/metadata/md5-cache/dev-python/gsd-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/numpy[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(-)] >=dev-python/setuptools-42.0.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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=GSD - file format specification and a library to read and write it
-EAPI=7
-HOMEPAGE=https://github.com/glotzerlab/gsd
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/numpy[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 )
-SLOT=0
-SRC_URI=https://github.com/glotzerlab/gsd/releases/download/v2.4.0/gsd-v2.4.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3cef0eb1cea04d635ad6fe0f94b1738d
diff --git a/metadata/md5-cache/dev-python/gsd-2.4.2 b/metadata/md5-cache/dev-python/gsd-2.4.2
new file mode 100644
index 000000000000..342cb4e66dfe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gsd-2.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[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(-)] test? ( dev-python/numpy[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(-)] >=dev-python/pytest-4.5.0[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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[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(-)]
+DESCRIPTION=GSD - file format specification and a library to read and write it
+EAPI=7
+HOMEPAGE=https://github.com/glotzerlab/gsd
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/numpy[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(-)] >=dev-python/setuptools-42.0.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/glotzerlab/gsd/releases/download/v2.4.2/gsd-v2.4.2.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=26fd2315d87fa43ec619097ecfe396eb
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.6.0 b/metadata/md5-cache/dev-python/hypothesis-6.6.0
index 69352048b2af..ec2fb039d132 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.6.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.6.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=34dc186e16834af71b171bde2a38ee57
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.8.1 b/metadata/md5-cache/dev-python/hypothesis-6.8.1
index 5136ada03fe6..272971f4f246 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.8.1
+++ b/metadata/md5-cache/dev-python/hypothesis-6.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.8.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f232863ece56f2a72a8c2037a4b43120
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.8.9 b/metadata/md5-cache/dev-python/hypothesis-6.8.9
index b8150c4b520a..cc2636a12c1b 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.8.9
+++ b/metadata/md5-cache/dev-python/hypothesis-6.8.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.8.9.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f232863ece56f2a72a8c2037a4b43120
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.9.0 b/metadata/md5-cache/dev-python/hypothesis-6.9.0
index 902ee07e86c2..a00ee8bec30e 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.9.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.9.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f232863ece56f2a72a8c2037a4b43120
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.9.1 b/metadata/md5-cache/dev-python/hypothesis-6.9.1
index 4a3a525af688..73cc59880d2f 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.9.1
+++ b/metadata/md5-cache/dev-python/hypothesis-6.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.9.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f232863ece56f2a72a8c2037a4b43120
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.9.2 b/metadata/md5-cache/dev-python/hypothesis-6.9.2
new file mode 100644
index 000000000000..853fa70c953d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.9.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.9.2.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f232863ece56f2a72a8c2037a4b43120
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1 b/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
index b0eb19b4168e..e47c27967db6 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.3.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=930fabd07c29462023e2c0f1e9c688fc
diff --git a/metadata/md5-cache/dev-python/ipython-7.21.0-r1 b/metadata/md5-cache/dev-python/ipython-7.21.0-r1
index 877ab7e6f695..4b432733ca97 100644
--- a/metadata/md5-cache/dev-python/ipython-7.21.0-r1
+++ b/metadata/md5-cache/dev-python/ipython-7.21.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.21.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=c34fd436f429f6e5330ca3b59b9fdbf0
diff --git a/metadata/md5-cache/dev-python/ipython-7.22.0-r1 b/metadata/md5-cache/dev-python/ipython-7.22.0-r1
index d2d5e7a8d536..f9f5ed2c26de 100644
--- a/metadata/md5-cache/dev-python/ipython-7.22.0-r1
+++ b/metadata/md5-cache/dev-python/ipython-7.22.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.22.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=40764367c3f314ccb9ccf4747718549d
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.2-r1 b/metadata/md5-cache/dev-python/lxml-4.6.2-r1
index fea5cdf977b7..3b2cb37b7e65 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.2-r1
+++ b/metadata/md5-cache/dev-python/lxml-4.6.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bd35e58e69bcf29fac38a3a78d05df3a
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.3 b/metadata/md5-cache/dev-python/lxml-4.6.3
index bebd13941d0a..74e26fa26d9a 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.3
+++ b/metadata/md5-cache/dev-python/lxml-4.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d825122e1f6323c6b5781a73b2fc0769
diff --git a/metadata/md5-cache/dev-python/mako-1.1.4 b/metadata/md5-cache/dev-python/mako-1.1.4
index 09e402e3c0a7..9ad49c9cb6a9 100644
--- a/metadata/md5-cache/dev-python/mako-1.1.4
+++ b/metadata/md5-cache/dev-python/mako-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.1.4.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=cbd4cda95201f372a86b8269384eb6f2
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.5.6 b/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
index 06c2457e7cd5..c0be2cc378a2 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
+++ b/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netCDF4/netCDF4-1.5.6.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=44961f012216d0e30e4525d110412b69
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.11 b/metadata/md5-cache/dev-python/nuitka-0.6.11
index eac2e04c9b24..4617a86311bb 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.11
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.11.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=805347395215342b60797795aadad961
diff --git a/metadata/md5-cache/dev-python/pandas-1.1.5-r1 b/metadata/md5-cache/dev-python/pandas-1.1.5-r1
index cedc76194956..1a5469eca85e 100644
--- a/metadata/md5-cache/dev-python/pandas-1.1.5-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.1.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.1.5.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b8bbf1f31c08d53836ed3a0a3101167
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.1-r1 b/metadata/md5-cache/dev-python/pandas-1.2.1-r1
index 8755c2669acd..98a4f247a564 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f832ec627d7ba732abef9e41fc273eb
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.2-r1 b/metadata/md5-cache/dev-python/pandas-1.2.2-r1
index ebddd58da7e7..26974654f442 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dae7362496f5e043192defe9b07a0c12
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.3-r1 b/metadata/md5-cache/dev-python/pandas-1.2.3-r1
index 12283102765f..afa877ad3e8c 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dae7362496f5e043192defe9b07a0c12
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.4 b/metadata/md5-cache/dev-python/pandas-1.2.4
index 55604d8998fd..63b7cd25d7ea 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.4
+++ b/metadata/md5-cache/dev-python/pandas-1.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.4.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dae7362496f5e043192defe9b07a0c12
diff --git a/metadata/md5-cache/dev-python/plumbum-1.7.0-r1 b/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
index 6f266b03751b..67836e1f6999 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/ed/ba/431d7f420cd93c4b8ccb15ed8f1c6c76c81965634fd70345af0b19c2b7bc/plumbum-1.7.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e50e118fba9e62a2bb44cc691f118f31
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
new file mode 100644
index 000000000000..b2b639ee1a86
--- /dev/null
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Get CPU info with pure Python 2 & 3
+EAPI=7
+HOMEPAGE=https://github.com/workhorsy/py-cpuinfo/ https://pypi.org/project/py-cpuinfo/
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-8.0.0.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0790a2392a72d48443f1ba143ed154d4
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1 b/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
index 3bf424bd74a5..74ec127c17a4 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.7.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4783bcb2c332fb7cd919146ad198c4d7
diff --git a/metadata/md5-cache/dev-python/pyjwt-2.0.1 b/metadata/md5-cache/dev-python/pyjwt-2.0.1
index 081522e70491..96a37828c800 100644
--- a/metadata/md5-cache/dev-python/pyjwt-2.0.1
+++ b/metadata/md5-cache/dev-python/pyjwt-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-2.0.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0424058a9dd3fd0b1df9a4e26fc3b3c9
diff --git a/metadata/md5-cache/dev-python/pylatex-1.4.1 b/metadata/md5-cache/dev-python/pylatex-1.4.1
index 2d216cbeea8c..b93529c5eb6f 100644
--- a/metadata/md5-cache/dev-python/pylatex-1.4.1
+++ b/metadata/md5-cache/dev-python/pylatex-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JelteF/PyLaTeX/archive/v1.4.1.tar.gz -> pylatex-1.4.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=78fdc6df533dc071bc8cab9b0069971d
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.3 b/metadata/md5-cache/dev-python/pyquery-1.4.3
index b985ef0155a4..9e744a010109 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.3
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9e2c3a92505e1d842d1e18452fa881f2
diff --git a/metadata/md5-cache/dev-python/pyscard-2.0.0 b/metadata/md5-cache/dev-python/pyscard-2.0.0
index c3ff318a8935..d1bfb18308d3 100644
--- a/metadata/md5-cache/dev-python/pyscard-2.0.0
+++ b/metadata/md5-cache/dev-python/pyscard-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/pcsc-lite python_targets_python3_7? ( dev-lang/python:3.7 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-2.0.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=872ab825e647bb83eb5fdf46c401ee3a
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.36.2 b/metadata/md5-cache/dev-python/python-language-server-0.36.2
index bc44bbd16736..8d90f331a0d6 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.36.2
+++ b/metadata/md5-cache/dev-python/python-language-server-0.36.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.36.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=55f969b652c5ad35ecff86093c364a39
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1 b/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
index c169021c277f..a94694b375b7 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.36.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=14a1fbc97d061b88862309f96cdd2b12
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-2.0.2-r1 b/metadata/md5-cache/dev-python/python-nbxmpp-2.0.2-r1
index b2d71fa6e303..6f8bf3f35f61 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-2.0.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
 EAPI=7
 HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[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(-)] dev-python/precis-i18n[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(-)] dev-python/pygobject[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-2.0.2/python-nbxmpp-nbxmpp-2.0.2.tar.bz2
 _eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=75eed116b20f3a0d9e985b639a10e78b
+_md5_=d3433ac8eed9837fdf962015cc5386e8
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1 b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
index 53344859783b..83b4a9795cad 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+++ b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v2.8.1.tar.gz -> qdarkstyle-2.8.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=fbb3c958c7cb4a7cad1ce2365470da1c
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-3.0.2 b/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
index 70a4370ef5d0..9b9be8f3e2f8 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
+++ b/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v3.0.2.tar.gz -> qdarkstyle-3.0.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=95b488cbb431c9a95f30c8c1138cb979
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.60 b/metadata/md5-cache/dev-python/reportlab-3.5.60
deleted file mode 100644
index 6c1942cd613c..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.5.60
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) 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(-)] >=dev-python/setuptools-42.0.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(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=7
-HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
-IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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=mirror://pypi/r/reportlab/reportlab-3.5.60.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b1765b532a8af0b2c35f5d2ae7f442d
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.63 b/metadata/md5-cache/dev-python/reportlab-3.5.63
deleted file mode 100644
index eb7cc6cb5772..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.5.63
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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(-)] dev-python/unittest-or-fail[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(-)] >=dev-python/setuptools-42.0.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(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=7
-HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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=mirror://pypi/r/reportlab/reportlab-3.5.63.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=577714af285c4d6f0c2488b2995971da
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.64 b/metadata/md5-cache/dev-python/reportlab-3.5.64
deleted file mode 100644
index 3c9ca7ba6ce6..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.5.64
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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(-)] dev-python/unittest-or-fail[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(-)] >=dev-python/setuptools-42.0.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(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=7
-HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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=mirror://pypi/r/reportlab/reportlab-3.5.64.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=577714af285c4d6f0c2488b2995971da
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.65 b/metadata/md5-cache/dev-python/reportlab-3.5.65
deleted file mode 100644
index 33313e79d3bc..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.5.65
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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(-)] dev-python/unittest-or-fail[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(-)] >=dev-python/setuptools-42.0.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(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=7
-HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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=mirror://pypi/r/reportlab/reportlab-3.5.65.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=577714af285c4d6f0c2488b2995971da
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.66 b/metadata/md5-cache/dev-python/reportlab-3.5.66
index c9701fe4bae3..e28694c9c17b 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.66
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.66
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=7
 HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.66.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ca900f6dbd7319e49d9545d267f4f763
+_md5_=3d91893c940edf04427a07003c55570f
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.6.2 b/metadata/md5-cache/dev-python/requests-cache-0.6.2
new file mode 100644
index 000000000000..a33f94122a0c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-cache-0.6.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-httpbin[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(-)] dev-python/timeout-decorator[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(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[sqlite] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/itsdangerous[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(-)] >=dev-python/requests-2.0.0[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(-)] >=dev-python/url-normalize-1.4[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(-)] >=dev-python/pytest-4.5.0[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[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Persistent cache for requests library
+EAPI=7
+HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/itsdangerous[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(-)] >=dev-python/requests-2.0.0[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(-)] >=dev-python/url-normalize-1.4[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[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=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/reclosedev/requests-cache/archive/v0.6.2.tar.gz -> requests-cache-0.6.2.gh.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d62883a335c0e95bf42d327523ecfd7d
diff --git a/metadata/md5-cache/dev-python/rich-10.0.0 b/metadata/md5-cache/dev-python/rich-10.0.0
index c856fa73492f..34edb3dfb96c 100644
--- a/metadata/md5-cache/dev-python/rich-10.0.0
+++ b/metadata/md5-cache/dev-python/rich-10.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v10.0.0.tar.gz -> rich-10.0.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=062c6c2d600e897aa3e52391baced44e
diff --git a/metadata/md5-cache/dev-python/rich-10.0.1 b/metadata/md5-cache/dev-python/rich-10.0.1
index 4bfc6e1b5b52..2646c5a20124 100644
--- a/metadata/md5-cache/dev-python/rich-10.0.1
+++ b/metadata/md5-cache/dev-python/rich-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v10.0.1.tar.gz -> rich-10.0.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=062c6c2d600e897aa3e52391baced44e
diff --git a/metadata/md5-cache/dev-python/rich-10.1.0 b/metadata/md5-cache/dev-python/rich-10.1.0
index 6f3379dd5bb6..dabff759075e 100644
--- a/metadata/md5-cache/dev-python/rich-10.1.0
+++ b/metadata/md5-cache/dev-python/rich-10.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v10.1.0.tar.gz -> rich-10.1.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=062c6c2d600e897aa3e52391baced44e
diff --git a/metadata/md5-cache/dev-python/rich-9.11.1 b/metadata/md5-cache/dev-python/rich-9.11.1
index 0eec888b055e..2ea4774ebcca 100644
--- a/metadata/md5-cache/dev-python/rich-9.11.1
+++ b/metadata/md5-cache/dev-python/rich-9.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v9.11.1.tar.gz -> rich-9.11.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=062c6c2d600e897aa3e52391baced44e
diff --git a/metadata/md5-cache/dev-python/rich-9.12.4 b/metadata/md5-cache/dev-python/rich-9.12.4
index bdeb6687fe85..a1a9361a230e 100644
--- a/metadata/md5-cache/dev-python/rich-9.12.4
+++ b/metadata/md5-cache/dev-python/rich-9.12.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v9.12.4.tar.gz -> rich-9.12.4.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=062c6c2d600e897aa3e52391baced44e
diff --git a/metadata/md5-cache/dev-python/rich-9.13.0 b/metadata/md5-cache/dev-python/rich-9.13.0
index 7457302cffc1..268f5d76556c 100644
--- a/metadata/md5-cache/dev-python/rich-9.13.0
+++ b/metadata/md5-cache/dev-python/rich-9.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v9.13.0.tar.gz -> rich-9.13.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=062c6c2d600e897aa3e52391baced44e
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.3 b/metadata/md5-cache/dev-python/spyder-4.2.3
index 37865d44e5c7..655586c3c1dc 100644
--- a/metadata/md5-cache/dev-python/spyder-4.2.3
+++ b/metadata/md5-cache/dev-python/spyder-4.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.3.tar.gz -> spyder-4.2.3.tar.gz https://github.com/spyder-ide/spyder-docs/archive/5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz -> spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11984fbc4c511117aa69586976057eae
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.5 b/metadata/md5-cache/dev-python/spyder-4.2.5
index 4177b555e946..8fcabf03bd67 100644
--- a/metadata/md5-cache/dev-python/spyder-4.2.5
+++ b/metadata/md5-cache/dev-python/spyder-4.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.5.tar.gz -> spyder-4.2.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78b25754c69a20643258821146e398ad5535c920.tar.gz -> spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17f48ac34d4ed8373c5bef0ea021687a
diff --git a/metadata/md5-cache/dev-python/spyder-5.0.0 b/metadata/md5-cache/dev-python/spyder-5.0.0
index 07b735a50a3c..45c1550695e7 100644
--- a/metadata/md5-cache/dev-python/spyder-5.0.0
+++ b/metadata/md5-cache/dev-python/spyder-5.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.0.0.tar.gz -> spyder-5.0.0.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78b25754c69a20643258821146e398ad5535c920.tar.gz -> spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1be270d0bdaf98baab3a146da820034f
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.23 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.23
index 86be90ab38e5..0d4f8ffb4b37 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.23
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.23
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.23.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2f532fa6f390e946726bdf16962986df
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.24 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.24
index 094b01ce51c2..495f5f19147a 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.24
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.24.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d334781a63d34c2f12468732ea4761b2
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.2 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.2
index a8da21533afa..36d4ba39b31a 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ffe753771f8eeb5d01cadbd4350d60cc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.5 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.5
index c1bd0b152a22..e5f3b044eac0 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.5
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.5.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ffe753771f8eeb5d01cadbd4350d60cc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.6 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.6
index 9607081a3e2f..06f8c506bc95 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.6
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.6.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ffe753771f8eeb5d01cadbd4350d60cc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.7 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.7
index eb1c156f7d2b..108f880b2991 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.7
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.7.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ffe753771f8eeb5d01cadbd4350d60cc
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.2 b/metadata/md5-cache/dev-python/statsmodels-0.12.2
index e33a7065e354..a12059917588 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.2
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0848b067a2e6cc47cfc4357d6251ffab
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.3 b/metadata/md5-cache/dev-python/texttable-1.6.3
index f8c1a40bbda3..97eb696902fd 100644
--- a/metadata/md5-cache/dev-python/texttable-1.6.3
+++ b/metadata/md5-cache/dev-python/texttable-1.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.3.tar.gz -> texttable-1.6.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=568ae6f9b4457fa0c2a45740234533df
diff --git a/metadata/md5-cache/dev-python/theano-1.0.5-r1 b/metadata/md5-cache/dev-python/theano-1.0.5-r1
index dce25a128e2b..abf4221d1df1 100644
--- a/metadata/md5-cache/dev-python/theano-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/theano-1.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-1.0.5.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8cdbcd226149955572365c2ddbe3625e
diff --git a/metadata/md5-cache/dev-python/theano-pymc-1.1.0 b/metadata/md5-cache/dev-python/theano-pymc-1.1.0
index bd6a8ab6d834..c09a59c48dfb 100644
--- a/metadata/md5-cache/dev-python/theano-pymc-1.1.0
+++ b/metadata/md5-cache/dev-python/theano-pymc-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/Theano-PyMC/archive/rel-1.1.0.tar.gz -> Theano-PyMC-rel-1.1.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=436a600174bd89552733ed17a83dbc20
diff --git a/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1 b/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1
index 5b1bf9fce585..d5d48c39bd45 100644
--- a/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/Theano-PyMC/archive/rel-1.1.2.tar.gz -> Theano-PyMC-rel-1.1.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9368d8870ccfaaf9b47184bb63cc5bf0
diff --git a/metadata/md5-cache/dev-python/watchdog-1.0.2 b/metadata/md5-cache/dev-python/watchdog-1.0.2
index ce2d29ca81f8..e2c8f87b84a6 100644
--- a/metadata/md5-cache/dev-python/watchdog-1.0.2
+++ b/metadata/md5-cache/dev-python/watchdog-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v1.0.2.tar.gz -> watchdog-1.0.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3c2efe14f6560d1d3be7f4e6f9be4917
diff --git a/metadata/md5-cache/dev-python/watchdog-2.0.2 b/metadata/md5-cache/dev-python/watchdog-2.0.2
index f56f80caaaca..95ac5765767b 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.0.2
+++ b/metadata/md5-cache/dev-python/watchdog-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.0.2.tar.gz -> watchdog-2.0.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3c2efe14f6560d1d3be7f4e6f9be4917
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.3.9 b/metadata/md5-cache/dev-python/xlsxwriter-1.3.9
new file mode 100644
index 000000000000..aa31bd26a539
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlsxwriter-1.3.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for creating Excel XLSX files
+EAPI=7
+HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.3.9.tar.gz -> XlsxWriter-RELEASE_1.3.9.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=90bc70d1a0c46479987ced8b98e1f87c
diff --git a/metadata/md5-cache/dev-python/xxhash-2.0.2 b/metadata/md5-cache/dev-python/xxhash-2.0.2
new file mode 100644
index 000000000000..bb652af20a95
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xxhash-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/xxhash-0.8.0 test? ( >=dev-libs/xxhash-0.8.0 dev-python/unittest-or-fail[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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python binding for the xxHash library
+EAPI=7
+HOMEPAGE=https://github.com/ifduyue/python-xxhash https://pypi.org/project/xxhash/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/xxhash-0.8.0 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=mirror://pypi/x/xxhash/xxhash-2.0.2.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=121f8bd8bd93a4007b23f7e6a3f5699d
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index d52ab2ce3e0e..bc67620d670e 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
new file mode 100644
index 000000000000..dda6bb810885
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( x11-libs/cairo ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A pkg-config implementation by Ruby
+EAPI=7
+HOMEPAGE=https://github.com/rcairo/pkg-config
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/pkg-config-1.4.6.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	d9894561694732185fbcad470b121f2e	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=596a96a4fc449ea49fc5a8ad6e029f65
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0 b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
index 5731d8c2fb5c..33c8184efc9c 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Simple library to generate UUIDs
 EAPI=7
 HOMEPAGE=https://github.com/sporkmonger/uuidtools
-IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/uuidtools-2.2.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	d9894561694732185fbcad470b121f2e	ruby-ng	40ad5ce3f20bff3a06352fd3fb633cfd	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57c7fd79cb576179925756590d022f9f
+_md5_=43e941d1f505fd3c05c09dd48363e5c1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index a24612220305..c822a59b1bf6 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bats-1.2.1 b/metadata/md5-cache/dev-util/bats-1.2.1
index 32721e32b141..59a3e126a045 100644
--- a/metadata/md5-cache/dev-util/bats-1.2.1
+++ b/metadata/md5-cache/dev-util/bats-1.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/bats-core/bats-core/archive/v1.2.1.tar.gz -> bats-1.2.1.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=c94069883696f70c5aed7b188a14e6f8
diff --git a/metadata/md5-cache/dev-util/bats-1.3.0 b/metadata/md5-cache/dev-util/bats-1.3.0
index 3c5825a52706..8d183904d97d 100644
--- a/metadata/md5-cache/dev-util/bats-1.3.0
+++ b/metadata/md5-cache/dev-util/bats-1.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/bats-core/bats-core/archive/v1.3.0.tar.gz -> bats-1.3.0.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=6ea0f198c7a59645783ca389be2c6f89
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 7c1a80c44222..452236eb9b8f 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/util-linux[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) alpha? ( dev-libs/libisoburn ) ia64? ( dev-libs/libisoburn sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) 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_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=daed5eb503ff56e83724e636037c3120
diff --git a/metadata/md5-cache/dev-util/cutter-2.0.1 b/metadata/md5-cache/dev-util/cutter-2.0.1
index 328eac679e6c..2cba0ce7e965 100644
--- a/metadata/md5-cache/dev-util/cutter-2.0.1
+++ b/metadata/md5-cache/dev-util/cutter-2.0.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin dev-qt/linguist-tools:5
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin graphviz? ( media-gfx/graphviz ) dev-qt/linguist-tools:5
 DESCRIPTION=A Qt and C++ GUI for rizin reverse engineering framework
 EAPI=7
 HOMEPAGE=https://cutter.re https://github.com/rizinorg/cutter/
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=graphviz python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-SA-3.0 GPL-3
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin graphviz? ( media-gfx/graphviz )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rizinorg/cutter/archive/v2.0.1.tar.gz -> cutter-2.0.1.tar.gz https://github.com/rizinorg/cutter-translations/archive/974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz -> cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=391cddd788b15f13afa3aa4f5694c0ec
+_md5_=1dcb2f9a1898b8a5e82c365f666f933c
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.15 b/metadata/md5-cache/dev-util/d-feet-0.3.15
new file mode 100644
index 000000000000..1b1fe7a8d3f5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/itstool >=dev-util/intltool-0.40.0 test? ( dev-python/pycodestyle ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=D-Feet is a powerful D-Bus debugger
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/DFeet
+IUSE=test +X python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 python_single_target_python3_7? ( >=dev-python/pygobject-3.3.91:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.3.91:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.3.91:3[python_targets_python3_9(-)] ) >=sys-apps/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.15.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b329f58989b3b578306a8f2a9f1d7a3b
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r4 b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
index 71badd42f7de..12eb39ff583f 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r4
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gdb sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXaw x11-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d22f83ace01e55b208790f54fa709ac0
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.6.2 b/metadata/md5-cache/dev-util/kdevelop-5.6.2
index c1cf91ba15a0..500b1a764d5a 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.6.2
+++ b/metadata/md5-cache/dev-util/kdevelop-5.6.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/56
 SRC_URI=mirror://kde/stable/kdevelop/5.6.2/src/kdevelop-5.6.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8c319fbf2730b92d9b553f5f55dd4f3
diff --git a/metadata/md5-cache/dev-util/lcov-1.15 b/metadata/md5-cache/dev-util/lcov-1.15
index 60d417637f09..6e97b9e7fcf9 100644
--- a/metadata/md5-cache/dev-util/lcov-1.15
+++ b/metadata/md5-cache/dev-util/lcov-1.15
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip
 SLOT=0
 SRC_URI=https://github.com/linux-test-project/lcov/releases/download/v1.15/lcov-1.15.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
 _md5_=62aee433c845375c9256386e05adb872
diff --git a/metadata/md5-cache/dev-util/lcov-9999 b/metadata/md5-cache/dev-util/lcov-9999
index d5d74c8461fe..90ed50a77383 100644
--- a/metadata/md5-cache/dev-util/lcov-9999
+++ b/metadata/md5-cache/dev-util/lcov-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	optfeature	a3678a005063e7c50aed4e37d04197ab	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	optfeature	2e90be23a14db1ea432d6b216eb2a81e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
 _md5_=e4b2a0cb05e2b7c48352d3bf9d749c40
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r2
index b18ad7083fe0..dd8aca1f7c26 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r2
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.8.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.8.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c102fd929d39eb6af5fdea8d59b03ae4
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.3-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.9.3-r1
index df993d1d1533..49a770b3356b 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.3-r1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ec8ff2dc03b325ec2b35c9b541413dbc
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.5 b/metadata/md5-cache/dev-util/pkgcheck-0.9.5
index b550b5bf713a..ad927a7fe7bb 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.5
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.5.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e3bb78a1ec7a45dba21c4f5782c441a3
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.7 b/metadata/md5-cache/dev-util/pkgcheck-0.9.7
index 44ea72ca0944..99f2290c4824 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.7
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.7.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=149ecb7eb2a8d9aae842618c3f403b89
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 8aa3f39a7f08..f0e8f6308229 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=149ecb7eb2a8d9aae842618c3f403b89
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.13 b/metadata/md5-cache/dev-util/sccache-0.2.13
index f59db5884275..5c045b83980e 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.13
+++ b/metadata/md5-cache/dev-util/sccache-0.2.13
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/0.2.13.tar.gz -> sccache-0.2.13.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ar/0.6.2/download -> ar-0.6.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.4/download -> arc-swap-0.4.4.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/ascii/0.9.3/download -> ascii-0.9.3.crate https://crates.io/api/v1/crates/assert_cmd/0.9.1/download -> assert_cmd-0.9.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/backtrace/0.3.40/download -> backtrace-0.3.40.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.2.0/download -> bincode-1.2.0.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.9/download -> blake2b_simd-0.5.9.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/buf_redux/0.6.3/download -> buf_redux-0.6.3.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.crate https://crates.io/api/v1/crates/case/0.1.0/download -> case-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.10/download -> chrono-0.4.10.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/combine/3.8.1/download -> combine-3.8.1.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/cookie/0.12.0/download -> cookie-0.12.0.crate https://crates.io/api/v1/crates/cookie_store/0.7.0/download -> cookie_store-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/crypto-mac/0.7.0/download -> crypto-mac-0.7.0.crate https://crates.io/api/v1/crates/daemonize/0.3.0/download -> daemonize-0.3.0.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/directories/1.0.2/download -> directories-1.0.2.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dtoa/0.4.4/download -> dtoa-0.4.4.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encoding_rs/0.8.20/download -> encoding_rs-0.8.20.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/escargot/0.3.1/download -> escargot-0.3.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/flate2/1.0.13/download -> flate2-1.0.13.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.29/download -> futures-0.1.29.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/h2/0.1.26/download -> h2-0.1.26.crate https://crates.io/api/v1/crates/hermit-abi/0.1.3/download -> hermit-abi-0.1.3.crate https://crates.io/api/v1/crates/hmac/0.7.1/download -> hmac-0.7.1.crate https://crates.io/api/v1/crates/http/0.1.21/download -> http-0.1.21.crate https://crates.io/api/v1/crates/http-body/0.1.0/download -> http-body-0.1.0.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.12.35/download -> hyper-0.12.35.crate https://crates.io/api/v1/crates/hyper-tls/0.3.2/download -> hyper-tls-0.3.2.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.3.0/download -> indexmap-1.3.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.7.11/download -> itertools-0.7.11.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.4.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jobserver/0.1.19/download -> jobserver-0.1.19.crate https://crates.io/api/v1/crates/jsonwebtoken/6.0.1/download -> jsonwebtoken-6.0.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/libmount/0.1.15/download -> libmount-0.1.15.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/linked-hash-map/0.2.1/download -> linked-hash-map-0.2.1.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.3.2/download -> lock_api-0.3.2.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lru-disk-cache/0.4.0/download -> lru-disk-cache-0.4.0.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md-5/0.8.0/download -> md-5-0.8.0.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/memcached-rs/0.3.0/download -> memcached-rs-0.3.0.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.14/download -> mime-0.3.14.crate https://crates.io/api/v1/crates/mime_guess/1.8.7/download -> mime_guess-1.8.7.crate https://crates.io/api/v1/crates/mime_guess/2.0.1/download -> mime_guess-2.0.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.5/download -> miniz_oxide-0.3.5.crate https://crates.io/api/v1/crates/mio/0.6.21/download -> mio-0.6.21.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/multipart/0.13.6/download -> multipart-0.13.6.crate https://crates.io/api/v1/crates/native-tls/0.2.3/download -> native-tls-0.2.3.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.11.1/download -> nix-0.11.1.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.crate https://crates.io/api/v1/crates/num-integer/0.1.41/download -> num-integer-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.10/download -> num-traits-0.2.10.crate https://crates.io/api/v1/crates/num_cpus/1.11.1/download -> num_cpus-1.11.1.crate https://crates.io/api/v1/crates/number_prefix/0.2.8/download -> number_prefix-0.2.8.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/openssl/0.10.26/download -> openssl-0.10.26.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.53/download -> openssl-sys-0.9.53.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.7.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/predicates/0.9.1/download -> predicates-0.9.1.crate https://crates.io/api/v1/crates/predicates-core/0.9.0/download -> predicates-core-0.9.0.crate https://crates.io/api/v1/crates/predicates-tree/0.9.0/download -> predicates-tree-0.9.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/publicsuffix/1.5.4/download -> publicsuffix-1.5.4.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redis/0.9.1/download -> redis-0.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.1/download -> redox_users-0.3.1.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/reqwest/0.9.22/download -> reqwest-0.9.22.crate https://crates.io/api/v1/crates/retry/0.4.0/download -> retry-0.4.0.crate https://crates.io/api/v1/crates/ring/0.14.6/download -> ring-0.14.6.crate https://crates.io/api/v1/crates/rouille/2.2.0/download -> rouille-2.2.0.crate https://crates.io/api/v1/crates/rust-argon2/0.5.1/download -> rust-argon2-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/sccache/0.2.13/download -> sccache-0.2.13.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/security-framework/0.3.4/download -> security-framework-0.3.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.3.3/download -> security-framework-sys-0.3.3.crate https://crates.io/api/v1/crates/selenium-rs/0.1.1/download -> selenium-rs-0.1.1.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.103/download -> serde-1.0.103.crate https://crates.io/api/v1/crates/serde_derive/1.0.103/download -> serde_derive-1.0.103.crate https://crates.io/api/v1/crates/serde_json/1.0.44/download -> serde_json-1.0.44.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.5/download -> serde_urlencoded-0.5.5.crate https://crates.io/api/v1/crates/sha-1/0.8.1/download -> sha-1-0.8.1.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha2/0.8.0/download -> sha2-0.8.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.12/download -> signal-hook-0.1.12.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/smallvec/1.0.0/download -> smallvec-1.0.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/string/0.2.1/download -> string-0.2.1.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/subtle/1.0.0/download -> subtle-1.0.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/syslog/4.0.1/download -> syslog-4.0.1.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/threadpool/1.7.1/download -> threadpool-1.7.1.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio-buf/0.1.1/download -> tokio-buf-0.1.1.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.6/download -> tokio-current-thread-0.1.6.crate https://crates.io/api/v1/crates/tokio-executor/0.1.9/download -> tokio-executor-0.1.9.crate https://crates.io/api/v1/crates/tokio-fs/0.1.6/download -> tokio-fs-0.1.6.crate https://crates.io/api/v1/crates/tokio-io/0.1.12/download -> tokio-io-0.1.12.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.4/download -> tokio-process-0.2.4.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.11/download -> tokio-reactor-0.1.11.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-signal/0.2.7/download -> tokio-signal-0.2.7.crate https://crates.io/api/v1/crates/tokio-sync/0.1.7/download -> tokio-sync-0.1.7.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.3/download -> tokio-tcp-0.1.3.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.17/download -> tokio-threadpool-0.1.17.crate https://crates.io/api/v1/crates/tokio-timer/0.2.12/download -> tokio-timer-0.2.12.crate https://crates.io/api/v1/crates/tokio-udp/0.1.5/download -> tokio-udp-0.1.5.crate https://crates.io/api/v1/crates/tokio-uds/0.2.5/download -> tokio-uds-0.2.5.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/tower/0.1.1/download -> tower-0.1.1.crate https://crates.io/api/v1/crates/tower-buffer/0.1.2/download -> tower-buffer-0.1.2.crate https://crates.io/api/v1/crates/tower-discover/0.1.0/download -> tower-discover-0.1.0.crate https://crates.io/api/v1/crates/tower-layer/0.1.0/download -> tower-layer-0.1.0.crate https://crates.io/api/v1/crates/tower-limit/0.1.1/download -> tower-limit-0.1.1.crate https://crates.io/api/v1/crates/tower-load-shed/0.1.0/download -> tower-load-shed-0.1.0.crate https://crates.io/api/v1/crates/tower-retry/0.1.0/download -> tower-retry-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.2.0/download -> tower-service-0.2.0.crate https://crates.io/api/v1/crates/tower-timeout/0.1.1/download -> tower-timeout-0.1.1.crate https://crates.io/api/v1/crates/tower-util/0.1.0/download -> tower-util-0.1.0.crate https://crates.io/api/v1/crates/tracing/0.1.10/download -> tracing-0.1.10.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.5/download -> tracing-attributes-0.1.5.crate https://crates.io/api/v1/crates/tracing-core/0.1.7/download -> tracing-core-0.1.7.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.11/download -> unicode-normalization-0.1.11.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.1.0/download -> url-2.1.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.7.4/download -> uuid-0.7.4.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version-compare/0.0.10/download -> version-compare-0.0.10.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/want/0.2.0/download -> want-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/which/2.0.1/download -> which-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
-_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=376ab1c2eefe0b016899c2170dc5777e
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.15 b/metadata/md5-cache/dev-util/sccache-0.2.15
index 5dccb53cfebf..87992dbc49cb 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.15
+++ b/metadata/md5-cache/dev-util/sccache-0.2.15
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 RDEPEND=app-arch/zstd dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/v0.2.15.tar.gz -> sccache-0.2.15.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.37/download -> anyhow-1.0.37.crate https://crates.io/api/v1/crates/ar/0.8.0/download -> ar-0.8.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/assert_cmd/1.0.2/download -> assert_cmd-1.0.2.crate https://crates.io/api/v1/crates/async-channel/1.5.1/download -> async-channel-1.5.1.crate https://crates.io/api/v1/crates/async-executor/1.4.0/download -> async-executor-1.4.0.crate https://crates.io/api/v1/crates/async-global-executor/1.4.3/download -> async-global-executor-1.4.3.crate https://crates.io/api/v1/crates/async-io/1.3.1/download -> async-io-1.3.1.crate https://crates.io/api/v1/crates/async-mutex/1.4.0/download -> async-mutex-1.4.0.crate https://crates.io/api/v1/crates/async-std/1.8.0/download -> async-std-1.8.0.crate https://crates.io/api/v1/crates/async-task/4.0.3/download -> async-task-4.0.3.crate https://crates.io/api/v1/crates/async-trait/0.1.42/download -> async-trait-0.1.42.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/blake3/0.3.7/download -> blake3-0.3.7.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/blocking/1.0.2/download -> blocking-1.0.2.crate https://crates.io/api/v1/crates/boxfnonce/0.1.1/download -> boxfnonce-0.1.1.crate https://crates.io/api/v1/crates/buf_redux/0.8.4/download -> buf_redux-0.8.4.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/bytes/0.5.6/download -> bytes-0.5.6.crate https://crates.io/api/v1/crates/bytes/1.0.0/download -> bytes-1.0.0.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/case/0.1.0/download -> case-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/combine/4.5.2/download -> combine-4.5.2.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/cookie/0.12.0/download -> cookie-0.12.0.crate https://crates.io/api/v1/crates/cookie_store/0.7.0/download -> cookie_store-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/cpuid-bool/0.1.2/download -> cpuid-bool-0.1.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download -> crossbeam-queue-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/crypto-mac/0.10.0/download -> crypto-mac-0.10.0.crate https://crates.io/api/v1/crates/crypto-mac/0.8.0/download -> crypto-mac-0.8.0.crate https://crates.io/api/v1/crates/daemonize/0.4.1/download -> daemonize-0.4.1.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/directories/3.0.1/download -> directories-3.0.1.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.7/download -> dtoa-0.4.7.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.26/download -> encoding_rs-0.8.26.crate https://crates.io/api/v1/crates/env_logger/0.8.2/download -> env_logger-0.8.2.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fastrand/1.4.0/download -> fastrand-1.4.0.crate https://crates.io/api/v1/crates/filetime/0.2.13/download -> filetime-0.2.13.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.30/download -> futures-0.1.30.crate https://crates.io/api/v1/crates/futures/0.3.9/download -> futures-0.3.9.crate https://crates.io/api/v1/crates/futures-channel/0.3.9/download -> futures-channel-0.3.9.crate https://crates.io/api/v1/crates/futures-core/0.3.9/download -> futures-core-0.3.9.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/futures-executor/0.3.9/download -> futures-executor-0.3.9.crate https://crates.io/api/v1/crates/futures-io/0.3.9/download -> futures-io-0.3.9.crate https://crates.io/api/v1/crates/futures-lite/1.11.3/download -> futures-lite-1.11.3.crate https://crates.io/api/v1/crates/futures-macro/0.3.9/download -> futures-macro-0.3.9.crate https://crates.io/api/v1/crates/futures-sink/0.3.9/download -> futures-sink-0.3.9.crate https://crates.io/api/v1/crates/futures-task/0.3.9/download -> futures-task-0.3.9.crate https://crates.io/api/v1/crates/futures-util/0.3.9/download -> futures-util-0.3.9.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/gloo-timers/0.2.1/download -> gloo-timers-0.2.1.crate https://crates.io/api/v1/crates/h2/0.1.26/download -> h2-0.1.26.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.1.21/download -> http-0.1.21.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/http-body/0.1.0/download -> http-body-0.1.0.crate https://crates.io/api/v1/crates/humantime/2.0.1/download -> humantime-2.0.1.crate https://crates.io/api/v1/crates/hyper/0.12.35/download -> hyper-0.12.35.crate https://crates.io/api/v1/crates/hyper-tls/0.3.2/download -> hyper-tls-0.3.2.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/jsonwebtoken/7.2.0/download -> jsonwebtoken-7.2.0.crate https://crates.io/api/v1/crates/js-sys/0.3.46/download -> js-sys-0.3.46.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kv-log-macro/1.0.7/download -> kv-log-macro-1.0.7.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.82/download -> libc-0.2.82.crate https://crates.io/api/v1/crates/libmount/0.1.15/download -> libmount-0.1.15.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memcached-rs/0.4.2/download -> memcached-rs-0.4.2.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.5.6/download -> memoffset-0.5.6.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/1.8.8/download -> mime_guess-1.8.8.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/multipart/0.15.4/download -> multipart-0.15.4.crate https://crates.io/api/v1/crates/native-tls/0.2.7/download -> native-tls-0.2.7.crate https://crates.io/api/v1/crates/nb-connect/1.0.2/download -> nb-connect-1.0.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/object/0.22.0/download -> object-0.22.0.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.32/download -> openssl-0.10.32.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.60/download -> openssl-sys-0.9.60.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/pem/0.8.2/download -> pem-0.8.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.7.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.11/download -> pin-project-lite-0.1.11.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.1/download -> pin-project-lite-0.2.1.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/polling/2.0.2/download -> polling-2.0.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.6/download -> predicates-1.0.6.crate https://crates.io/api/v1/crates/predicates-core/1.0.1/download -> predicates-core-1.0.1.crate https://crates.io/api/v1/crates/predicates-tree/1.0.1/download -> predicates-tree-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.6/download -> proc-macro-nested-0.1.6.crate https://crates.io/api/v1/crates/publicsuffix/1.5.4/download -> publicsuffix-1.5.4.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redis/0.17.0/download -> redis-0.17.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.9.24/download -> reqwest-0.9.24.crate https://crates.io/api/v1/crates/retry/1.2.0/download -> retry-1.2.0.crate https://crates.io/api/v1/crates/ring/0.16.19/download -> ring-0.16.19.crate https://crates.io/api/v1/crates/rouille/3.0.0/download -> rouille-3.0.0.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/2.0.0/download -> security-framework-2.0.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.0.0/download -> security-framework-sys-2.0.0.crate https://crates.io/api/v1/crates/selenium-rs/0.1.2/download -> selenium-rs-0.1.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.5/download -> serde_urlencoded-0.5.5.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha-1/0.9.2/download -> sha-1-0.9.2.crate https://crates.io/api/v1/crates/sha2/0.9.2/download -> sha2-0.9.2.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simple_asn1/0.4.1/download -> simple_asn1-0.4.1.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/string/0.2.1/download -> string-0.2.1.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/subtle/2.4.0/download -> subtle-2.4.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.58/download -> syn-1.0.58.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/syslog/5.0.0/download -> syslog-5.0.0.crate https://crates.io/api/v1/crates/tar/0.4.30/download -> tar-0.4.30.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/thread_local/1.1.0/download -> thread_local-1.1.0.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio/0.2.24/download -> tokio-0.2.24.crate https://crates.io/api/v1/crates/tokio-buf/0.1.1/download -> tokio-buf-0.1.1.crate https://crates.io/api/v1/crates/tokio-codec/0.1.2/download -> tokio-codec-0.1.2.crate https://crates.io/api/v1/crates/tokio-compat/0.1.6/download -> tokio-compat-0.1.6.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.7/download -> tokio-current-thread-0.1.7.crate https://crates.io/api/v1/crates/tokio-executor/0.1.10/download -> tokio-executor-0.1.10.crate https://crates.io/api/v1/crates/tokio-fs/0.1.7/download -> tokio-fs-0.1.7.crate https://crates.io/api/v1/crates/tokio-io/0.1.13/download -> tokio-io-0.1.13.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.5/download -> tokio-process-0.2.5.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.12/download -> tokio-reactor-0.1.12.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-signal/0.2.9/download -> tokio-signal-0.2.9.crate https://crates.io/api/v1/crates/tokio-sync/0.1.8/download -> tokio-sync-0.1.8.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.4/download -> tokio-tcp-0.1.4.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.18/download -> tokio-threadpool-0.1.18.crate https://crates.io/api/v1/crates/tokio-timer/0.2.13/download -> tokio-timer-0.2.13.crate https://crates.io/api/v1/crates/tokio-udp/0.1.6/download -> tokio-udp-0.1.6.crate https://crates.io/api/v1/crates/tokio-uds/0.2.7/download -> tokio-uds-0.2.7.crate https://crates.io/api/v1/crates/tokio-util/0.3.1/download -> tokio-util-0.3.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower/0.1.1/download -> tower-0.1.1.crate https://crates.io/api/v1/crates/tower-buffer/0.1.2/download -> tower-buffer-0.1.2.crate https://crates.io/api/v1/crates/tower-discover/0.1.0/download -> tower-discover-0.1.0.crate https://crates.io/api/v1/crates/tower-layer/0.1.0/download -> tower-layer-0.1.0.crate https://crates.io/api/v1/crates/tower-limit/0.1.3/download -> tower-limit-0.1.3.crate https://crates.io/api/v1/crates/tower-load-shed/0.1.0/download -> tower-load-shed-0.1.0.crate https://crates.io/api/v1/crates/tower-retry/0.1.0/download -> tower-retry-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.2.0/download -> tower-service-0.2.0.crate https://crates.io/api/v1/crates/tower-timeout/0.1.1/download -> tower-timeout-0.1.1.crate https://crates.io/api/v1/crates/tower-util/0.1.0/download -> tower-util-0.1.0.crate https://crates.io/api/v1/crates/tracing/0.1.22/download -> tracing-0.1.22.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.11/download -> tracing-attributes-0.1.11.crate https://crates.io/api/v1/crates/tracing-core/0.1.17/download -> tracing-core-0.1.17.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.7.4/download -> uuid-0.7.4.crate https://crates.io/api/v1/crates/uuid/0.8.1/download -> uuid-0.8.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec-arena/1.0.0/download -> vec-arena-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/version-compare/0.0.11/download -> version-compare-0.0.11.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/want/0.2.0/download -> want-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.69/download -> wasm-bindgen-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.69/download -> wasm-bindgen-backend-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.19/download -> wasm-bindgen-futures-0.4.19.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.69/download -> wasm-bindgen-macro-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.69/download -> wasm-bindgen-macro-support-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.69/download -> wasm-bindgen-shared-0.2.69.crate https://crates.io/api/v1/crates/web-sys/0.3.46/download -> web-sys-0.3.46.crate https://crates.io/api/v1/crates/wepoll-sys/3.0.1/download -> wepoll-sys-3.0.1.crate https://crates.io/api/v1/crates/which/4.0.2/download -> which-4.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.5.9/download -> zip-0.5.9.crate https://crates.io/api/v1/crates/zstd/0.6.0+zstd.1.4.8/download -> zstd-0.6.0+zstd.1.4.8.crate https://crates.io/api/v1/crates/zstd-safe/3.0.0+zstd.1.4.8/download -> zstd-safe-3.0.0+zstd.1.4.8.crate https://crates.io/api/v1/crates/zstd-sys/1.4.19+zstd.1.4.8/download -> zstd-sys-1.4.19+zstd.1.4.8.crate
-_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0fded5561542fd7eaf016a1e8a09f27b
diff --git a/metadata/md5-cache/dev-util/sccache-9999 b/metadata/md5-cache/dev-util/sccache-9999
index 3722082af429..157763a96d82 100644
--- a/metadata/md5-cache/dev-util/sccache-9999
+++ b/metadata/md5-cache/dev-util/sccache-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 PROPERTIES=live
 RDEPEND=app-arch/zstd dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
-_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2b86b51442f0d792367177e5e3a59315
diff --git a/metadata/md5-cache/dev-util/smem-1.5-r1 b/metadata/md5-cache/dev-util/smem-1.5-r1
index 98d7d6e14e8e..69cf16f20ec7 100644
--- a/metadata/md5-cache/dev-util/smem-1.5-r1
+++ b/metadata/md5-cache/dev-util/smem-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://selenic.com/repo/smem/archive/2ab5040d5633.tar.bz2 -> smem-1.5.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a639c25bb82f5d3ab30dcc88d0e7c0dd
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index a525aec47097..8ac71a556f2d 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/minetest-5.4.1 b/metadata/md5-cache/games-action/minetest-5.4.1
new file mode 100644
index 000000000000..2dbbef63cba0
--- /dev/null
+++ b/metadata/md5-cache/games-action/minetest-5.4.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) dev-db/sqlite:3 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib client? ( app-arch/bzip2 dev-games/irrlicht media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg media-libs/libvorbis media-libs/openal ) truetype? ( media-libs/freetype:2 ) ) curl? ( net-misc/curl ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) prometheus? ( dev-cpp/prometheus-cpp ) redis? ( dev-libs/hiredis:= ) server? ( acct-group/minetest acct-user/minetest dev-games/irrlicht-headers ) spatial? ( sci-libs/libspatialindex:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free open-source voxel game engine with easy modding and game creation
+EAPI=7
+HOMEPAGE=https://www.minetest.net
+IUSE=+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype +lua_single_target_luajit
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) dev-db/sqlite:3 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib client? ( app-arch/bzip2 dev-games/irrlicht media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg media-libs/libvorbis media-libs/openal ) truetype? ( media-libs/freetype:2 ) ) curl? ( net-misc/curl ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) prometheus? ( dev-cpp/prometheus-cpp ) redis? ( dev-libs/hiredis:= ) server? ( acct-group/minetest acct-user/minetest dev-games/irrlicht-headers ) spatial? ( sci-libs/libspatialindex:= )
+REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( client server )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/minetest/minetest/archive/5.4.1.tar.gz -> minetest-5.4.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4a6e5664d222a39dd880f3775a1865f
diff --git a/metadata/md5-cache/games-action/xpilot-4.5.5-r1 b/metadata/md5-cache/games-action/xpilot-4.5.5-r1
index 5838d2ea70e3..ecfd921d4b0b 100644
--- a/metadata/md5-cache/games-action/xpilot-4.5.5-r1
+++ b/metadata/md5-cache/games-action/xpilot-4.5.5-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=A multi-player 2D client/server space game
 EAPI=6
 HOMEPAGE=http://www.xpilot.org/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/xpilotgame/xpilot-4.5.5.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dda49348b6b8e0d66bb65a0c03884e3a
+_md5_=8f1c2be72164de53262858f456555996
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index a5d5f5597919..88a8ef9ef7e1 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/xboing-2.4-r3 b/metadata/md5-cache/games-arcade/xboing-2.4-r3
index 5b1d0cde78de..9e3c7c1a4a77 100644
--- a/metadata/md5-cache/games-arcade/xboing-2.4-r3
+++ b/metadata/md5-cache/games-arcade/xboing-2.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-group/gamestat x11-libs/libXpm app-text/rman x11-misc/gccmakedep x11-misc/imake
+DEPEND=acct-group/gamestat x11-libs/libXpm app-text/rman x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Blockout type game where you bounce a ball trying to destroy blocks
 EAPI=6
 HOMEPAGE=http://www.techrescue.org/xboing/
@@ -9,4 +9,4 @@ RDEPEND=acct-group/gamestat x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.techrescue.org/xboing/xboing2.4.tar.gz mirror://gentoo/xboing-2.4-debian.patch.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bc473f62b1da3e6b944208eef007ac67
+_md5_=ab1efd115f70a27fb5f71a9433556259
diff --git a/metadata/md5-cache/games-arcade/xscavenger-1.4.4-r2 b/metadata/md5-cache/games-arcade/xscavenger-1.4.4-r2
index da06e394ee9b..fb1a0315a4b7 100644
--- a/metadata/md5-cache/games-arcade/xscavenger-1.4.4-r2
+++ b/metadata/md5-cache/games-arcade/xscavenger-1.4.4-r2
@@ -1,4 +1,4 @@
-BDEPEND=x11-misc/imake
+BDEPEND=>=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libXext
 DESCRIPTION=Lode-Runner-like arcade game
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.xdr.com/dash/xscavenger-1.4.4.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=72e10defd2930e1814d0f54f04706d1b
+_md5_=9a1b12ddc1a698946ab2fc89f44a64ce
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 57695973899d..ca2d45c885fa 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/xgammon-0.98-r2 b/metadata/md5-cache/games-board/xgammon-0.98-r2
index fbda4f9f28aa..b0d2f59ed062 100644
--- a/metadata/md5-cache/games-board/xgammon-0.98-r2
+++ b/metadata/md5-cache/games-board/xgammon-0.98-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/imake
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure postinst
 DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
 DESCRIPTION=very nice backgammon game for X
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/xgammon-0.98a.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=304ef905e0284cb98bf5111cae79f41a
+_md5_=e10950b286383489ff28c29cea30c24a
diff --git a/metadata/md5-cache/games-board/xmille-2.0-r4 b/metadata/md5-cache/games-board/xmille-2.0-r4
index 0f141396b742..ab6e4a724fbb 100644
--- a/metadata/md5-cache/games-board/xmille-2.0-r4
+++ b/metadata/md5-cache/games-board/xmille-2.0-r4
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/imake
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libXext
 DESCRIPTION=Mille Bournes card game
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xmille/xmille_2.0.orig.tar.gz mirror://debian/pool/main/x/xmille/xmille_2.0-13.diff.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8c17ff358eda5af195b27c8ab8a9c643
+_md5_=8aafe7152120bc2b48d00be90ffc1be0
diff --git a/metadata/md5-cache/games-board/xscrabble-2.10-r3 b/metadata/md5-cache/games-board/xscrabble-2.10-r3
index 2b5d888e34e8..8d006b2ed2de 100644
--- a/metadata/md5-cache/games-board/xscrabble-2.10-r3
+++ b/metadata/md5-cache/games-board/xscrabble-2.10-r3
@@ -1,4 +1,4 @@
-BDEPEND=x11-misc/gccmakedep x11-misc/imake
+BDEPEND=x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=x11-libs/libXaw
 DESCRIPTION=An X11 clone of the well-known Scrabble
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libXaw acct-group/gamestat
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble-2.10.tgz l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz ) ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b23f48a39b2460ccab6316e7fb5d84f4
+_md5_=47d60377f8c2a198c9eadc35f82a9848
diff --git a/metadata/md5-cache/games-board/xskat-4.0-r1 b/metadata/md5-cache/games-board/xskat-4.0-r1
index c0d8701cc9c7..ad1bfae3c1c2 100644
--- a/metadata/md5-cache/games-board/xskat-4.0-r1
+++ b/metadata/md5-cache/games-board/xskat-4.0-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-fonts/font-misc-misc x11-libs/libX11 x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
+DEFINED_PHASES=compile configure install
+DEPEND=media-fonts/font-misc-misc x11-libs/libX11 x11-base/xorg-proto x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Famous german card game
 EAPI=6
 HOMEPAGE=http://www.xskat.de/xskat.html
@@ -9,4 +9,4 @@ RDEPEND=media-fonts/font-misc-misc x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.xskat.de/xskat-4.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c812488ef6510e3dfca04868e5d89f30
+_md5_=10b8ca15d96f96dc4ccbc1236f5894f5
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 82c53ab2bd85..7e089ee19400 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100 b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
index 420b736ef605..53e7b121b648 100644
--- a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
+++ b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0/3
 SRC_URI=https://github.com/Wargus/stratagus/archive/v3.0.0.tar.gz -> stratagus-3.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f51ceff10498cea23fec34d717dd4aa1
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 9e046247d6ad..f9bec917d8f9 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/xcruiser-0.30-r1 b/metadata/md5-cache/games-misc/xcruiser-0.30-r1
index 211a74caa2fa..ac4269130937 100644
--- a/metadata/md5-cache/games-misc/xcruiser-0.30-r1
+++ b/metadata/md5-cache/games-misc/xcruiser-0.30-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXaw app-text/rman x11-misc/gccmakedep x11-misc/imake
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libXaw app-text/rman x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Fly about 3D-formed file system
 EAPI=5
 HOMEPAGE=http://xcruiser.sourceforge.net/
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/xcruiser/xcruiser-0.30.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95377d00eff2858a6424cb2147bd1bb0
+_md5_=2a6eb5828231da05daf1bcf19371db81
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 66bd11a8f8bc..72bffc036e18 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.16.210.06 b/metadata/md5-cache/games-server/bedrock-server-1.16.210.06
index af4a228c531c..fd171d917f5c 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.16.210.06
+++ b/metadata/md5-cache/games-server/bedrock-server-1.16.210.06
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
 EAPI=7
 HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.210.06.zip
-_md5_=171dd53b663eab1cf9ee2e5835641b15
+_md5_=54aaa7122b3e86554b7657e5b0284c6d
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.16.201.02 b/metadata/md5-cache/games-server/bedrock-server-1.16.220.02
similarity index 83%
rename from metadata/md5-cache/games-server/bedrock-server-1.16.201.02
rename to metadata/md5-cache/games-server/bedrock-server-1.16.220.02
index 5341ca3ff813..9a8c6bbd3758 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.16.201.02
+++ b/metadata/md5-cache/games-server/bedrock-server-1.16.220.02
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
 EAPI=7
 HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* amd64
+KEYWORDS=-* ~amd64
 LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.201.02.zip
-_md5_=54aaa7122b3e86554b7657e5b0284c6d
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.220.02.zip
+_md5_=171dd53b663eab1cf9ee2e5835641b15
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index bd57e5cfc2d3..7932705edb60 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.2-r1 b/metadata/md5-cache/games-simulation/openrct2-0.3.2-r1
deleted file mode 100644
index 59147f3a6194..000000000000
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
-DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
-EAPI=7
-HOMEPAGE=https://openrct2.org/
-IUSE=dedicated libressl +lightfx +opengl scripting test +truetype
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.2.tar.gz -> openrct2-0.3.2.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.18/objects.zip -> openrct2-objects-1.0.18.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.19/replays.zip -> openrct2-replays-0.0.19.zip )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d4eff8079a8840cfdbba6320ce8bb4b
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.3 b/metadata/md5-cache/games-simulation/openrct2-0.3.3
index 5840b398f594..086ce708dd71 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.3
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tyc
 EAPI=7
 HOMEPAGE=https://openrct2.org/
 IUSE=dedicated libressl +lightfx +opengl scripting test +truetype
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.3.tar.gz -> openrct2-0.3.3.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.31/replays.zip -> openrct2-replays-0.0.31.zip )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46cb1072f3edfbc3db464710af6a47b7
+_md5_=6c2f16c564413618a411d3c0d978417d
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index 4d9d7cd60e9a..50f4ccccb9d0 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -10,6 +10,6 @@ PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.31/replays.zip -> openrct2-replays-0.0.31.zip )
+SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.38/replays.zip -> openrct2-replays-0.0.38.zip )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38af123536673e869a8fe77fb55de625
+_md5_=da1a000f49251230dc6fa9f3ef02f01e
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 73108ab690df..528569f00313 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.38.5 b/metadata/md5-cache/gnome-base/gnome-control-center-3.38.5
index 025a35d313ac..2c8bfedb5773 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.38.5
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.38.5
@@ -5,7 +5,7 @@ DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
 IUSE=+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
 RDEPEND=>=gui-libs/libhandy-1:1= gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 >=gnome-base/gnome-desktop-3.27.90:3= >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-3.37.0 dev-libs/libxml2:2 >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy flickr? ( >=media-libs/grilo-0.3.0:0.3= ) >=x11-libs/gtk+-3.22.0:3[X,wayland=] cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) v4l? ( >=media-video/cheese-3.28.0 ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.0 >=net-misc/networkmanager-1.20.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.1.24 net-libs/libsoup:2.4 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret media-libs/gsound >=dev-libs/libpwquality-1.2.2 systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.38/gnome-control-center-3.38.5.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-3.38.3-patchset.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13dbc30c3ddc5530f430a24357f39f2a
+_md5_=f06492059b65c2faab1526701159d6ca
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.38.4 b/metadata/md5-cache/gnome-base/gnome-desktop-3.38.4
index 1365933edd40..aff290608fa0 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.38.4
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.38.4
@@ -5,10 +5,10 @@ DESCRIPTION=Library with common API for various GNOME modules
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 IUSE=debug gtk-doc +introspection seccomp systemd udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
 SLOT=3/19
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.38/gnome-desktop-3.38.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8057b0b8d2e546a1ea632a9d1f63bd4
+_md5_=54f271e826e0e68164c84f392be6b88b
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.38.0-r1 b/metadata/md5-cache/gnome-base/gnome-session-3.38.0-r1
index 5c04db455b91..98961004e89d 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.38.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.38.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Gnome session manager
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
 IUSE=doc elogind systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.38/gnome-session-3.38.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d5ec6b21c9e855a645fe53b98f090b6
+_md5_=92273a289ea596d888886a628e378fe6
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.38.4 b/metadata/md5-cache/gnome-base/gnome-shell-3.38.4
index 0d5e448513bc..56518fff740e 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.38.4
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.38.4
@@ -5,7 +5,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.65.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.38.0:0/7[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:0/0.3 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.38/gnome-shell-3.38.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42110b1e0d3bcc7e18188ade66be82c5
+_md5_=3a69ceb9f04bdb8a2ace993497a5e68d
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index bffaf1d2a9de..deacf7c8dec2 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-40.0 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-40.0
new file mode 100644
index 000000000000..677f9cd82101
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-40.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
+EAPI=7
+HOMEPAGE=http://frippery.org/extensions/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.38 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-40.0.tgz
+_md5_=88792bb25a2f2582520cd23d14ec56cf
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.1 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.1
index ab99b80783f8..2a7de89d826c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.1
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.34.1
@@ -5,11 +5,11 @@ DESCRIPTION=Customize advanced GNOME 3 options
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+ CC0-1.0
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_9(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] gui-libs/libhandy:0.0[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/3.34/gnome-tweaks-3.34.1.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dae38ea41f029be7d39c58a264d9789d
+_md5_=32583a4fd19e3b92feec8fc7365d4cdf
diff --git a/metadata/md5-cache/gnome-extra/sushi-3.38.0 b/metadata/md5-cache/gnome-extra/sushi-3.38.0
index c494e2554d51..226e1c480d2b 100644
--- a/metadata/md5-cache/gnome-extra/sushi-3.38.0
+++ b/metadata/md5-cache/gnome-extra/sushi-3.38.0
@@ -5,11 +5,11 @@ DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/sushi
 IUSE=office wayland +X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] >=dev-libs/gjs-1.40 >=gnome-base/nautilus-3.1.90 office? ( app-office/libreoffice )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/3.38/sushi-3.38.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f206110c8edfb9ebab1500fcf327214c
+_md5_=47ffd030076133bc8998d29a4b9ff77d
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.38.3 b/metadata/md5-cache/gnome-extra/yelp-3.38.3
index dadaba31d951..9fd441762a23 100644
--- a/metadata/md5-cache/gnome-extra/yelp-3.38.3
+++ b/metadata/md5-cache/gnome-extra/yelp-3.38.3
@@ -4,10 +4,10 @@ DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/gl
 DESCRIPTION=Help browser for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.27.1 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/3.38/yelp-3.38.3.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4decb93817b0beae5df0fdb62ba2dd1f
+_md5_=ce895f69ed49b6a613eab026b814c289
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.38.3 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.38.3
index ccc5a14d1d04..a874971a188f 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.38.3
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.38.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/itstool
 DESCRIPTION=XSL stylesheets for yelp
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/3.38/yelp-xsl-3.38.3.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0638266ebb248b83ff9d17fc8536d26
+_md5_=c3cd69a508f3157f283a717c4a7783fa
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index e51ce1301715..bb7fec9705b1 100644
Binary files a/metadata/md5-cache/gui-apps/Manifest.gz and b/metadata/md5-cache/gui-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-apps/swappy-1.3.1 b/metadata/md5-cache/gui-apps/swappy-1.3.1
index d0fc852d5cdc..52f411de2750 100644
--- a/metadata/md5-cache/gui-apps/swappy-1.3.1
+++ b/metadata/md5-cache/gui-apps/swappy-1.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango media-fonts/fontawesome[otf]
 SLOT=0
 SRC_URI=https://github.com/jtheoof/swappy/archive/v1.3.1.tar.gz -> swappy-1.3.1.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd825a4fc561f64f4bfc673e6c1e7241
diff --git a/metadata/md5-cache/gui-apps/swappy-9999 b/metadata/md5-cache/gui-apps/swappy-9999
index 5709223d91e5..86957a1abefd 100644
--- a/metadata/md5-cache/gui-apps/swappy-9999
+++ b/metadata/md5-cache/gui-apps/swappy-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango media-fonts/fontawesome[otf]
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26180502f843f610f233c27a2a0265ec
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 745743dea051..9efc1ddfe947 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/greetd-0.6.1 b/metadata/md5-cache/gui-libs/greetd-0.6.1
index f32519041a10..54194fd91a21 100644
--- a/metadata/md5-cache/gui-libs/greetd-0.6.1
+++ b/metadata/md5-cache/gui-libs/greetd-0.6.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD Boost-1.0 GPL-3 MIT Unlicense
 RDEPEND=acct-user/greetd sys-auth/pambase sys-libs/pam
 SLOT=0
 SRC_URI=https://git.sr.ht/~kennylevinsen/greetd/archive/0.6.1.tar.gz -> greetd-0.6.1.tar.gz https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/async-trait/0.1.31/download -> async-trait-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.5.4/download -> bytes-0.5.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/enquote/1.0.3/download -> enquote-1.0.3.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/pam-sys/0.5.6/download -> pam-sys-0.5.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.5/download -> pin-project-lite-0.1.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/rpassword/4.0.5/download -> rpassword-4.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/syn/1.0.21/download -> syn-1.0.21.crate https://crates.io/api/v1/crates/thiserror/1.0.17/download -> thiserror-1.0.17.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.17/download -> thiserror-impl-1.0.17.crate https://crates.io/api/v1/crates/tokio/0.2.11/download -> tokio-0.2.11.crate https://crates.io/api/v1/crates/tokio-macros/0.2.4/download -> tokio-macros-0.2.4.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0a1c98f407b4716ac2f706696b49ad04
diff --git a/metadata/md5-cache/gui-libs/greetd-0.7.0 b/metadata/md5-cache/gui-libs/greetd-0.7.0
index 15424be89992..308c555f5d61 100644
--- a/metadata/md5-cache/gui-libs/greetd-0.7.0
+++ b/metadata/md5-cache/gui-libs/greetd-0.7.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD Boost-1.0 GPL-3 MIT Unlicense
 RDEPEND=acct-user/greetd sys-auth/pambase sys-libs/pam
 SLOT=0
 SRC_URI=https://git.sr.ht/~kennylevinsen/greetd/archive/0.7.0.tar.gz -> greetd-0.7.0.tar.gz https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/async-trait/0.1.31/download -> async-trait-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.5.4/download -> bytes-0.5.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/enquote/1.0.3/download -> enquote-1.0.3.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/pam-sys/0.5.6/download -> pam-sys-0.5.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.5/download -> pin-project-lite-0.1.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/rpassword/4.0.5/download -> rpassword-4.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/syn/1.0.21/download -> syn-1.0.21.crate https://crates.io/api/v1/crates/thiserror/1.0.17/download -> thiserror-1.0.17.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.17/download -> thiserror-impl-1.0.17.crate https://crates.io/api/v1/crates/tokio/0.2.11/download -> tokio-0.2.11.crate https://crates.io/api/v1/crates/tokio-macros/0.2.4/download -> tokio-macros-0.2.4.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=cargo	9addecaaccf5f5938f36c0163768a6e6	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3104f50f8854da847d675f86934d396d
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.2.1 b/metadata/md5-cache/gui-libs/libhandy-1.2.1
new file mode 100644
index 000000000000..85b4dcec7045
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libhandy-1.2.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Building blocks for modern adaptive GNOME apps
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
+IUSE=examples glade gtk-doc +introspection test +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=mirror://gnome/sources/libhandy/1.2/libhandy-1.2.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31cbe7a2d8bcd368976b2d6be5226f21
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index c12ae61309dc..69669fa47d45 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/ark-20.12.3 b/metadata/md5-cache/kde-apps/ark-20.12.3
index 6f716249ea4d..fee75b7a7306 100644
--- a/metadata/md5-cache/kde-apps/ark-20.12.3
+++ b/metadata/md5-cache/kde-apps/ark-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/ark-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=feb311fc6a93bd182cd72d3cbbd0a4db
diff --git a/metadata/md5-cache/kde-apps/cantor-20.12.3 b/metadata/md5-cache/kde-apps/cantor-20.12.3
index d1871d0a9f61..5e8444f07789 100644
--- a/metadata/md5-cache/kde-apps/cantor-20.12.3
+++ b/metadata/md5-cache/kde-apps/cantor-20.12.3
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/cantor-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ac00e97700d9b4fea533307c17eac8f
diff --git a/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1 b/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1
index f013693f2fd0..324b8cd23823 100644
--- a/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1
+++ b/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/dolphin-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5899eeb02ee424a8ad02a0097cb8381b
diff --git a/metadata/md5-cache/kde-apps/gwenview-20.12.3 b/metadata/md5-cache/kde-apps/gwenview-20.12.3
index d405fe13fcdf..539d5a620d44 100644
--- a/metadata/md5-cache/kde-apps/gwenview-20.12.3
+++ b/metadata/md5-cache/kde-apps/gwenview-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtprintsuppo
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/gwenview-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1383492dc59e008e6bf0b40d2db36d61
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-20.12.3 b/metadata/md5-cache/kde-apps/kaddressbook-20.12.3
index 0d299a346b2c..c0de7b9a89d5 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-20.12.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=dev-qt/qtdbus-5.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kaddressbook-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d80f72117fde33a8f41cb995eb1b084
diff --git a/metadata/md5-cache/kde-apps/kate-20.12.3 b/metadata/md5-cache/kde-apps/kate-20.12.3
index 020b18438952..ad5fdc7e4101 100644
--- a/metadata/md5-cache/kde-apps/kate-20.12.3
+++ b/metadata/md5-cache/kde-apps/kate-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kate-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ce1532365d60c5715ca8d3d21940afb
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3 b/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3
index 58246d16485b..092175983d6f 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-libs/grantlee-5.2.0:5 >=dev-qt/q
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kdepim-addons-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1632707428d96fe529d9d56b8856b414
diff --git a/metadata/md5-cache/kde-apps/kmail-20.12.3 b/metadata/md5-cache/kde-apps/kmail-20.12.3
index 08423f021cf6..69f6404aad59 100644
--- a/metadata/md5-cache/kde-apps/kmail-20.12.3
+++ b/metadata/md5-cache/kde-apps/kmail-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdb
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kmail-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d46339a5170b9ff5ee78d0b702eb597
diff --git a/metadata/md5-cache/kde-apps/konqueror-20.12.3 b/metadata/md5-cache/kde-apps/konqueror-20.12.3
index a3609830547f..76b54449ec22 100644
--- a/metadata/md5-cache/kde-apps/konqueror-20.12.3
+++ b/metadata/md5-cache/kde-apps/konqueror-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/konqueror-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6bcf198b7da6273fe420b2537448f4d7
diff --git a/metadata/md5-cache/kde-apps/lokalize-20.12.3 b/metadata/md5-cache/kde-apps/lokalize-20.12.3
index 46dabbcd3621..8a751b842b3e 100644
--- a/metadata/md5-cache/kde-apps/lokalize-20.12.3
+++ b/metadata/md5-cache/kde-apps/lokalize-20.12.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/lokalize-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b1401597b270674c40b0b523f7a04d5
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 2048e68109e0..b7b7099a1e66 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0
index 59c28ae83f06..52ce58ea4bd2 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.80*:5 =kde-framewo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.80
 SRC_URI=mirror://kde/stable/frameworks/5.80/kfilemetadata-5.80.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c664206041245b5300145acd49702e8
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.81.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.81.0
index dae6107454cb..dcfb2f8e5d80 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.81.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.81.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.81*:5 =kde-framewo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.81
 SRC_URI=mirror://kde/stable/frameworks/5.81/kfilemetadata-5.81.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d025e774cbdd31860f40677cf83e591c
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.80.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.80.0
index 853658ed0528..233e4facdec1 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.80.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.80.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >
 RESTRICT=!test? ( test )
 SLOT=5/5.80
 SRC_URI=mirror://kde/stable/frameworks/5.80/kwallet-5.80.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a1c15300d719df9c003bf71512cf00b
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.81.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.81.0
index faad08c06a56..91efa897ba44 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.81.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.81.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >
 RESTRICT=!test? ( test )
 SLOT=5/5.81
 SRC_URI=mirror://kde/stable/frameworks/5.81/kwallet-5.81.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5135b9479bc90fbd0b61f9148cefd297
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.80.0 b/metadata/md5-cache/kde-frameworks/purpose-5.80.0
index 7ec2db622219..e8ef99bb7520 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.80.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.80.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.80
 SRC_URI=mirror://kde/stable/frameworks/5.80/purpose-5.80.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dcc1ff5dee300dcaf3a1f015876509c8
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.81.0 b/metadata/md5-cache/kde-frameworks/purpose-5.81.0
index 2816db70df10..73e6c7b6619c 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.81.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.81.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.81
 SRC_URI=mirror://kde/stable/frameworks/5.81/purpose-5.81.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=138d650ef6ec5bcd715041d3eb40743b
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.80.0 b/metadata/md5-cache/kde-frameworks/solid-5.80.0
index 44e2362f06fc..3616b95c6c59 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.80.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.80.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.80
 SRC_URI=mirror://kde/stable/frameworks/5.80/solid-5.80.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d8cd83c4edd81d1a59acad6b4dad351
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.81.0 b/metadata/md5-cache/kde-frameworks/solid-5.81.0
index f1a6a98ca74f..0723a75faace 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.81.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.81.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.81
 SRC_URI=mirror://kde/stable/frameworks/5.81/solid-5.81.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3b145e7fd64ccc1296b7ae075a5908a
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index a64b2f9f09d0..24c11a1d956b 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.5
index f20ee47d6b42..22aee98b8502 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0cf34917d10c8bf6dd6522c32db8194
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.4 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.4
index 43391b8b2048..4aef846680f0 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.4
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.4/kdeplasma-addons-5.21.4.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e01d13825c68c59bcf865e96c7f3e44
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.20.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.20.5
index c34b026533f2..186b11fd344d 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.20.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.20.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaa589590932815fb840813722332d69
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.4
index af36257563bd..e1d5cf5f8440 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.4
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.4/kinfocenter-5.21.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=766ef26ad52321ded11c1eab63553150
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.21.4 b/metadata/md5-cache/kde-plasma/kwin-5.21.4
index d419f071ce93..e92eea98039c 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.21.4
+++ b/metadata/md5-cache/kde-plasma/kwin-5.21.4
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.4/kwin-5.21.4.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61323bca4dc4d654c1d6738db0ffb323
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.20.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.20.5
index 70db60b09e75..50237ff5b900 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.20.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.20.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.5:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f29ff4bd35a6c8b2fcea8c12f6f1aa85
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.21.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.21.4
index 69a3df9da4f7..d16d9aa4d825 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.21.4
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.21.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.78.0:5 >=kde-frameworks/kactivities-stats-5.78.0:5 >=kde-frameworks/kauth-5.78.0:5 >=kde-frameworks/kcmutils-5.78.0:5 >=kde-frameworks/kcompletion-5.78.0:5 >=kde-frameworks/kconfig-5.78.0:5 >=kde-frameworks/kconfigwidgets-5.78.0:5 >=kde-frameworks/kcoreaddons-5.78.0:5 >=kde-frameworks/kcrash-5.78.0:5 >=kde-frameworks/kdbusaddons-5.78.0:5 >=kde-frameworks/kdeclarative-5.78.0:5 >=kde-frameworks/kguiaddons-5.78.0:5 >=kde-frameworks/ki18n-5.78.0:5 >=kde-frameworks/kiconthemes-5.78.0:5 >=kde-frameworks/kio-5.78.0:5 >=kde-frameworks/kitemmodels-5.78.0:5 >=kde-frameworks/kitemviews-5.78.0:5 >=kde-frameworks/kpackage-5.78.0:5 >=kde-frameworks/kservice-5.78.0:5 >=kde-frameworks/kwidgetsaddons-5.78.0:5 >=kde-frameworks/kwindowsystem-5.78.0:5 >=kde-frameworks/kxmlgui-5.78.0:5 >=kde-plasma/libkworkspace-5.21.4:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.78.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.4/systemsettings-5.21.4.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60c95f0f09f847e572994382badbe582
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 5650ec05ed59..6a80fa31d7b8 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/mutt-wizard-3.1.1 b/metadata/md5-cache/mail-client/mutt-wizard-3.1.1
index 975728ce206d..4acf1dae856d 100644
--- a/metadata/md5-cache/mail-client/mutt-wizard-3.1.1
+++ b/metadata/md5-cache/mail-client/mutt-wizard-3.1.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=app-admin/pass mail-client/neomutt[notmuch] mail-mta/msmtp net-mail/isync[ssl]
 SLOT=0
 SRC_URI=https://github.com/LukeSmithxyz/mutt-wizard/archive/v3.1.1.tar.gz -> mutt-wizard-3.1.1.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=c9a347f87e79f27d0b66be11cdf7cfc9
diff --git a/metadata/md5-cache/mail-client/mutt-wizard-3.2.1 b/metadata/md5-cache/mail-client/mutt-wizard-3.2.1
index b8e08e94b32b..d8bc2f8bcc3d 100644
--- a/metadata/md5-cache/mail-client/mutt-wizard-3.2.1
+++ b/metadata/md5-cache/mail-client/mutt-wizard-3.2.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=app-admin/pass mail-client/neomutt[notmuch] mail-mta/msmtp net-mail/isync[ssl]
 SLOT=0
 SRC_URI=https://github.com/LukeSmithxyz/mutt-wizard/archive/v3.2.1.tar.gz -> mutt-wizard-3.2.1.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=add36469f65713c8c32501213ce51552
diff --git a/metadata/md5-cache/mail-client/mutt-wizard-9999 b/metadata/md5-cache/mail-client/mutt-wizard-9999
index 1db3ab696ddc..1280b759c81f 100644
--- a/metadata/md5-cache/mail-client/mutt-wizard-9999
+++ b/metadata/md5-cache/mail-client/mutt-wizard-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=app-admin/pass mail-client/neomutt[notmuch] mail-mta/msmtp net-mail/isync[ssl]
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=c9a347f87e79f27d0b66be11cdf7cfc9
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c9bca5abd0f9..8c116987dd8c 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.5 b/metadata/md5-cache/mail-filter/spamassassin-3.4.5
index caaac617db12..8fd46de4bf7e 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.5
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.5
@@ -5,11 +5,11 @@ DESCRIPTION=An extensible mail filter which can identify and tag spam
 EAPI=7
 HOMEPAGE=https://spamassassin.apache.org/
 IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.5.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0dec37e49766223c04b08797ef0fdd93
+_md5_=dfb22a7c5ed831ec6372099a9492168d
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 426c1f6870f9..79a25c30e6f5 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4 b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
index df2a8a7520f1..e4d6ebd0bc00 100644
--- a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
+++ b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
@@ -1,5 +1,5 @@
-BDEPEND=x11-misc/imake >=x11-apps/mkfontscale-1.2.0 x11-apps/bdftopcf X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile install postinst postrm setup
+BDEPEND=>=x11-misc/imake-1.0.8-r1 >=x11-apps/mkfontscale-1.2.0 x11-apps/bdftopcf X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=configure install postinst postrm setup
 DESCRIPTION=This package contains character-cell fonts for use with X
 EAPI=7
 HOMEPAGE=http://www.jmknoble.net/fonts/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~ia64 ppc ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.pobox.com/~jmknoble/fonts/jmk-x11-fonts-3.0.tar.gz
-_eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=b9fd007ea3a19f919ddc1c93e9c91002
+_eclasses_=font	0667878c2b594871023dd1833d05996f	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2732f22b6853499ecf21d276da2f2f0e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index c6038b48e42c..b9327d9c414e 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/eog-3.38.2 b/metadata/md5-cache/media-gfx/eog-3.38.2
index e7e242be81a6..4fdbbc284312 100644
--- a/metadata/md5-cache/media-gfx/eog-3.38.2
+++ b/metadata/md5-cache/media-gfx/eog-3.38.2
@@ -5,11 +5,11 @@ DESCRIPTION=The Eye of GNOME image viewer
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
 IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.22.0:3[introspection,X] sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/3.38/eog-3.38.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8cbe31ffd657e5712cf95f0b500ca8f2
+_md5_=668cd9c256386d94c6af81e8a13b5650
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.40 b/metadata/md5-cache/media-gfx/fotoxx-21.40
index 705009759d97..efb672498afb 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-21.40
+++ b/metadata/md5-cache/media-gfx/fotoxx-21.40
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.40.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f56e8e8bd70d4ae5313d5c39db0f78a8
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19.1 b/metadata/md5-cache/media-gfx/freecad-0.19.1
index 08813b8e12a9..dd6b0fc2024c 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.19.1
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/0.19.1.tar.gz -> freecad-0.19.1.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3debc4a5574bdf04749629b91196d329
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index 4b3a2b43963e..02cff1473bf7 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) arch? ( mesh ) debug? ( mesh ) drawing? ( spreadsheet ) fem? ( mesh ) inspection? ( mesh points ) openscad? ( mesh ) path? ( mesh robot ) ship? ( image plot ) techdraw? ( spreadsheet drawing )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c06afad2fa067c94c6229f438d919397
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029 b/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
index dc85dcc9f374..890321fb98f9 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
+++ b/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fract4d/gnofract4d/archive/3e3893b0ee381098418d7b28997f6b861c53eff1.tar.gz -> gnofract4d-4.3_p20201029.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46cb8b11ba30ed7619219d8dc1373fc9
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1 b/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
index 919ba5b3955b..9e5d76f251c6 100644
--- a/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/F
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.11.1.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a3fd779e1dc5498835cb9f4d043d8f0
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1 b/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
index fa682a5914da..2fc2c737a83c 100644
--- a/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/F
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.9.1.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f5de6397f9343da8b894751b4beb739
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0.1-r1 b/metadata/md5-cache/media-gfx/inkscape-1.0.1-r1
deleted file mode 100644
index 8ed998925eb7..000000000000
--- a/metadata/md5-cache/media-gfx/inkscape-1.0.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.65 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=SVG based generic vector-drawing program
-EAPI=7
-HOMEPAGE=https://inkscape.org/
-IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://inkscape.org/gallery/item/21571/inkscape-1.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8a4ce770cc6e3aff662afa98f7aca30
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0.2-r1 b/metadata/md5-cache/media-gfx/inkscape-1.0.2-r1
index ca2ae7759964..f7e48d70f65e 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.0.2-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=SVG based generic vector-drawing program
 EAPI=7
 HOMEPAGE=https://inkscape.org/
 IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/media-gfx/inkscape/inkscape-1.0.2.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96e30daaf6432f622e9cfd29e3097af0
+_md5_=294b22e91a80a25aa5077171ea24be44
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.31 b/metadata/md5-cache/media-gfx/sane-backends-1.0.31
index ed81e3b9adc6..a491b9a0f0b1 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.31
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.31
@@ -11,5 +11,5 @@ RDEPEND=gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-
 REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
 SLOT=0
 SRC_URI=https://gitlab.com/sane-project/backends/-/archive/1.0.31/backends-1.0.31.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	optfeature	a3678a005063e7c50aed4e37d04197ab	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4f81224353bb52ed3f2dd8dc9ba361b
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r1
index 8a3c60766d75..f8d88e459f2f 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/scanner acct-user/saned gphoto2? ( >=media-libs/libgphoto2-2.
 REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
 SLOT=0
 SRC_URI=https://gitlab.com/sane-project/backends/-/archive/1.0.31/backends-1.0.31.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	optfeature	a3678a005063e7c50aed4e37d04197ab	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9dd338755188351e3e189c97fd0e2966
diff --git a/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1 b/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
index 7f0a5dcdb8b9..38b2e4def78e 100644
--- a/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
+++ b/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb x11-misc/imake app-text/rman
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb
 DESCRIPTION=A set of tools for creating TeX documents with graphics
 EAPI=7
 HOMEPAGE=https://www.xfig.org/
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/transfig.3.2.5e.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2 https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/transfig-3.2.5e-gentoo-patchset-r1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=601258d282b2a447c0fc6dd9affecb71
+_md5_=ff86dc52af7b39af9419f9d7dbf266ed
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.24 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.24
index 40a7dc46cbe8..3663aee3d10c 100644
--- a/metadata/md5-cache/media-gfx/tuxpaint-0.9.24
+++ b/metadata/md5-cache/media-gfx/tuxpaint-0.9.24
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
 SLOT=0
 SRC_URI=mirror://sourceforge/tuxpaint/tuxpaint-0.9.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3176e18405a5c2bb5fef17db1ce8017
diff --git a/metadata/md5-cache/media-gfx/xli-1.17.0-r5 b/metadata/md5-cache/media-gfx/xli-1.17.0-r5
index a55d0243e8c8..afd7e304c7dd 100644
--- a/metadata/md5-cache/media-gfx/xli-1.17.0-r5
+++ b/metadata/md5-cache/media-gfx/xli-1.17.0-r5
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2 >=media-libs/libpng-1.0.5 >=sys-libs/zlib-1.1.4 virtual/jpeg:0 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/imake !media-gfx/xloadimage
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-arch/bzip2 >=media-libs/libpng-1.0.5 >=sys-libs/zlib-1.1.4 virtual/jpeg:0 x11-libs/libXext app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 !media-gfx/xloadimage
 DESCRIPTION=X Load Image: view images or load them to root window
 EAPI=5
 HOMEPAGE=ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/xli-1.16.README
@@ -9,4 +9,4 @@ RDEPEND=app-arch/bzip2 >=media-libs/libpng-1.0.5 >=sys-libs/zlib-1.1.4 virtual/j
 SLOT=0
 SRC_URI=http://pantransit.reptiles.org/prog/xli/xli-2005-02-27.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fb40757ee9f1f7441020e367e62738e4
+_md5_=f22e6c80d649c943aa856eba4c7bb9fc
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7f1655d03207..7e0ddbe66efe 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.30 b/metadata/md5-cache/media-libs/gegl-0.4.30
index 521feb0fd5ce..5e2250eb9c19 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.30
+++ b/metadata/md5-cache/media-libs/gegl-0.4.30
@@ -12,5 +12,5 @@ REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.4
 SRC_URI=https://download.gimp.org/pub/gegl/0.4/gegl-0.4.30.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ed721c93c606179feef7f987517839c
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 4573fed1852b..9bfc97d30935 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.
 REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.4
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a1c3b53173f5978492f2c7238930d4f
diff --git a/metadata/md5-cache/media-libs/nas-1.9.4-r2 b/metadata/md5-cache/media-libs/nas-1.9.4-r2
index 84d90a003067..b7746c8ae96a 100644
--- a/metadata/md5-cache/media-libs/nas-1.9.4-r2
+++ b/metadata/md5-cache/media-libs/nas-1.9.4-r2
@@ -1,5 +1,6 @@
+BDEPEND=app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Network Audio System
 EAPI=7
 HOMEPAGE=https://radscan.com/nas.html
@@ -10,4 +11,4 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXau-1.0.7-r
 SLOT=0
 SRC_URI=mirror://sourceforge/nas/nas-1.9.4.src.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=51e46611123b14fa64dd6354cdeab8c8
+_md5_=e4e7a44fceabfc8ebce10f71cb0049f0
diff --git a/metadata/md5-cache/media-libs/tiff-4.2.0 b/metadata/md5-cache/media-libs/tiff-4.2.0
index bb66379707f6..3d0f1fd4548d 100644
--- a/metadata/md5-cache/media-libs/tiff-4.2.0
+++ b/metadata/md5-cache/media-libs/tiff-4.2.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=af2b5d33e8fc3bab72f69e7b3a7e756d
+_md5_=3d00a3ce5cb185aad0b3e000a31363a7
diff --git a/metadata/md5-cache/media-libs/waffle-1.7.0 b/metadata/md5-cache/media-libs/waffle-1.7.0
index 33d1b75451fe..9a9ca3e70bf9 100644
--- a/metadata/md5-cache/media-libs/waffle-1.7.0
+++ b/metadata/md5-cache/media-libs/waffle-1.7.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-libs/libxslt app-text/docbook-xml-dtd:4.2 >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-base/xcb-proto-1.8-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-base/xcb-proto-1.8-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Library that allows selection of GL API and of window system at runtime
 EAPI=7
 HOMEPAGE=http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle
 IUSE=doc +egl +gbm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD-2
-RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/mesa/waffle/-/archive/v1.7.0/waffle-v1.7.0.tar.bz2
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d97157ce7ea4c6394002cd732d76079c
+_md5_=9d592d629f5cdd6cf1e6163f7f2c1aae
diff --git a/metadata/md5-cache/media-libs/waffle-9999 b/metadata/md5-cache/media-libs/waffle-9999
index 7ee2abe6528a..7c22b5386081 100644
--- a/metadata/md5-cache/media-libs/waffle-9999
+++ b/metadata/md5-cache/media-libs/waffle-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-libs/libxslt app-text/docbook-xml-dtd:4.2 >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-base/xcb-proto-1.8-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-base/xcb-proto-1.8-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Library that allows selection of GL API and of window system at runtime
 EAPI=7
 HOMEPAGE=http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle
 IUSE=doc +egl +gbm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d97157ce7ea4c6394002cd732d76079c
+_md5_=9d592d629f5cdd6cf1e6163f7f2c1aae
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 05583805c310..23a9ae15ef1e 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/cqrlog-2.4.0 b/metadata/md5-cache/media-radio/cqrlog-2.4.0
index d166b2f9a08c..88ee1dba39ac 100644
--- a/metadata/md5-cache/media-radio/cqrlog-2.4.0
+++ b/metadata/md5-cache/media-radio/cqrlog-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 dev-libs/atk dev-libs/glib virtual/mysql[server] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.4.0.tar.gz -> cqrlog-2.4.0.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=40c1a82aeaeb987dc266112eda8dab12
diff --git a/metadata/md5-cache/media-radio/ibp-0.21-r1 b/metadata/md5-cache/media-radio/ibp-0.21-r1
index 88279579fa5d..133c75076dff 100644
--- a/metadata/md5-cache/media-radio/ibp-0.21-r1
+++ b/metadata/md5-cache/media-radio/ibp-0.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:0 X? ( x11-libs/libX11 ) X? ( x11-misc/imake )
+DEPEND=sys-libs/ncurses:0 X? ( x11-libs/libX11 ) X? ( >=x11-misc/imake-1.0.8-r1 )
 DESCRIPTION=Shows currently transmitting beacons of the International Beacon Project (IBP)
 EAPI=6
 HOMEPAGE=http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp.html
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0 X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp-0.21.tgz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c356ae1b1799afa75b7fc9d694ca9271
+_md5_=16ed4586500cbb523ac5df784c7621fb
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 1790df437a20..74eb30315a46 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/audiotag-0.19-r1 b/metadata/md5-cache/media-sound/audiotag-0.19-r1
index 2ea2f6d98480..39e51a2b3791 100644
--- a/metadata/md5-cache/media-sound/audiotag-0.19-r1
+++ b/metadata/md5-cache/media-sound/audiotag-0.19-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/downloads/Daenyth/audiotag/audiotag-0.19.tar.bz2
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=37bdd7666799fa8204761574d7191a96
diff --git a/metadata/md5-cache/media-sound/beets-1.4.9-r5 b/metadata/md5-cache/media-sound/beets-1.4.9-r5
index 0160d490ef61..909b5b439363 100644
--- a/metadata/md5-cache/media-sound/beets-1.4.9-r5
+++ b/metadata/md5-cache/media-sound/beets-1.4.9-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/beets/beets-1.4.9.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=699a2550fdb73137d7d1c40843a5dd9d
diff --git a/metadata/md5-cache/media-sound/beets-9999 b/metadata/md5-cache/media-sound/beets-9999
index b0e6b90829ad..34d74cd09bf5 100644
--- a/metadata/md5-cache/media-sound/beets-9999
+++ b/metadata/md5-cache/media-sound/beets-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( >=dev-python/jellyfish-0.7.1[python_ta
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=699a2550fdb73137d7d1c40843a5dd9d
diff --git a/metadata/md5-cache/media-sound/csound-6.15.0-r101 b/metadata/md5-cache/media-sound/csound-6.15.0-r101
new file mode 100644
index 000000000000..c66b52305f3f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/csound-6.15.0-r101
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) lua? ( dev-lang/swig ) python? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= ) dev-libs/boost doc? ( app-arch/unzip )
+DESCRIPTION=Sound design and signal processing system for composition and performance
+EAPI=7
+HOMEPAGE=https://csound.github.io/
+IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
+RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
+REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) cxx )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.15.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_html.zip )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=77ea96785de903ba460e021875f7f4a1
diff --git a/metadata/md5-cache/media-sound/csound-9999 b/metadata/md5-cache/media-sound/csound-9999
index fb8a6deea13f..9745c6e75132 100644
--- a/metadata/md5-cache/media-sound/csound-9999
+++ b/metadata/md5-cache/media-sound/csound-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? (
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78bd0366b8340e63a51c1d11bf22b4b6
+_md5_=2469e3fcd00780c448ed172a217a7320
diff --git a/metadata/md5-cache/media-sound/flacon-5.5.1 b/metadata/md5-cache/media-sound/flacon-5.5.1
index 7a4b428c0f18..51e5f3b95bd6 100644
--- a/metadata/md5-cache/media-sound/flacon-5.5.1
+++ b/metadata/md5-cache/media-sound/flacon-5.5.1
@@ -11,5 +11,5 @@ RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v5.5.1.tar.gz -> flacon-5.5.1.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dca4e60c2837b48a79ec7ab556e70184
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.0 b/metadata/md5-cache/media-sound/fluidsynth-2.2.0-r1
similarity index 99%
rename from metadata/md5-cache/media-sound/fluidsynth-2.2.0
rename to metadata/md5-cache/media-sound/fluidsynth-2.2.0-r1
index e29a21b6b339..4895ff03f2c6 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.0
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.2.0-r1
@@ -8,7 +8,7 @@ IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulsea
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/2
+SLOT=0/3
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.0.tar.gz -> fluidsynth-2.2.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4b6225b763fcd50be220bc585c9bb6d
+_md5_=9a1aed1033652a62c697892d6c7f5982
diff --git a/metadata/md5-cache/media-sound/lmms-9999 b/metadata/md5-cache/media-sound/lmms-9999
index 10bb13d51ba5..5e80899cfa13 100644
--- a/metadata/md5-cache/media-sound/lmms-9999
+++ b/metadata/md5-cache/media-sound/lmms-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-plugins/calf media-plugins/caps-plugins media-plugins/cmt-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=860d99163f1d7b46287cdf3fd2e57fd8
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f99e86c5eae39ac6b2c825f5a5004844
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 8903df7224ef..9521a15be20b 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/cheese-3.38.0 b/metadata/md5-cache/media-video/cheese-3.38.0
index c775524c9325..d8959b343546 100644
--- a/metadata/md5-cache/media-video/cheese-3.38.0
+++ b/metadata/md5-cache/media-video/cheese-3.38.0
@@ -5,11 +5,11 @@ DESCRIPTION=A cheesy program to take pictures and videos from your webcam
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
 IUSE=gtk-doc +introspection test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=media-libs/clutter-1.13.2:1.0[introspection?] media-libs/clutter-gst:3.0 >=media-libs/clutter-gtk-0.91.8:1.0 x11-libs/gdk-pixbuf:2[jpeg,introspection?] >=dev-libs/glib-2.39.90:2 >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis] >=media-libs/gst-plugins-bad-1.4:1.0 >=x11-libs/gtk+-3.13.4:3 >=media-libs/libcanberra-0.26[gtk3] x11-libs/libX11 sys-apps/dbus media-video/gnome-video-effects introspection? ( >=dev-libs/gobject-introspection-1.56:= ) media-libs/cogl:1.0=[introspection?] >=media-libs/gst-plugins-good-1.4:1.0 >=media-plugins/gst-plugins-jpeg-1.4:1.0 >=media-plugins/gst-plugins-v4l2-1.4:1.0 >=media-plugins/gst-plugins-vpx-1.4:1.0
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/cheese/3.38/cheese-3.38.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71d2a6f8b2e0f6af8b8546658b6a08c1
+_md5_=8c35ca749c56defe8f6d76179cddaa95
diff --git a/metadata/md5-cache/media-video/gnome-video-effects-0.5.0 b/metadata/md5-cache/media-video/gnome-video-effects-0.5.0
index 06d88032aa2c..54a9c6d79826 100644
--- a/metadata/md5-cache/media-video/gnome-video-effects-0.5.0
+++ b/metadata/md5-cache/media-video/gnome-video-effects-0.5.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=Effects for Cheese, the webcam video and picture application
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeVideoEffects
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-video-effects/0.5/gnome-video-effects-0.5.0.tar.xz
 _eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f30322941481570525a3c90f9485fe4
+_md5_=4987ced67a8af93c450dcdda429ecf98
diff --git a/metadata/md5-cache/media-video/h264enc-10.4.7-r1 b/metadata/md5-cache/media-video/h264enc-10.4.7-r1
index 232601180d32..136a991176a2 100644
--- a/metadata/md5-cache/media-video/h264enc-10.4.7-r1
+++ b/metadata/md5-cache/media-video/h264enc-10.4.7-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/mplayer[encode,x264] sys-apps/coreutils sys-apps/pv sys-devel/bc sys-process/time
 SLOT=0
 SRC_URI=mirror://sourceforge/h264enc/h264enc-10.4.7.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=977c08a50388e35588a2d0cd4f71d64c
diff --git a/metadata/md5-cache/media-video/motion-4.3.1 b/metadata/md5-cache/media-video/motion-4.3.1
deleted file mode 100644
index da64502e77f7..000000000000
--- a/metadata/md5-cache/media-video/motion-4.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=acct-group/motion acct-user/motion virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) net-libs/libmicrohttpd v4l? ( media-libs/libv4l virtual/os-headers )
-DESCRIPTION=A software motion detector
-EAPI=7
-HOMEPAGE=https://motion-project.github.io
-IUSE=ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/motion acct-user/motion virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.3.1.tar.gz -> motion-release-4.3.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a48ec4631b82adb86830161ff5e2cdf2
diff --git a/metadata/md5-cache/media-video/motion-4.3.2 b/metadata/md5-cache/media-video/motion-4.3.2-r1
similarity index 54%
rename from metadata/md5-cache/media-video/motion-4.3.2
rename to metadata/md5-cache/media-video/motion-4.3.2-r1
index 7a5b377fcdae..227c9e72ba83 100644
--- a/metadata/md5-cache/media-video/motion-4.3.2
+++ b/metadata/md5-cache/media-video/motion-4.3.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=acct-group/motion acct-user/motion virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) net-libs/libmicrohttpd v4l? ( media-libs/libv4l virtual/os-headers )
+DEPEND=acct-group/motion acct-user/motion net-libs/libmicrohttpd:= virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) v4l? ( media-libs/libv4l virtual/os-headers )
 DESCRIPTION=A software motion detector
 EAPI=7
 HOMEPAGE=https://motion-project.github.io
 IUSE=ffmpeg mariadb mmal mysql postgres sqlite v4l webp
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=acct-group/motion acct-user/motion virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
+RDEPEND=acct-group/motion acct-user/motion net-libs/libmicrohttpd:= virtual/jpeg:= ffmpeg? ( media-video/ffmpeg:0= ) mariadb? ( dev-db/mariadb-connector-c ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.3.2.tar.gz -> motion-release-4.3.2.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b2b53a58ae324ede7e65ff79cc986794
+_md5_=8e58a5b7e9bad95a3af0c1f35ba7f425
diff --git a/metadata/md5-cache/media-video/mpv-0.33.1-r1 b/metadata/md5-cache/media-video/mpv-0.33.1-r1
index 80814a91c1da..c60b54a8df54 100644
--- a/metadata/md5-cache/media-video/mpv-0.33.1-r1
+++ b/metadata/md5-cache/media-video/mpv-0.33.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.33.1.tar.gz -> mpv-0.33.1.tar.gz https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a4f52bac9f2d68133dc26659b0b0aa1
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 3a1d7d9af3a6..c08e024f7a00 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59a31cbf9f3aa2114cb8b676bbb6a630
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.25 b/metadata/md5-cache/media-video/pipewire-0.3.25
index 11179b786555..773cf7598765 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.25
+++ b/metadata/md5-cache/media-video/pipewire-0.3.25
@@ -12,5 +12,5 @@ REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) ldac? ( bluetooth )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.25/pipewire-0.3.25.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=94489de2fbbeb7de491baf711e51a913
diff --git a/metadata/md5-cache/media-video/yle-dl-20210212 b/metadata/md5-cache/media-video/yle-dl-20210212
index 5193801e630b..c4398a53eaa7 100644
--- a/metadata/md5-cache/media-video/yle-dl-20210212
+++ b/metadata/md5-cache/media-video/yle-dl-20210212
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aajanki/yle-dl/archive/20210212.tar.gz -> yle-dl-20210212.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1f576a8f6d4f5201a14174702a6ce541
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 48cfe4db51ed..53986e0b555b 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/gvm-10.0.1 b/metadata/md5-cache/net-analyzer/gvm-10.0.1
index 60b692107555..fabadbce9b66 100644
--- a/metadata/md5-cache/net-analyzer/gvm-10.0.1
+++ b/metadata/md5-cache/net-analyzer/gvm-10.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?] >=net-analyzer/gvmd-8.0.1[extras?] >=net-analyzer/openvas-scanner-6.0.1[cron?,extras?] cli? ( >=net-analyzer/gvm-tools-2.0.0 ) gsa? ( >=net-analyzer/greenbone-security-assistant-8.0.1[extras?] ) ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )
 SLOT=0
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=ed336f73577cb802d0d06cbfbb3a0190
diff --git a/metadata/md5-cache/net-analyzer/gvm-11.0.0 b/metadata/md5-cache/net-analyzer/gvm-11.0.0
index 99ee0fc00992..a1ab73f6ed10 100644
--- a/metadata/md5-cache/net-analyzer/gvm-11.0.0
+++ b/metadata/md5-cache/net-analyzer/gvm-11.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/gvm-libs-11.0.0[extras?,ldap?,radius?] >=net-analyzer/gvmd-9.0.0[extras?] >=net-analyzer/openvas-scanner-7.0.0[cron?,extras?] cli? ( >=net-analyzer/gvm-tools-2.0.0 ) gsa? ( >=net-analyzer/greenbone-security-assistant-9.0.0[extras?] ) ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )
 SLOT=0
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=9748a9530645ef2f6f19dbee379c71ec
diff --git a/metadata/md5-cache/net-analyzer/gvm-20.8.0 b/metadata/md5-cache/net-analyzer/gvm-20.8.0
index b1ba7c31cc17..8671c5a5ab5c 100644
--- a/metadata/md5-cache/net-analyzer/gvm-20.8.0
+++ b/metadata/md5-cache/net-analyzer/gvm-20.8.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/gvm-libs-20.8.0[extras?,ldap?,radius?] >=net-analyzer/gvmd-20.8.0[extras?] >=net-analyzer/openvas-scanner-20.8.0[cron?,extras?] cli? ( >=net-analyzer/gvm-tools-20.8.0 ) gsa? ( >=net-analyzer/greenbone-security-assistant-20.8.0[extras?] ) ospd? ( >=net-analyzer/ospd-20.8.0[extras?] )
 SLOT=0
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=9b7d27a001f43e841f6dce973e9be98e
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
index 5cf430e98d36..25dedbbe5e23 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/a977e4d7129450ba9fda8389724c80c1bde66883.tar.gz -> linkchecker-10.0.0_pre20200729.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=fafc131786c70324095aa5c082bc0c7f
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
index 3c1c21c84a68..d258b8ebb0de 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/v10.0.1.tar.gz -> linkchecker-10.0.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9754e534ea8547b7c133cba4ca7cfd64
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9999 b/metadata/md5-cache/net-analyzer/linkchecker-9999
index cf58d139c255..d5e56e011cc0 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9999
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup[python_targets_python3_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2fb533cb66ea018208dff010aab40bc4
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.3 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.4
similarity index 94%
rename from metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.3
rename to metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.4
index 8a2922cf55b1..42e435ead181 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.3
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
-SRC_URI=NessusAgent-8.2.3-es8.x86_64.rpm
+SRC_URI=NessusAgent-8.2.4-es8.x86_64.rpm
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d2837735a4793f5d5ee3c108831f5ad
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-8.13.1 b/metadata/md5-cache/net-analyzer/nessus-bin-8.14.0
similarity index 94%
rename from metadata/md5-cache/net-analyzer/nessus-bin-8.13.1
rename to metadata/md5-cache/net-analyzer/nessus-bin-8.14.0
index 13583c4a3b0f..98b2310d2c0c 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-8.13.1
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-8.14.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
-SRC_URI=Nessus-8.13.1-es8.x86_64.rpm
+SRC_URI=Nessus-8.14.0-es8.x86_64.rpm
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c63bb226ee69de8bd462a4ebedbf401e
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index f94b9ead934a..0e6c5c61dd92 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1 b/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
index afd2302fdc21..9903417f08de 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
+++ b/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.8.2.tar.gz -> dnsviz-0.8.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a8f547834a29bb8a22dd8759a0453b31
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.2 b/metadata/md5-cache/net-dns/dnsviz-0.9.2
index 32e8b21fbea9..be95db7c0c97 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.9.2
+++ b/metadata/md5-cache/net-dns/dnsviz-0.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.2.tar.gz -> dnsviz-0.9.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2bd38a88ca95355e4b247e0e2bfa8e9e
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.3 b/metadata/md5-cache/net-dns/dnsviz-0.9.3
index 33bd2dcb6f4a..12c9b37e9583 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.9.3
+++ b/metadata/md5-cache/net-dns/dnsviz-0.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.3.tar.gz -> dnsviz-0.9.3.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2bd38a88ca95355e4b247e0e2bfa8e9e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b3fa72c5e180..41087c68c3b4 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/bitlbee-3.6-r1 b/metadata/md5-cache/net-im/bitlbee-3.6-r1
index 026ab83c42c3..83fb2f7fcca3 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.6-r1
+++ b/metadata/md5-cache/net-im/bitlbee-3.6-r1
@@ -8,9 +8,9 @@ IUSE=debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd m
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
+REQUIRED_USE=|| ( purple xmpp msn oscar ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.6.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=85f46e8e53f86f490a95f87097f402ff
+_md5_=d16ead254fc409e3dc2b1f229162aa12
diff --git a/metadata/md5-cache/net-im/bitlbee-9999 b/metadata/md5-cache/net-im/bitlbee-9999
index e4c8de1a58f1..458cbe953d21 100644
--- a/metadata/md5-cache/net-im/bitlbee-9999
+++ b/metadata/md5-cache/net-im/bitlbee-9999
@@ -8,8 +8,8 @@ IUSE=debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd m
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
+REQUIRED_USE=|| ( purple xmpp msn oscar ) purple? ( plugins ) test? ( plugins ) xmpp? ( !nss )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bd2b69fa0c090ef1af1a21b161b1a477
+_md5_=26d2a244913437e8badb697750bee0bb
diff --git a/metadata/md5-cache/net-im/gajim-1.3.1_p2 b/metadata/md5-cache/net-im/gajim-1.3.1_p2
new file mode 100644
index 000000000000..a2e94d6a6925
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.3.1_p2
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=7
+HOMEPAGE=https://gajim.org/
+IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_7? ( dev-python/idna[python_targets_python3_7(-)] dev-python/precis-i18n[python_targets_python3_7(-)] dev-python/pyasn1[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycurl[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_7(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_7(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_7(-)] dev-python/css-parser[python_targets_python3_7(-)] dev-python/packaging[python_targets_python3_7(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_7(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_7(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_7(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_7(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://gajim.org/downloads/1.3/gajim-1.3.1-2.tar.gz
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e92442edd1cdb866a75e0f31d93ae9e2
diff --git a/metadata/md5-cache/net-im/qtox-1.17.3 b/metadata/md5-cache/net-im/qtox-1.17.3
new file mode 100644
index 000000000000..f019572e88bd
--- /dev/null
+++ b/metadata/md5-cache/net-im/qtox-1.17.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=|| ( dev-qt/qtgui:5[gif,jpeg,png,X(-)] dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] ) dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal media-video/ffmpeg:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/snorenotify ) spellcheck? ( kde-frameworks/sonnet:5 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=qTox is an instant messaging client using the encrypted p2p Tox protocol
+EAPI=7
+HOMEPAGE=https://qtox.github.io/
+IUSE=notification spellcheck test X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=|| ( dev-qt/qtgui:5[gif,jpeg,png,X(-)] dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] ) dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal media-video/ffmpeg:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/snorenotify ) spellcheck? ( kde-frameworks/sonnet:5 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/qTox/qTox/releases/download/v1.17.3/v1.17.3.tar.gz -> qTox-1.17.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cf296450253e943dae042703683c628f
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.40.1 b/metadata/md5-cache/net-im/signal-desktop-bin-5.0.0
similarity index 94%
rename from metadata/md5-cache/net-im/signal-desktop-bin-1.40.1
rename to metadata/md5-cache/net-im/signal-desktop-bin-5.0.0
index 7a62bf9ea5bb..bdc3775d2121 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.40.1
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.0.0
@@ -9,6 +9,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.40.1_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.0.0_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53a05225f2857136b220a95439b95da3
+_md5_=f41b16555c8086d90ed929db8455e23d
diff --git a/metadata/md5-cache/net-im/slack-4.12.2 b/metadata/md5-cache/net-im/slack-4.12.2
index 956221e92985..e4852352ff22 100644
--- a/metadata/md5-cache/net-im/slack-4.12.2
+++ b/metadata/md5-cache/net-im/slack-4.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.12.2-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6d5971000938948d234e829dac103dc
diff --git a/metadata/md5-cache/net-im/slack-4.13.0 b/metadata/md5-cache/net-im/slack-4.13.0
index 7e07d046239c..d720883ce168 100644
--- a/metadata/md5-cache/net-im/slack-4.13.0
+++ b/metadata/md5-cache/net-im/slack-4.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.13.0-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e42896db4e2ce36893fcda205e510f75
diff --git a/metadata/md5-cache/net-im/slack-4.14.0 b/metadata/md5-cache/net-im/slack-4.14.0
index 0d9bd6102fd5..43815800f8d9 100644
--- a/metadata/md5-cache/net-im/slack-4.14.0
+++ b/metadata/md5-cache/net-im/slack-4.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.14.0-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5c41cf66c767326e5f36c48689dad9d
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1
index 0b8d648cc303..f3630e5739f1 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.6.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.6.1.tar.gz -> tdesktop-2.6.1.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.6.1.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	a3678a005063e7c50aed4e37d04197ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	2e90be23a14db1ea432d6b216eb2a81e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1
index 8b2e40201321..84c40c0ffda1 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.7.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.7.1.tar.gz -> tdesktop-2.7.1.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.7.1.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	a3678a005063e7c50aed4e37d04197ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	2e90be23a14db1ea432d6b216eb2a81e	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6 b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
index 7c7f105662ea..6211355cbafa 100644
--- a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
@@ -5,10 +5,10 @@ DESCRIPTION=An account manager and channel dispatcher for the Telepathy framewor
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/telepathy/telepathy-mission-control
 IUSE=debug networkmanager
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a9cca7953b215b428e541e384187916
+_md5_=f7fbf2e3f0b30f225bd7dd170450a464
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index fcdae4819643..636ce279a567 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/irker-2.19 b/metadata/md5-cache/net-irc/irker-2.19
index 6eed6d339a0b..8fcb98fd960a 100644
--- a/metadata/md5-cache/net-irc/irker-2.19
+++ b/metadata/md5-cache/net-irc/irker-2.19
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[ssl] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://www.catb.org/esr/irker/irker-2.19.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=413766e663eaff3180e5bf52821f2357
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830 b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
index 77484255ea07..7cd2d4e7d96e 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fish-face/quasselgrep/archive/9b6b0bc1252daa6e574363d87d04eebd981215a5.tar.gz -> quasselgrep-0_p20200830.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=606fcb3edd33602305c7d66d68c8c09f
diff --git a/metadata/md5-cache/net-irc/telepathy-idle-0.2.2 b/metadata/md5-cache/net-irc/telepathy-idle-0.2.2
index a46e4ca980ca..7b9e731bee80 100644
--- a/metadata/md5-cache/net-irc/telepathy-idle-0.2.2
+++ b/metadata/md5-cache/net-irc/telepathy-idle-0.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=Full-featured IRC connection manager for Telepathy
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/telepathy/telepathy-idle
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.32:2 >=net-libs/telepathy-glib-0.21 sys-apps/dbus python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.2.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e80b6d6dad986b2b4bacb3a614b0aae4
+_md5_=06a1f4a8f900fbe467423e0c87548320
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 1fc6b3c234df..2696d026585a 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.9 b/metadata/md5-cache/net-libs/farstream-0.2.9
index 1b6b5346610e..6a6c2d6a6f77 100644
--- a/metadata/md5-cache/net-libs/farstream-0.2.9
+++ b/metadata/md5-cache/net-libs/farstream-0.2.9
@@ -5,11 +5,11 @@ DESCRIPTION=Audio/video conferencing framework specifically designed for instant
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/Farstream
 IUSE=+introspection test upnp valgrind
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-srtp:1.0 media-plugins/gst-plugins-libnice:1.0
 RESTRICT=test
 SLOT=0.2/5
 SRC_URI=https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.9.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d347a72e3b9a5426fb7f9f0019616de
+_md5_=725713d4e116237bb59a234600b451ef
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.24.2 b/metadata/md5-cache/net-libs/telepathy-glib-0.24.2
index 2ae39c3d5d16..eab0524201e0 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.24.2
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.24.2
@@ -5,7 +5,7 @@ DESCRIPTION=GLib bindings for the Telepathy D-Bus protocol
 EAPI=7
 HOMEPAGE=https://telepathy.freedesktop.org/
 IUSE=debug +introspection +vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=net-im/telepathy-mission-control
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=297ee6a2068aa4f3f01f7568157ada16
+_md5_=5e73589b34d4611c9e6f91cbefa87463
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.3 b/metadata/md5-cache/net-libs/uhttpmock-0.5.3
index 818556d3e256..d1e1c268c7bb 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.5.3
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.3
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP web service mocking library
 EAPI=7
 HOMEPAGE=https://gitlab.com/uhttpmock/uhttpmock
 IUSE=debug +introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2bfa8a250e89515721843309acee3c1
+_md5_=8f948464c3839578c3d7e6830b7ad8a7
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 726d9344f76d..6ba02617fd24 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/swaks-20201014.0 b/metadata/md5-cache/net-mail/swaks-20201014.0
index 6b0d5d378d43..d90fe5a381ae 100644
--- a/metadata/md5-cache/net-mail/swaks-20201014.0
+++ b/metadata/md5-cache/net-mail/swaks-20201014.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-perl/Authen-DigestMD5 dev-perl/Authen-NTLM dev-perl/CGI dev-perl/DBI dev-perl/Email-Send dev-perl/Email-Valid dev-perl/Net-DNS dev-perl/Params-Validate dev-perl/URI virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Time-HiRes virtual/perl-Time-Local
 SLOT=0
 SRC_URI=http://www.jetmore.org/john/code/swaks/swaks-20201014.0.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
 _md5_=781da15335e526559bf796bcc9bf9f49
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 50758e91f066..31123ddc474e 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/anydesk-5.5.6-r1 b/metadata/md5-cache/net-misc/anydesk-5.5.6-r1
index 1313d1e70b3e..e02b8805753c 100644
--- a/metadata/md5-cache/net-misc/anydesk-5.5.6-r1
+++ b/metadata/md5-cache/net-misc/anydesk-5.5.6-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-5.5.6-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-5.5.6-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-5.5.6-i386.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-5.5.6-i386.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f04a803fcc3a9a22f95737440668f1b
diff --git a/metadata/md5-cache/net-misc/anydesk-6.0.0-r1 b/metadata/md5-cache/net-misc/anydesk-6.0.0-r1
index d4fa7f3dc353..880c959f5bdf 100644
--- a/metadata/md5-cache/net-misc/anydesk-6.0.0-r1
+++ b/metadata/md5-cache/net-misc/anydesk-6.0.0-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-6.0.0-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.0-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-6.0.0-i386.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.0-i386.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f04a803fcc3a9a22f95737440668f1b
diff --git a/metadata/md5-cache/net-misc/anydesk-6.0.1 b/metadata/md5-cache/net-misc/anydesk-6.0.1
index ade5c7394d00..2416acda9c78 100644
--- a/metadata/md5-cache/net-misc/anydesk-6.0.1
+++ b/metadata/md5-cache/net-misc/anydesk-6.0.1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-6.0.1-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.1-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-6.0.1-i386.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.1-i386.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2629cbefe20e3e297d224401b26ac52a
diff --git a/metadata/md5-cache/net-misc/anydesk-6.1.0 b/metadata/md5-cache/net-misc/anydesk-6.1.0
index 3292771b3ba2..5fc81cf094b8 100644
--- a/metadata/md5-cache/net-misc/anydesk-6.1.0
+++ b/metadata/md5-cache/net-misc/anydesk-6.1.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://download.anydesk.com/linux/anydesk-6.1.0-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.1.0-amd64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4206ab59d199d5dd90cbd45b6f2b52fc
diff --git a/metadata/md5-cache/net-misc/buka-3.0.1 b/metadata/md5-cache/net-misc/buka-3.0.1
index 8f08d24dd123..582f114adf8a 100644
--- a/metadata/md5-cache/net-misc/buka-3.0.1
+++ b/metadata/md5-cache/net-misc/buka-3.0.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-python/beautifulsoup dev-python/requests sys-process/parallel net-misc/curl dev-util/dialog
 SLOT=0
 SRC_URI=https://gitlab.com/drylemon/buka/repository/3.0.1/archive.tar.gz?ref=3.0.1 -> buka-3.0.1.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=dd3ae1ea629b9330fa2dae0d377dbaee
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-88.0.4324.33 b/metadata/md5-cache/net-misc/chrome-remote-desktop-88.0.4324.33
index 743760f9437a..3a5aa20a9c72 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-88.0.4324.33
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-88.0.4324.33
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_88.0.4324.33_amd64.deb )
-_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
+_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
 _md5_=906fbd66b1570383e2d895447ab149b9
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.17.1 b/metadata/md5-cache/net-misc/gallery-dl-1.17.1
index 27eb25599c7f..c2053d4a437f 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.17.1
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.17.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.17.1.tar.gz -> gallery-dl-1.17.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=accfb82c945a2511ff93d33456c4cce9
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.17.2 b/metadata/md5-cache/net-misc/gallery-dl-1.17.2
index 97ebe9505d97..a8cf25330eb4 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.17.2
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.17.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.17.2.tar.gz -> gallery-dl-1.17.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=accfb82c945a2511ff93d33456c4cce9
diff --git a/metadata/md5-cache/net-misc/gallery-dl-9999 b/metadata/md5-cache/net-misc/gallery-dl-9999
index f67937fac765..92d7f77067d2 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-9999
+++ b/metadata/md5-cache/net-misc/gallery-dl-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=accfb82c945a2511ff93d33456c4cce9
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.17 b/metadata/md5-cache/net-misc/gns3-server-2.2.17
index 0caf48243a0d..7c82e317a036 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.17
+++ b/metadata/md5-cache/net-misc/gns3-server-2.2.17
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/dynamips-0.2.18 >=dev-python/aiofiles-0.5.0[python_targe
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.2.17.tar.gz -> gns3-server-2.2.17.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d9de2f4bf2a516e1ffb59a461c447267
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.19 b/metadata/md5-cache/net-misc/gns3-server-2.2.19
index f450f9570410..6861a84a6ea3 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.19
+++ b/metadata/md5-cache/net-misc/gns3-server-2.2.19
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/dynamips-0.2.18 >=dev-python/aiofiles-0.5.0[python_targe
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.2.19.tar.gz -> gns3-server-2.2.19.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=209eec3fc0b7130a3d175080cf06a5fb
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1 b/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1
index c033b4dfc9b6..ecd2dad55374 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
 IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.26.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
 REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.14.8.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a35d87a2ede6e3bfdb3bfba10bd9435
+_md5_=91b15a4bd6a34ed20f1c6319941fc19e
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.11 b/metadata/md5-cache/net-misc/remmina-1.4.11
index 91c94291a785..764f50034930 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.11
+++ b/metadata/md5-cache/net-misc/remmina-1.4.11
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=app-emulation/spice-protocol dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.11/Remmina-v1.4.11.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=940f867bf25bbbb1108b858c7b2b1458
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.12 b/metadata/md5-cache/net-misc/remmina-1.4.12
index 0b104eb98b1d..c93959336d1c 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.12
+++ b/metadata/md5-cache/net-misc/remmina-1.4.12
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=app-emulation/spice-protocol dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.12/Remmina-v1.4.12.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=940f867bf25bbbb1108b858c7b2b1458
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.13 b/metadata/md5-cache/net-misc/remmina-1.4.13
index deb3b759f1b1..f61b2ff83ba5 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.13
+++ b/metadata/md5-cache/net-misc/remmina-1.4.13
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=app-emulation/spice-protocol dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.13/Remmina-v1.4.13.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e58f9d8caa41db86a43a9012d4338e86
diff --git a/metadata/md5-cache/net-misc/vncrec-0.2-r2 b/metadata/md5-cache/net-misc/vncrec-0.2-r2
index 78c14d2e572b..a3e76ec58b90 100644
--- a/metadata/md5-cache/net-misc/vncrec-0.2-r2
+++ b/metadata/md5-cache/net-misc/vncrec-0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
+DEPEND=x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt app-text/rman x11-base/xorg-proto x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=VNC session recorder and player
 EAPI=6
 HOMEPAGE=http://www.sodan.org/~penny/vncrec/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-lib
 SLOT=0
 SRC_URI=http://www.sodan.org/~penny/vncrec/vncrec-0.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a01469312ba1f1981b21cc5b75594e0
+_md5_=ecf1708a56ebaf80fa6c58009942a32b
diff --git a/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2 b/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
index f78a788c8597..6bc5d757e8de 100644
--- a/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
+++ b/metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/imake
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
 DEPEND=virtual/ssh x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXt
 DESCRIPTION=X11-based passphrase dialog for use with OpenSSH
@@ -10,4 +10,4 @@ RDEPEND=virtual/ssh x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libX
 SLOT=0
 SRC_URI=https://github.com/sigmavirus24/x11-ssh-askpass/archive/1.2.4.1.tar.gz -> x11-ssh-askpass-1.2.4.1.gh.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=695c1fd4f0f348eeb564b80432079426
+_md5_=173428db1dc0cbc3d9210f8ea5da40ee
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2 b/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
index 2fd2b7908ebf..6f06b919adf8 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
+++ b/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/trizen/youtube-viewer/archive/3.7.4.tar.gz -> youtube-viewer-3.7.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3223c06a5cb2af9d8776d0a904152132
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-9999 b/metadata/md5-cache/net-misc/youtube-viewer-9999
index f3c1f8d2dc4e..888087c1780b 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-9999
+++ b/metadata/md5-cache/net-misc/youtube-viewer-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term-ReadLine-Gnu dev-perl/LWP-Protocol-https virtual/perl-Encode virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( gtk2? ( >=dev-perl/Gtk2-1.244.0 ) !gtk2? ( dev-perl/Gtk3 ) dev-perl/File-ShareDir virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[jpeg] ) || ( >=media-video/ffmpeg-4.1.3[openssl,-libressl] >=media-video/ffmpeg-4.1.3[-openssl,libressl] >=media-video/ffmpeg-4.1.3[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) ) dev-lang/perl:=
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c36d450f26a36d126ae5c69b520300b
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index d5e219a94059..6241d01b226f 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2 b/metadata/md5-cache/net-p2p/tremc-0.9.2
index 0b8fe60b56e7..9d4b6b8738bb 100644
--- a/metadata/md5-cache/net-p2p/tremc-0.9.2
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.2
@@ -9,5 +9,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[ncurses] >=dev-lan
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tremc/tremc/archive/0.9.2.tar.gz -> tremc-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e92df48f3ca60e7ca507812b6c04b663
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 6224f3daece0..4b2477b7c331 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.5.1 b/metadata/md5-cache/sci-astronomy/kstars-3.5.1
index cfd14ed658e9..7fb22e68daea 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.5.1
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdatavis3d-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclar
 REQUIRED_USE=indi? ( fits )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.5.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=915dee603d6cebad4e9fb858532f593d
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.5.2 b/metadata/md5-cache/sci-astronomy/kstars-3.5.2
index 1ebc1d558124..5c799e568520 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.5.2
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdatavis3d-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclar
 REQUIRED_USE=indi? ( fits )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.5.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=047b28e103f4032c78142d5359b9fbf7
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 055128a4f637..20dc2790e8a3 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/biopython-1.77 b/metadata/md5-cache/sci-biology/biopython-1.77
index f46e7268c190..3114a4276546 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.77
+++ b/metadata/md5-cache/sci-biology/biopython-1.77
@@ -11,5 +11,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/biopython/biopython-1.77.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7f5250b5ff62ae5ff155616d0b65204b
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index e32bcf80d44b..59d6a4473090 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3 b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
index c896754e4aae..69e4f8813ad2 100644
--- a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
+++ b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r3
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXaw x11-misc/imake app-text/rman
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libXaw >=x11-misc/imake-1.0.8-r1 app-text/rman
 DESCRIPTION=A simple hex calculator for X
 EAPI=6
 HOMEPAGE=ftp://ftp.x.org/R5contrib/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libXaw
 SLOT=0
 SRC_URI=mirror://gentoo/hexcalc-1.11.tar.Z
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e4e05aa54b859060d6055ea886a80791
+_md5_=1d30d01dc662bfc61b12f22f1ee3cc50
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 9b2a9398a46c..de67f74f75bd 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
index eb76f588cd3e..558b1518a618 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidget
 RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb30029ea1d45388cf4bdde7fb713e8e
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2
index e8ef1144365c..8918b5017296 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidget
 RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a992bb89238d294de9962799041a415
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1 b/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
index 5612ba57eecb..48471d538b07 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.4.0.tar.gz -> pymol-2.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0e03aa58aec32c12adfd2f131b7e3b3
diff --git a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2 b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
index 56b9cb5c3696..502103abe542 100644
--- a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
+++ b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 app-text/rman x11-base/xorg-proto x11-misc/imake virtual/fortran
+DEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 virtual/fortran
 DESCRIPTION=Molecular Graphics Visualisation Tool
 EAPI=5
 HOMEPAGE=http://www.openrasmol.org/
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=
 SLOT=0
 SRC_URI=mirror://sourceforge/openrasmol/RasMol/RasMol_2.7.5/rasmol-2.7.5.2-13May11.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=746f20fd9f79efc9018c31e7782bd989
+_md5_=22c72d4b7786416bb745fc30bfd2dff9
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 76755c1e8915..df73529ccf3a 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-5.1.9
index 28152ee5c6ad..067379f19090 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.9
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.9
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-l
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.9/kicad-5.1.9.tar.bz2
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	407be90c398e52298054aff2093912a3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8665eb29077b27c6bca87c88deed8c8
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index e0ebe3ca3304..a8c3fa822e8d 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.17.2 b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
index f8a39bf4a3f7..7996d401cbaa 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.17.2
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/imageio[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.17.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d1dd8962234086e216ab2a8c2948ff9f
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 2a07925301d7..6ec2f4cbd5f7 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.2 b/metadata/md5-cache/sci-mathematics/rkward-0.7.2
index 7464972d90ed..9f0d5a82a45d 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.2
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2
 RDEPEND=dev-lang/R dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rkward/0.7.2/src/rkward-0.7.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	8ab7639dfaec743469a517f35332a111	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2721d7155274635f05fff5ba23ae668f
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 037a65f71164..9ebf24efbb2a 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/busybox-1.32.1 b/metadata/md5-cache/sys-apps/busybox-1.32.1
index 5dcbc085c186..5a2dccda931f 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.32.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.32.1
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= virtual/pkgconfig static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=7
 HOMEPAGE=https://www.busybox.net/
@@ -12,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3281572bc04ff091a3d9f84b4c2265dc
+_md5_=41ed602fe8cec0072da310ebffa99e9a
diff --git a/metadata/md5-cache/sys-apps/busybox-1.33.0 b/metadata/md5-cache/sys-apps/busybox-1.33.0
index c1f2a3d7efb3..c941704cf543 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.33.0
+++ b/metadata/md5-cache/sys-apps/busybox-1.33.0
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= virtual/pkgconfig static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=7
 HOMEPAGE=https://www.busybox.net/
@@ -12,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.33.0.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a5d2027fe6003ae95f3d4a24485b3cac
+_md5_=beb7025ad92c734fd081f55fea4a954a
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index 74289db14a56..0d939a4ffe20 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare unpack
 DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/pkgconfig static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for rescue and embedded systems
@@ -12,4 +12,4 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c845742d366ef5485fc30198f7e4e776
+_md5_=7f72330dcd1b9f2d7cfe6f2b6f6e9665
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.38.2 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.38.2
index 35d6721d50b1..2ddd75e4d130 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.38.2
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.38.2
@@ -5,11 +5,11 @@ DESCRIPTION=Disk Utility for GNOME using udisks
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Disks
 IUSE=fat elogind gnome systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7:= >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.38/gnome-disk-utility-3.38.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ab3d31444d4d2a78cf2d1b88c7c348e
+_md5_=0572254aec0dd979a2549c496bd43abb
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1 b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
index 9b379c5e1470..e9e05a875132 100644
--- a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
 SLOT=0
 SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.6-beta.tar.gz -> hw-probe-1.6_beta2.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=4bcda92675bc8731fe2180f366e28a6f
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20210312 b/metadata/md5-cache/sys-apps/osinfo-db-20210312
index 26b5ba2fe766..6ed1617e9e08 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-20210312
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20210312
@@ -3,8 +3,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=osinfo database files
 EAPI=7
 HOMEPAGE=https://libosinfo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20210312.tar.xz
-_md5_=00d7f9104a552daefa925d15a1f2d912
+_md5_=4c88c68a44f876cd33e69e54bafc1acb
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.9.0 b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.9.0
index dfd39f028f5a..5a1aba4247eb 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.9.0
+++ b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for managing the osinfo database
 EAPI=7
 HOMEPAGE=https://libosinfo.org/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=app-arch/libarchive-3.0.0:= net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-tools-1.9.0.tar.xz
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3a2f1f3cce918f177aa91ee5015a9b8b
+_md5_=b96ea4fc06977ddd9576f8b21f3a929c
diff --git a/metadata/md5-cache/sys-apps/tas-1.6.0.200601 b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
index b5ffcf35ef7f..f6c4c22d999c 100644
--- a/metadata/md5-cache/sys-apps/tas-1.6.0.200601
+++ b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
@@ -10,5 +10,5 @@ RDEPEND=net-misc/networkmanager sys-apps/ethtool sys-apps/net-tools sys-apps/sma
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://www.supermicro.com/wftp/utility/TAS/TAS_1.6.0_build.200601.zip
-_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c7faaf4f0441cf9446aca98ee46f6a81
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 5107581c0a53..001cfa6f93cd 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/grub-2.04-r2 b/metadata/md5-cache/sys-boot/grub-2.04-r2
index a94fd13d5cef..4b85fd1218e5 100644
--- a/metadata/md5-cache/sys-boot/grub-2.04-r2
+++ b/metadata/md5-cache/sys-boot/grub-2.04-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/2.04-r2
 SRC_URI=mirror://gnu/grub/grub-2.04.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=009edd02ad70e4f2cdd94451499fa565
diff --git a/metadata/md5-cache/sys-boot/grub-2.05_alpha20200310-r1 b/metadata/md5-cache/sys-boot/grub-2.05_alpha20200310-r1
index 01da6c6130ff..55788db6f35d 100644
--- a/metadata/md5-cache/sys-boot/grub-2.05_alpha20200310-r1
+++ b/metadata/md5-cache/sys-boot/grub-2.05_alpha20200310-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/2.05_alpha20200310-r1
 SRC_URI=https://dev.gentoo.org/~floppym/dist/grub-2.05_alpha20200310.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4acff8970899dc01fde41936920ca28e
diff --git a/metadata/md5-cache/sys-boot/grub-2.06_rc1 b/metadata/md5-cache/sys-boot/grub-2.06_rc1
index b35bafec8547..f7ebf7fc54cd 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06_rc1
+++ b/metadata/md5-cache/sys-boot/grub-2.06_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/2.06_rc1
 SRC_URI=https://alpha.gnu.org/gnu/grub/grub-2.06~rc1.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e516016f005a0b2d6de81bc0d3d78b4
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index e897b803d969..a562af88cf50 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/9999
 SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39b20860729ec8c60d0ed4de6d207bb8
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 620a4b371ceb..53436c22ead3 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.21 b/metadata/md5-cache/sys-cluster/charliecloud-0.21
index fa253b7a6ba6..08cd9f2abf7f 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.21
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.21
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hpc/charliecloud/archive/v0.21.tar.gz -> charliecloud-0.21.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1494eb679a1b6c17684a5d7da3c68c30
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.22 b/metadata/md5-cache/sys-cluster/charliecloud-0.22
index 877e061d1d30..0e89ef0c8315 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.22
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.22
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hpc/charliecloud/archive/v0.22.tar.gz -> charliecloud-0.22.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1494eb679a1b6c17684a5d7da3c68c30
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
index 5eed69aed63e..c73cb7583f73 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1494eb679a1b6c17684a5d7da3c68c30
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.28 b/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
similarity index 96%
rename from metadata/md5-cache/sys-cluster/ipvsadm-1.28
rename to metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
index c9d285810640..fce61f9dc077 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.28
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.28.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=82d0b691f8ab3ab37b2275b138021509
+_md5_=5fe7992aa3008083b983345156deb04c
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index 924a588720fb..4f2a8222e089 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils virtual/awk )
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=5def098f5a98a8f244bb9e67b7c5db34
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 201aebbbcf06..c8c6840681a4 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.0_rc2 b/metadata/md5-cache/sys-fs/zfs-2.1.0_rc2
index 1b2d93124cca..2fd3b05e1cb3 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.0_rc2
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.0_rc2
@@ -1,15 +1,15 @@
 BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[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(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] )
+DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
 IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.0_rc2 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.0_rc2 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0-rc2/zfs-2.1.0-rc2.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bc6a0b1324a6a89031dd760c50391148
+_md5_=ccf35b7bc267a9bb185c6421563266dd
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 5a129a533513..6183b21f06e8 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[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(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
 IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr kernel_linux kernel_linux dist-kernel
 LICENSE=BSD-2 CDDL MIT
 PROPERTIES=live
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( 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(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[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(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e663df4310ad4b2ac6988f6e8015969
+_md5_=ccf35b7bc267a9bb185c6421563266dd
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 8ff5569f7551..73458b1f51a2 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/dracut-050-r2 b/metadata/md5-cache/sys-kernel/dracut-050-r2
index 731b26d79cba..89a30aa34014 100644
--- a/metadata/md5-cache/sys-kernel/dracut-050-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-050-r2
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-050.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f04016930c5af9a636a6ec19c6acea9f
diff --git a/metadata/md5-cache/sys-kernel/dracut-051-r1 b/metadata/md5-cache/sys-kernel/dracut-051-r1
index 09e2614b9fb8..4c30f50d0ad5 100644
--- a/metadata/md5-cache/sys-kernel/dracut-051-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-051-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-051.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=29db4c5edd9b7015eca659c8d31ce6ac
diff --git a/metadata/md5-cache/sys-kernel/dracut-053 b/metadata/md5-cache/sys-kernel/dracut-053
index 8416fc18cf87..bac615e347df 100644
--- a/metadata/md5-cache/sys-kernel/dracut-053
+++ b/metadata/md5-cache/sys-kernel/dracut-053
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-053.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e890dac6ed0136b7acede95df7db5509
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index b1629deff71d..8ca29d9b813c 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=916ad54f048b91194f756c1ebdf93b0d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24
deleted file mode 100644
index 276193502ccb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.24
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.24 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.24
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fba18d6ed88831c3bfb3be6f23df76b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.28 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.28
deleted file mode 100644
index 1665a5f5034b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.28
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.28
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.28 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.28
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-31.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-31.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fba18d6ed88831c3bfb3be6f23df76b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.26 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.30
similarity index 90%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.26
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.30
index dd7eff2f3593..55c74ff96e71 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.26
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.30
@@ -6,11 +6,11 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.26
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.26 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.10.30
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.30 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.26
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-29.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-29.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+SLOT=5.10.30
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-33.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-33.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=affbad4155b526b4d60dcc8d63c97635
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.10
deleted file mode 100644
index 51885f76c60e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.10
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-13.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=afa8d9e3d1af6084b44e3f1cc7ff727c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.12
deleted file mode 100644
index 41cecffcd53c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.12
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-15.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.11 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.11 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.11 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.11 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7c4d773e702805a75020863c35d853e6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.14
similarity index 90%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.11
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.14
index 62d7d83a4564..3bbba3143d94 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.11
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.14
@@ -6,11 +6,11 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.11
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.11.14
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-14.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.11 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.11 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.11 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.11 )
+SLOT=5.11.14
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-17.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.11 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.11 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.11 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.11 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a3cd9545dcebca698f5c872c60de9449
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.5
deleted file mode 100644
index 9e7a6307f8ee..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.5
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-6.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.1 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.1 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b11ac470bd1506917bb21cf52e5b88b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.6
deleted file mode 100644
index 0374b327a954..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.6
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-7.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.1 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.1 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b11ac470bd1506917bb21cf52e5b88b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
deleted file mode 100644
index 90b8dff87e61..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.7
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=33ea2a60c826727250887bdda6baddf9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.9
deleted file mode 100644
index 81297e0ef174..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.9
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.9
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-12.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bdf83bc7be6c6dd9e6c6594cfa171069
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.105 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.105
deleted file mode 100644
index 8f2283416f71..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.105
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.105
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.105 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.105
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-108.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-108.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a8e3570e0241357b306cb63a0522de5b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.108 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.108
deleted file mode 100644
index 482c5c282b05..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.108
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.108
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.108 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.108
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-111.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-111.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4f80f63e54afe6ee78426218f659326e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.109 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.109
index 96a0a90c12d6..4902abffc4cd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.109
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.109
@@ -4,7 +4,7 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.109
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.109 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.109
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-112.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-112.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d8590f98503809081596a678ea8333fa
+_md5_=a9bd7d586fe7605ea1caac8db6164385
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.110 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.110
deleted file mode 100644
index b1be14a69785..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.110
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.110
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.110 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.110
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-113.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-113.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4f80f63e54afe6ee78426218f659326e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.112
similarity index 58%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.112
index 9b77de0836e6..ed0d78dac0b6 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.112
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.106
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.106 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.4.112
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.112 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.106
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+SLOT=5.4.112
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-115.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-115.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4f80f63e54afe6ee78426218f659326e
+_md5_=0574808a9657c9c286e3f5ce0faf89b5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24
deleted file mode 100644
index 73ad29e7d180..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.24
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.24 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.24
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24-1.xpak -> gentoo-kernel-5.10.24-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24-1.xpak -> gentoo-kernel-5.10.24-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24-r1
deleted file mode 100644
index 5408fd609058..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.24
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.24 !sys-kernel/vanilla-kernel:5.10.24 !sys-kernel/vanilla-kernel-bin:5.10.24 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.24
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-27.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24-1.xpak -> gentoo-kernel-5.10.24-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f8f4c4b9978dfee4974e9b77837eb997
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.26 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.26
deleted file mode 100644
index 8eaaa4a2b03e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.26
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.26
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.26 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.26
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-29.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-29.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.26-1.xpak -> gentoo-kernel-5.10.26-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.26-1.xpak -> gentoo-kernel-5.10.26-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37d54d5ae89336540aa7654c6118ae77
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.26-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.26-r1
deleted file mode 100644
index d0b048108f46..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.26-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.26
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.26 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.26
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-29.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-29.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.26-1.xpak -> gentoo-kernel-5.10.26-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4480c90da5464ab0c27dd98211574dac
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.28-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.28-r1
deleted file mode 100644
index 0d3b2aa3eea5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.28-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.28
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.28 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.28
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-31.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-31.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.28-1.xpak -> gentoo-kernel-5.10.28-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4480c90da5464ab0c27dd98211574dac
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.28 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.30
similarity index 77%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.28
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.30
index d0b9387f4acf..2af17c857374 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.28
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.30
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.28
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.28 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.10.30
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.30 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.28
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-31.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-31.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.28-1.xpak -> gentoo-kernel-5.10.28-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.28-1.xpak -> gentoo-kernel-5.10.28-1.x86.xpak )
+SLOT=5.10.30
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-33.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-33.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.30-1.xpak -> gentoo-kernel-5.10.30-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.30-1.xpak -> gentoo-kernel-5.10.30-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=37d54d5ae89336540aa7654c6118ae77
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.10
deleted file mode 100644
index 031f45474884..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.10
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-13.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.10-1.xpak -> gentoo-kernel-5.11.10-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.10-1.xpak -> gentoo-kernel-5.11.10-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37d54d5ae89336540aa7654c6118ae77
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.10-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.10-r1
deleted file mode 100644
index a72d757a1405..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.10
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-13.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.10-1.xpak -> gentoo-kernel-5.11.10-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ee9cc91e6f39ccbb74c06c1795ebdffb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.11
deleted file mode 100644
index 314645cd7575..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.11
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-14.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.11-1.xpak -> gentoo-kernel-5.11.11-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.11-1.xpak -> gentoo-kernel-5.11.11-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37d54d5ae89336540aa7654c6118ae77
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.11-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.11-r1
deleted file mode 100644
index d3b5daaec8a3..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.11-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.11
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-14.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.11-1.xpak -> gentoo-kernel-5.11.11-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ee9cc91e6f39ccbb74c06c1795ebdffb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.12-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.12-r1
deleted file mode 100644
index 604d052f4acd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.12
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-15.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.12-1.xpak -> gentoo-kernel-5.11.12-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ee9cc91e6f39ccbb74c06c1795ebdffb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.14
similarity index 77%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.12
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.14
index 1170bd7af07b..2f0b2ed67670 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.14
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.12
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.11.14
+RDEPEND=!sys-kernel/gentoo-kernel:5.11.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-15.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.12-1.xpak -> gentoo-kernel-5.11.12-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.12-1.xpak -> gentoo-kernel-5.11.12-1.x86.xpak )
+SLOT=5.11.14
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-17.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.14-1.xpak -> gentoo-kernel-5.11.14-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.14-1.xpak -> gentoo-kernel-5.11.14-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=37d54d5ae89336540aa7654c6118ae77
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.5
deleted file mode 100644
index afd748c08b30..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.5
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-6.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.5-1.xpak -> gentoo-kernel-5.11.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.5-1.xpak -> gentoo-kernel-5.11.5-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.5-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.5-r1
deleted file mode 100644
index 4d134fab2a3e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.5
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.5 !sys-kernel/vanilla-kernel:5.11.5 !sys-kernel/vanilla-kernel-bin:5.11.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-6.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.5-1.xpak -> gentoo-kernel-5.11.5-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=18d9461f2af26c35945d89162d3d5f89
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6
deleted file mode 100644
index 691f70198c0f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.6
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-7.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.6-1.xpak -> gentoo-kernel-5.11.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.6-1.xpak -> gentoo-kernel-5.11.6-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6-r1
deleted file mode 100644
index 48a6b601cba2..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.6
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.6 !sys-kernel/vanilla-kernel:5.11.6 !sys-kernel/vanilla-kernel-bin:5.11.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-7.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.6-1.xpak -> gentoo-kernel-5.11.6-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=18d9461f2af26c35945d89162d3d5f89
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
deleted file mode 100644
index 7a272d8596cc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.7
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7-r1
deleted file mode 100644
index 5bdd2bc6c38a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.7
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.7 !sys-kernel/vanilla-kernel:5.11.7 !sys-kernel/vanilla-kernel-bin:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7fcb725791c45ba0244c3ecbe4d81de0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.9
deleted file mode 100644
index 9ac088e0dc33..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.9
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.9
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-11.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.9-1.xpak -> gentoo-kernel-5.11.9-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.9-1.xpak -> gentoo-kernel-5.11.9-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.9-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.9-r1
deleted file mode 100644
index bc59cf328419..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.9
-RDEPEND=!sys-kernel/gentoo-kernel:5.11.9 !sys-kernel/vanilla-kernel:5.11.9 !sys-kernel/vanilla-kernel-bin:5.11.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.9
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-10.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.9-1.xpak -> gentoo-kernel-5.11.9-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7fcb725791c45ba0244c3ecbe4d81de0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105
deleted file mode 100644
index 2e2ee92800c8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.105
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.105 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.105
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-108.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-108.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105-1.xpak -> gentoo-kernel-5.4.105-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105-1.xpak -> gentoo-kernel-5.4.105-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9939491909982f514495c2fd5fae50b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105-r2
deleted file mode 100644
index 20a9ac6d36ad..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.105-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.105
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.105 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.105
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-108.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-108.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105-2.xpak -> gentoo-kernel-5.4.105-2.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fd3d505a4e851dc3e7b77c9fee9091bd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106
deleted file mode 100644
index a3bc9abe74b0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.106
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.106 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.106
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106-1.xpak -> gentoo-kernel-5.4.106-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106-1.xpak -> gentoo-kernel-5.4.106-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106-r1
deleted file mode 100644
index 7eee325f8462..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.106
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.106 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.106
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106-2.xpak -> gentoo-kernel-5.4.106-2.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9f6ac287d10f916fb179d66d641b545d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.108-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.108-r1
deleted file mode 100644
index 45d1f1c39db3..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.108-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.108
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.108 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.108
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-111.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-111.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.108-1.xpak -> gentoo-kernel-5.4.108-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.110 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.110
deleted file mode 100644
index a8670a2ceb20..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.110
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.110
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.110 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.110
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-113.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-113.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.110-1.xpak -> gentoo-kernel-5.4.110-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.110-1.xpak -> gentoo-kernel-5.4.110-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.110-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.110-r1
deleted file mode 100644
index e67b3affec05..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.110-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.110
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.110 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.110
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-113.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-113.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.110-1.xpak -> gentoo-kernel-5.4.110-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=10f924d9e2609c47462cf6e6560aebc8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.108 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.112
similarity index 77%
rename from metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.108
rename to metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.112
index 406a6ed1bf83..bb644caacce5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.108
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.112
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.108
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.108 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.4.112
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.112 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.108
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-111.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-111.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.108-1.xpak -> gentoo-kernel-5.4.108-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.108-1.xpak -> gentoo-kernel-5.4.108-1.x86.xpak )
+SLOT=5.4.112
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-115.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-115.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112-1.xpak -> gentoo-kernel-5.4.112-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112-1.xpak -> gentoo-kernel-5.4.112-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.187 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.187
new file mode 100644
index 000000000000..2671658c6fe3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.187
@@ -0,0 +1,14 @@
+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.187
+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-186.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-186.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-186.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-186.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-186.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-186.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-186.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-186.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-186.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bb45dc5e0776d04a84cd778c8f3bb1b2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.30 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.30
new file mode 100644
index 000000000000..a68943c71fa9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.30
@@ -0,0 +1,14 @@
+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 5.10 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 ~riscv ~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=5.10.30
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-33.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-33.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-33.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-33.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-33.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-33.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-33.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-33.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-33.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=81024a28a3303a88a76cf6175747fe0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.14
new file mode 100644
index 000000000000..076b05b7c039
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.14
@@ -0,0 +1,14 @@
+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 5.11 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 ~riscv ~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=5.11.14
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-17.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-17.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-17.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-17.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-17.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-17.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-17.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=622be3075710aa0131e18f7bf460454a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.112 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.112
new file mode 100644
index 000000000000..6ba04aadbc08
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.112
@@ -0,0 +1,14 @@
+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 5.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
+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=5.4.112
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-115.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-115.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-115.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-115.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-115.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-115.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-115.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-115.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-115.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3b2878d0fac8ae9aa5dc225960113c9c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12 b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
index 894169d4cb08..52d6cb74f409 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10_p12
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf12.diff -> pf-sources-5.10_p12.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=54a58c81dcab848f18df9010256f5264
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p1
index b6edc1514517..519463b0c822 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf1.diff -> pf-sources-5.11_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=54a58c81dcab848f18df9010256f5264
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p2
index b9a4168d4085..ff781a074dbc 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf2.diff -> pf-sources-5.11_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=54a58c81dcab848f18df9010256f5264
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p3
index 48f51e55a1c5..15338a512711 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf3.diff -> pf-sources-5.11_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=54a58c81dcab848f18df9010256f5264
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
index 0d18350a62d4..c0042232aaae 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf4.diff -> pf-sources-5.11_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=54a58c81dcab848f18df9010256f5264
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p5
index af2c28ec2996..df4eb6a98e01 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf5.diff -> pf-sources-5.11_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5020_BMQ-and-PDS-io-scheduler-v5.11-r2.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4b0ab021a3784308f684f27c417054f8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p6
index cc4dd9663044..ee1c33fadcd9 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf6.diff -> pf-sources-5.11_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5020_BMQ-and-PDS-io-scheduler-v5.11-r2.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4b0ab021a3784308f684f27c417054f8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p7
new file mode 100644
index 000000000000..9cb3d93b35ec
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p7
@@ -0,0 +1,14 @@
+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=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~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=5.11_p7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf7.diff -> pf-sources-5.11_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5020_BMQ-and-PDS-io-scheduler-v5.11-r2.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4b0ab021a3784308f684f27c417054f8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
index ed8def281c6f..3328cff8b835 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.9_p7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.9...v5.9-pf7.diff -> pf-sources-5.9_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=31cdb42e03dfb5e21e7677d52e13296e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24
deleted file mode 100644
index 502eec338d5c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.24
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.24 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.24
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.24.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.24.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=55d25c768d2ca6f514b0cfddb0277c73
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.28 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.28
deleted file mode 100644
index 8432f8afdcd6..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.28
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.28
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.28 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.28
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.28.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.28.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=55d25c768d2ca6f514b0cfddb0277c73
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.26 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.30
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.26
rename to metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.30
index 0d1a50dad3c8..2a22b7486af2 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.26
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.30
@@ -6,11 +6,11 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.26
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.26 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.10.30
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.30 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.26
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.26.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.26.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+SLOT=5.10.30
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.30.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.30.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=55d25c768d2ca6f514b0cfddb0277c73
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.10 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.10
deleted file mode 100644
index bf959afe6148..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.10
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.10.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.10.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=c7e39dc11f18c90fdb560df828929d00
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.12
deleted file mode 100644
index f6348ee49ee7..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.12
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.12
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.12.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.12.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.11 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.11 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.11 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.11 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=069868fb9e2e2ed6f24989f56d7134a2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.11 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.14
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.11
rename to metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.14
index 1cd115d7bb80..dd783a030219 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.14
@@ -6,11 +6,11 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.11
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.11.14
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.11.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.11.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.11 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.11 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.11 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.11 )
+SLOT=5.11.14
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.14.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.14.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.11 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.11 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.11 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b2a0f449a2f5ccf83289b2817faba55e484a4c61/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.11 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=069868fb9e2e2ed6f24989f56d7134a2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.5
deleted file mode 100644
index 3fa7855bc18d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.5
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.5.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.5.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.1 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.1 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=b043082cb5ab2940846b51032509d207
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.6 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.6
deleted file mode 100644
index 72ef34f92220..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.6
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.6.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.6.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.1 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.1 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=b043082cb5ab2940846b51032509d207
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7
deleted file mode 100644
index 4bba2a38956a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.7
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.7.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.7.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=c7e39dc11f18c90fdb560df828929d00
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.9 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.9
deleted file mode 100644
index 87a0beacda9b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.11.9
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.11.9
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.9.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.9.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=c7e39dc11f18c90fdb560df828929d00
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.105 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.105
deleted file mode 100644
index f9be905bc4b7..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.105
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.105
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.105 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.105
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.105.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.105.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=c898d64a206cfd37cd303e3d73d72a5f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106
deleted file mode 100644
index e27a46386531..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.106
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.106 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.106
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.106.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.106.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=c898d64a206cfd37cd303e3d73d72a5f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.108 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.108
deleted file mode 100644
index d7afffab61ca..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.108
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.108
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.108 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.108
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.108.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.108.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=c898d64a206cfd37cd303e3d73d72a5f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.110 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.112
similarity index 90%
rename from metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.110
rename to metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.112
index b3907b14d492..7613b5289158 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.110
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.112
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test verify-sig
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.110
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.110 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.4.112
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.112 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.110
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.110.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.110.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+SLOT=5.4.112
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.112.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.112.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=c898d64a206cfd37cd303e3d73d72a5f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.186 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.187
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.186
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.187
index 1784adb87aaf..247d5a32da00 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.186
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.187
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 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.186
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.186.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.187
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.187.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.29 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.30
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.29
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.30
index 97008330786f..0b2320989b66 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.29
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.30
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 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=5.10.29
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.29.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.30
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.30.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.14
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.11.13
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.11.14
index 2b8f1b1d8092..47b62d422c4b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.13
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.14
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 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=5.11.13
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
+SLOT=5.11.14
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.111 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.112
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.111
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.112
index 4ae8b2d17f17..f1cbcf56bb67 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.111
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.112
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 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=5.4.111
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.111.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.112
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.112.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	198f6aa4709a3392bdc99b64f962e342	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 31f27980c6b7..5f67c3853b4f 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.9.0 b/metadata/md5-cache/sys-libs/libosinfo-1.9.0
index ac799a351489..6ffd5f1daf96 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.9.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=7
 HOMEPAGE=https://libosinfo.org/
 IUSE=gtk-doc +introspection +vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.9.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=963c01917cd4c5520943975b99ba01f4
+_md5_=3ae848533d44c6123ae5b911e9f14758
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 801b6ad9d8a7..e44afe9bc1f9 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/bashtop-0.9.25 b/metadata/md5-cache/sys-process/bashtop-0.9.25
index 8b911aee1b95..33f0ffc88b3a 100644
--- a/metadata/md5-cache/sys-process/bashtop-0.9.25
+++ b/metadata/md5-cache/sys-process/bashtop-0.9.25
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/aristocratos/bashtop/archive/v0.9.25.tar.gz -> bashtop-0.9.25.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=4d074addf71c049c7b3fca8c0a4c67bf
diff --git a/metadata/md5-cache/sys-process/glances-3.1.4.1-r1 b/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
index ce23f0d9992a..270c2669595b 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
+++ b/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.4.1.tar.gz -> glances-3.1.4.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=965371ce314719a9f3eb2e6d72e4bd86
diff --git a/metadata/md5-cache/sys-process/glances-3.1.5 b/metadata/md5-cache/sys-process/glances-3.1.5
index d0b0534d22d7..25b26b03f0df 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.5
+++ b/metadata/md5-cache/sys-process/glances-3.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.5.tar.gz -> glances-3.1.5.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3c229eaff3acec3be2a0f26ab5a59cdf
diff --git a/metadata/md5-cache/sys-process/glances-3.1.6.2 b/metadata/md5-cache/sys-process/glances-3.1.6.2
index 25ed413a0f6c..a8857f72c3c6 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.6.2
+++ b/metadata/md5-cache/sys-process/glances-3.1.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.6.2.tar.gz -> glances-3.1.6.2.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7089ea3627c334e095c18c22bc53f6c0
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 2d72cceacd32..f7fb86f9b56d 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.24 b/metadata/md5-cache/virtual/dist-kernel-5.10.24
deleted file mode 100644
index b76d38429e1f..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.24
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.24 ~sys-kernel/gentoo-kernel-bin-5.10.24 ~sys-kernel/vanilla-kernel-5.10.24 )
-SLOT=0/5.10.24
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.26 b/metadata/md5-cache/virtual/dist-kernel-5.10.30
similarity index 53%
rename from metadata/md5-cache/virtual/dist-kernel-5.10.26
rename to metadata/md5-cache/virtual/dist-kernel-5.10.30
index d99361930934..358588ba82a8 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.26
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.30
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.26 ~sys-kernel/gentoo-kernel-bin-5.10.26 ~sys-kernel/vanilla-kernel-5.10.26 )
-SLOT=0/5.10.26
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.30 ~sys-kernel/gentoo-kernel-bin-5.10.30 ~sys-kernel/vanilla-kernel-5.10.30 )
+SLOT=0/5.10.30
 _md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.10 b/metadata/md5-cache/virtual/dist-kernel-5.11.10
deleted file mode 100644
index fa2ead1638ab..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.10
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.10 ~sys-kernel/gentoo-kernel-bin-5.11.10 ~sys-kernel/vanilla-kernel-5.11.10 )
-SLOT=0/5.11.10
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.11 b/metadata/md5-cache/virtual/dist-kernel-5.11.11
deleted file mode 100644
index 832deab20843..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.11
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.11 ~sys-kernel/gentoo-kernel-bin-5.11.11 ~sys-kernel/vanilla-kernel-5.11.11 )
-SLOT=0/5.11.11
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.12 b/metadata/md5-cache/virtual/dist-kernel-5.11.12
deleted file mode 100644
index b2d29cef5d69..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.12
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.12 ~sys-kernel/gentoo-kernel-bin-5.11.12 ~sys-kernel/vanilla-kernel-5.11.12 )
-SLOT=0/5.11.12
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.28 b/metadata/md5-cache/virtual/dist-kernel-5.11.14
similarity index 53%
rename from metadata/md5-cache/virtual/dist-kernel-5.10.28
rename to metadata/md5-cache/virtual/dist-kernel-5.11.14
index ac398b1c4bd0..ae2ea447bbb9 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.28
+++ b/metadata/md5-cache/virtual/dist-kernel-5.11.14
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.28 ~sys-kernel/gentoo-kernel-bin-5.10.28 ~sys-kernel/vanilla-kernel-5.10.28 )
-SLOT=0/5.10.28
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.14 ~sys-kernel/gentoo-kernel-bin-5.11.14 ~sys-kernel/vanilla-kernel-5.11.14 )
+SLOT=0/5.11.14
 _md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.5 b/metadata/md5-cache/virtual/dist-kernel-5.11.5
deleted file mode 100644
index 1f01b86088a2..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.5
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.5 ~sys-kernel/gentoo-kernel-bin-5.11.5 ~sys-kernel/vanilla-kernel-5.11.5 )
-SLOT=0/5.11.5
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.6 b/metadata/md5-cache/virtual/dist-kernel-5.11.6
deleted file mode 100644
index e56683a36048..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.6
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.6 ~sys-kernel/gentoo-kernel-bin-5.11.6 ~sys-kernel/vanilla-kernel-5.11.6 )
-SLOT=0/5.11.6
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.7 b/metadata/md5-cache/virtual/dist-kernel-5.11.7
deleted file mode 100644
index 8d689e1aec47..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.7
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.7 ~sys-kernel/gentoo-kernel-bin-5.11.7 ~sys-kernel/vanilla-kernel-5.11.7 )
-SLOT=0/5.11.7
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.9 b/metadata/md5-cache/virtual/dist-kernel-5.11.9
deleted file mode 100644
index 74abab8c0d40..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.11.9
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.9 ~sys-kernel/gentoo-kernel-bin-5.11.9 ~sys-kernel/vanilla-kernel-5.11.9 )
-SLOT=0/5.11.9
-_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.105 b/metadata/md5-cache/virtual/dist-kernel-5.4.105
deleted file mode 100644
index b198de7178f9..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.105
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 arm64 ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.105 ~sys-kernel/gentoo-kernel-bin-5.4.105 ~sys-kernel/vanilla-kernel-5.4.105 )
-SLOT=0/5.4.105
-_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.108 b/metadata/md5-cache/virtual/dist-kernel-5.4.108
deleted file mode 100644
index 5938184dd03e..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.108
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.108 ~sys-kernel/gentoo-kernel-bin-5.4.108 ~sys-kernel/vanilla-kernel-5.4.108 )
-SLOT=0/5.4.108
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.109 b/metadata/md5-cache/virtual/dist-kernel-5.4.109
index f4f83abca05c..2c22734b48e6 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.109
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.109
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.109 ~sys-kernel/gentoo-kernel-bin-5.4.109 ~sys-kernel/vanilla-kernel-5.4.109 )
 SLOT=0/5.4.109
-_md5_=8ccedcd7db7f351825f6abe41bdfd166
+_md5_=c8c6493287598df855d40cc3fe189a3a
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.110 b/metadata/md5-cache/virtual/dist-kernel-5.4.110
deleted file mode 100644
index b3348a36262f..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.110
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.110 ~sys-kernel/gentoo-kernel-bin-5.4.110 ~sys-kernel/vanilla-kernel-5.4.110 )
-SLOT=0/5.4.110
-_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.106 b/metadata/md5-cache/virtual/dist-kernel-5.4.112
similarity index 53%
rename from metadata/md5-cache/virtual/dist-kernel-5.4.106
rename to metadata/md5-cache/virtual/dist-kernel-5.4.112
index d392d4365af7..0f1c932bdaa0 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.106
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.112
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.106 ~sys-kernel/gentoo-kernel-bin-5.4.106 ~sys-kernel/vanilla-kernel-5.4.106 )
-SLOT=0/5.4.106
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.112 ~sys-kernel/gentoo-kernel-bin-5.4.112 ~sys-kernel/vanilla-kernel-5.4.112 )
+SLOT=0/5.4.112
 _md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 79a99b1ff65c..efdcfba8e53d 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1 b/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1
index fc258ae4a348..21f722238caa 100644
--- a/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1
+++ b/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite )
 RESTRICT=!test? ( test )
 SLOT=5.0.6-r1
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-5.0.6.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	webapp	990ad6a000cf18d1ef87117e8c7b0a54
 _md5_=5a391e923a051e3b8afc08261d145495
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-89.0.4389.23 b/metadata/md5-cache/www-apps/chromedriver-bin-90.0.4430.24
similarity index 59%
rename from metadata/md5-cache/www-apps/chromedriver-bin-89.0.4389.23
rename to metadata/md5-cache/www-apps/chromedriver-bin-90.0.4430.24
index f27546f57e3b..3c1c9a0cd6f9 100644
--- a/metadata/md5-cache/www-apps/chromedriver-bin-89.0.4389.23
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-90.0.4430.24
@@ -8,5 +8,5 @@ LICENSE=google-chrome
 RDEPEND=!www-client/chromium www-client/google-chrome
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/89.0.4389.23/chromedriver_linux64.zip -> chromedriver-bin-89.0.4389.23.linux64.zip )
-_md5_=a854a51b003b667b5d0639d83e11ab7f
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/90.0.4430.24/chromedriver_linux64.zip -> chromedriver-bin-90.0.4430.24.linux64.zip )
+_md5_=36115b51621dd156a720cba289172001
diff --git a/metadata/md5-cache/www-apps/davical-1.1.9.3-r1 b/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
index 15c0d6987fd1..b5a5b6733a48 100644
--- a/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
+++ b/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+
 RDEPEND=app-admin/pwgen dev-lang/php[calendar,curl,iconv,imap,nls,pdo,postgres,xml] dev-perl/DBD-Pg dev-perl/DBI dev-perl/YAML >=dev-php/awl-0.61 virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=1.1.9.3-r1
 SRC_URI=https://www.davical.org/downloads/davical_1.1.9.3.orig.tar.xz -> davical-1.1.9.3.tar.xz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	webapp	990ad6a000cf18d1ef87117e8c7b0a54
 _md5_=a0de8ec33385ad23cb7add0e0a79db7d
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.5.4 b/metadata/md5-cache/www-apps/grafana-bin-7.5.4
new file mode 100644
index 000000000000..b1d20bd8656e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-7.5.4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/grafana acct-user/grafana
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=7
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-7.5.4.linux-amd64.tar.gz -> grafana-bin-7.5.4.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0f217df93344bb7425de43d6589f8bf3
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
index 772b4653e625..03f3898655ea 100644
--- a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=3.3.2
 SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.3.2.tar.gz -> phpsysinfo-3.3.2.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	webapp	990ad6a000cf18d1ef87117e8c7b0a54
 _md5_=d4b49d9907e83f8d052045ac8ad5a9f9
diff --git a/metadata/md5-cache/www-apps/prewikka-5.2.0 b/metadata/md5-cache/www-apps/prewikka-5.2.0
index 630a42a125cf..b886223a9424 100644
--- a/metadata/md5-cache/www-apps/prewikka-5.2.0
+++ b/metadata/md5-cache/www-apps/prewikka-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_7(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prewikka-5.2.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=339a735a0f4d126757ae42a536a7b268
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index e7217c98cf2a..5316a4fa6aad 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-89.0.4389.128 b/metadata/md5-cache/www-client/chromium-89.0.4389.128
new file mode 100644
index 000000000000..53abb3911ab7
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-89.0.4389.128
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.128.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b1d131cfadf79bf453592043203f6e0
diff --git a/metadata/md5-cache/www-client/google-chrome-89.0.4389.128 b/metadata/md5-cache/www-client/google-chrome-90.0.4430.72
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-89.0.4389.128
rename to metadata/md5-cache/www-client/google-chrome-90.0.4430.72
index 09757ff89cc3..a0f364e2fb8a 100644
--- a/metadata/md5-cache/www-client/google-chrome-89.0.4389.128
+++ b/metadata/md5-cache/www-client/google-chrome-90.0.4430.72
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_89.0.4389.128-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_90.0.4430.72-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5bdf7e7be834f1026dbc2713fb1c537
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.70 b/metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.72
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.70
rename to metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.72
index fe61c294ae21..446c650b437a 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.70
+++ b/metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.72
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_90.0.4430.70-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_90.0.4430.72-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50a5e44e3d2fe9f2854d97acbdf5d0db
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.1.1 b/metadata/md5-cache/www-client/qutebrowser-2.1.1
index c760ac0867d8..235052d4c5c7 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.1.1
+++ b/metadata/md5-cache/www-client/qutebrowser-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.1.1/qutebrowser-2.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a7918f7c9923f7bf502e9c3d1b00e9c
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index 57f386976f08..4b2e9eab605f 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1616ba22a585925b060ec33a2c6190c9
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.7.1 b/metadata/md5-cache/www-client/seamonkey-2.53.7.1
new file mode 100644
index 000000000000..5c73ea3047b4
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.7.1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip app-arch/zip dev-lang/perl sys-apps/findutils >=sys-devel/binutils-2.16.1 virtual/pkgconfig >=virtual/rust-1.34.0 amd64? ( >=dev-lang/yasm-1.1 ) lto? ( sys-devel/binutils[gold] ) x86? ( >=dev-lang/yasm-1.1 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.9[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=7
+HOMEPAGE=https://www.seamonkey-project.org/
+IUSE=+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack lto minimal pulseaudio +roaming selinux startup-notification test wifi +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-sqlite custom-cflags custom-optimization l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/libpng-1.6.31:0=[apng] >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.7.1/source/seamonkey-2.53.7.1.source.tar.xz -> seamonkey-2.53.7.1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.7.1/source/seamonkey-2.53.7.1.source-l10n.tar.xz -> seamonkey-2.53.7.1.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.6_beta1-patches-01.tar.xz system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b0b9af5d2f59ae909abfa4c889e6aa0
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index e44c6485c9c3..50c701d59db9 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/monitorix-3.13.1 b/metadata/md5-cache/www-misc/monitorix-3.13.1
index 6223ab9aca35..8d5d71179dd5 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.13.1
+++ b/metadata/md5-cache/www-misc/monitorix-3.13.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=acct-user/monitorix acct-group/monitorix dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/XML-Simple net-analyzer/rrdtool[graph,perl] dev-perl/CGI
 SLOT=0
 SRC_URI=https://www.monitorix.org/monitorix-3.13.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=aaa23850d2d828bb8f55c4b29ffa8f49
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index a056d9a5afe0..779436b7cf1c 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.114 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.72
similarity index 84%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.114
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.72
index 62e51ba0c9f2..c70eaf329253 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.114
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.72
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install nofetch unpack
 DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.google.com/chrome
 KEYWORDS=-* amd64
 LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_89.0.4389.114-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_90.0.4430.72-1_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=4b60b642450f7c5220665e9b61fe1e40
+_md5_=479a55ea044ba46c0c088e62c24c75c3
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.70_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.72_beta
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.70_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.72_beta
index 9323d9e77fcf..95a4bdd5901d 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.70_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.72_beta
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_90.0.4430.70-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_90.0.4430.72-1_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
 _md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index df6703c05fd7..4ec0ba2caa8c 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/gunicorn-20.1.0 b/metadata/md5-cache/www-servers/gunicorn-20.1.0
index fa50d28b381f..3711cf1d66ba 100644
--- a/metadata/md5-cache/www-servers/gunicorn-20.1.0
+++ b/metadata/md5-cache/www-servers/gunicorn-20.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/benoitc/gunicorn/archive/20.1.0.tar.gz -> gunicorn-20.1.0.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f5bd41ab170fa5d7a68cb3341fc1326f
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 1b38280b07c3..36b09ac12a8e 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.11 b/metadata/md5-cache/x11-base/xorg-server-1.20.11
index c51b25174143..ea5c43397f36 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.11
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.11
@@ -5,7 +5,7 @@ DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl minimal selinux suid systemd test +udev unwind xcsecurity doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
 RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.20.11
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.11.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=3746c45731d3dc01e2a7e4e626693659
+_md5_=5057fe460235e947e056e97aa9c3ce2e
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 9f40dae7deda..efd6ae4a390a 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.141-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.141-r1
index 1a178958fa8a..d88f45df9832 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.141-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.141-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run ) https://github.com/NVIDIA/nvidia-installer/archive/390.141.tar.gz -> nvidia-installer-390.141.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/390.141.tar.gz -> nvidia-modprobe-390.141.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/390.141.tar.gz -> nvidia-persistenced-390.141.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/390.141.tar.gz -> nvidia-settings-390.141.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/390.141.tar.gz -> nvidia-xconfig-390.141.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	a3678a005063e7c50aed4e37d04197ab	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	2e90be23a14db1ea432d6b216eb2a81e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c48d4ff0b6057c0c4e2fa8e9a7a6d5e6
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.102.04-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.102.04-r1
index 49acdc3683d3..b4a406f4392b 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.102.04-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.102.04-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/450
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/450.102.04/NVIDIA-Linux-x86_64-450.102.04.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/450.102.04/NVIDIA-Linux-aarch64-450.102.04.run ) https://github.com/NVIDIA/nvidia-installer/archive/450.102.04.tar.gz -> nvidia-installer-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/450.102.04.tar.gz -> nvidia-modprobe-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/450.102.04.tar.gz -> nvidia-persistenced-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/450.102.04.tar.gz -> nvidia-settings-450.102.04.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/450.102.04.tar.gz -> nvidia-xconfig-450.102.04.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	a3678a005063e7c50aed4e37d04197ab	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	2e90be23a14db1ea432d6b216eb2a81e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5040f8c26f52476e13be32f62b5ebb49
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
index 451d41686671..b96f2654ee1a 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/460
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.67/NVIDIA-Linux-aarch64-460.67.run ) https://github.com/NVIDIA/nvidia-installer/archive/460.67.tar.gz -> nvidia-installer-460.67.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/460.67.tar.gz -> nvidia-modprobe-460.67.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/460.67.tar.gz -> nvidia-persistenced-460.67.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/460.67.tar.gz -> nvidia-settings-460.67.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/460.67.tar.gz -> nvidia-xconfig-460.67.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	a3678a005063e7c50aed4e37d04197ab	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	2e90be23a14db1ea432d6b216eb2a81e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85154b6706691071e9951f745cc88a52
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-465.19.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-465.19.01
index 429f1c39b668..7a6be11c1294 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-465.19.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-465.19.01
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/465
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/465.19.01/NVIDIA-Linux-x86_64-465.19.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/465.19.01/NVIDIA-Linux-aarch64-465.19.01.run ) https://github.com/NVIDIA/nvidia-installer/archive/465.19.01.tar.gz -> nvidia-installer-465.19.01.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/465.19.01.tar.gz -> nvidia-modprobe-465.19.01.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/465.19.01.tar.gz -> nvidia-persistenced-465.19.01.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/465.19.01.tar.gz -> nvidia-settings-465.19.01.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/465.19.01.tar.gz -> nvidia-xconfig-465.19.01.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	a3678a005063e7c50aed4e37d04197ab	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	optfeature	2e90be23a14db1ea432d6b216eb2a81e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=69bcf5af56831c9423b9f1806598b0d1
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 24ebc32d3195..3f4d3aee312b 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.4 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.4
index d7563252d1b8..9daf505936ae 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.4
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.4
@@ -5,10 +5,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=gtk-doc +introspection jpeg tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2ed258ef1a09c9229fa980aaeda3c72
+_md5_=027013375e81cfa763f7049e7962177f
diff --git a/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1 b/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1
index 53ddee0571d9..f1bcb9b7aa1e 100644
--- a/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1
+++ b/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A window navigation construction kit
 EAPI=7
 HOMEPAGE=https://www.gnome.org/
 IUSE=+introspection startup-notification
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/gtk+-2.19.7:2[introspection?] >=dev-libs/glib-2.16:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libwnck/2.31/libwnck-2.31.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cadd4f775b541dd91cc46d7d7d898238
+_md5_=cd222f5dc0a6adc9c50716e65b1cdc38
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 15eda4ba8dad..2a79799f86fe 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
index 7fba0ccafa75..95c52c885ceb 100644
--- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
+++ b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/imake xft? ( virtual/pkgconfig )
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1 xft? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freetype x11-libs/libXft )
 DESCRIPTION=Digital clock for the X window system
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freety
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-12.debian.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=32faad548c8b14fe2385b097fe37d1d2
+_md5_=d0405e8469a593e51c117e863d63ba86
diff --git a/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127 b/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
index 81541316965e..98b3d0e9833d 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
+++ b/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=!<x11-misc/i3blocks-1.5 >=x11-misc/i3blocks-1.5
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks-contrib/archive/154001e5713c26c70063446022919225b6f916f0.tar.gz -> i3blocks-contrib-1.4.0_p20201127.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=67986a627edde47a0cfd059a12400de8
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.8-r1 b/metadata/md5-cache/x11-misc/imake-1.0.8-r1
new file mode 100644
index 000000000000..62d34ad4b508
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/imake-1.0.8-r1
@@ -0,0 +1,12 @@
+BDEPEND=x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DESCRIPTION=C preprocessor interface to the make utility
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-misc/xorg-cf-files
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.8.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=67c1d1804c95aac5f03735b4f51e438c
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.88 b/metadata/md5-cache/x11-misc/obmenu-generator-0.88
index 73d37826891a..3d62ad890529 100644
--- a/metadata/md5-cache/x11-misc/obmenu-generator-0.88
+++ b/metadata/md5-cache/x11-misc/obmenu-generator-0.88
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl[gdbm] dev-perl/Data-Dump >=dev-perl/Linux-DesktopFiles-0.90.0 x11-wm/openbox
 SLOT=0
 SRC_URI=https://github.com/trizen/obmenu-generator/archive/0.88.tar.gz -> obmenu-generator-0.88.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=ee1f1eed9b8879bd73e98128c71d8240
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.89 b/metadata/md5-cache/x11-misc/obmenu-generator-0.89
index c80db0bc1cc8..75aac457b801 100644
--- a/metadata/md5-cache/x11-misc/obmenu-generator-0.89
+++ b/metadata/md5-cache/x11-misc/obmenu-generator-0.89
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl[gdbm] dev-perl/Data-Dump >=dev-perl/Linux-DesktopFiles-0.90.0 x11-wm/openbox
 SLOT=0
 SRC_URI=https://github.com/trizen/obmenu-generator/archive/0.89.tar.gz -> obmenu-generator-0.89.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=ee1f1eed9b8879bd73e98128c71d8240
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0
index 8d284ef4b57f..b8ee7b75207a 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.16* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.16.0/pcmanfm-qt-0.16.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a5c463d3479d0b3f7121e20cf4971fd
diff --git a/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621 b/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621
index 5762b0c16463..734b1b366763 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621
+++ b/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/gnome2-canvas dev-perl/gnome2-wnck dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/af237e7f415a5fa20402703490c6190dc1af9b20.tar.gz -> shutter-0.94.3_p20200621.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	a3678a005063e7c50aed4e37d04197ab	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	2e90be23a14db1ea432d6b216eb2a81e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00dedbd7fad9ee5d3ca7d00c4209ce55
diff --git a/metadata/md5-cache/x11-misc/shutter-0.95 b/metadata/md5-cache/x11-misc/shutter-0.95
index a1503ac5283d..e34a0ac73243 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.95
+++ b/metadata/md5-cache/x11-misc/shutter-0.95
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/gnome2-canvas dev-perl/gnome2-wnck dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.95.tar.gz -> shutter-0.95.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	a3678a005063e7c50aed4e37d04197ab	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	2e90be23a14db1ea432d6b216eb2a81e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=840c4459a7a48a32e5ac59e4cb220980
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1 b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
index 4c81795f5c8b..ab252105e740 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
-_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=830a12f77428e19e1d145c29f55f3f9b
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index 6e3b23303d13..fb146fc901fa 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=830a12f77428e19e1d145c29f55f3f9b
diff --git a/metadata/md5-cache/x11-misc/splatmoji-1.2.0 b/metadata/md5-cache/x11-misc/splatmoji-1.2.0
index c11002a2bef1..80aacf8c4c7a 100644
--- a/metadata/md5-cache/x11-misc/splatmoji-1.2.0
+++ b/metadata/md5-cache/x11-misc/splatmoji-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=app-shells/bash x11-misc/rofi x11-misc/xdotool x11-misc/xsel
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cspeterson/splatmoji/archive/v1.2.0.tar.gz -> splatmoji-1.2.0.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=0dd4d33051ea7517e296053158658e33
diff --git a/metadata/md5-cache/x11-misc/tdrop-0.4.0 b/metadata/md5-cache/x11-misc/tdrop-0.4.0
new file mode 100644
index 000000000000..1b814ece9a7f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/tdrop-0.4.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=WM-Independent Dropdown Creator
+EAPI=7
+HOMEPAGE=https://github.com/noctuid/tdrop
+KEYWORDS=~amd64 ~ppc64
+LICENSE=BSD-2
+RDEPEND=app-shells/bash sys-process/procps x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo x11-misc/xdotool
+SLOT=0
+SRC_URI=https://github.com/noctuid/tdrop/archive/0.4.0.tar.gz -> tdrop-0.4.0.tar.gz
+_md5_=8dde4178f013a95d08b1b8a4900af816
diff --git a/metadata/md5-cache/x11-misc/tdrop-9999 b/metadata/md5-cache/x11-misc/tdrop-9999
index 91f2dd49c18d..07c1ce37c912 100644
--- a/metadata/md5-cache/x11-misc/tdrop-9999
+++ b/metadata/md5-cache/x11-misc/tdrop-9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=app-shells/bash sys-process/procps x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo x11-misc/xdotool
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=3274f5826dc18eee3d47d8bd34ea6e29
+_md5_=8dde4178f013a95d08b1b8a4900af816
diff --git a/metadata/md5-cache/x11-misc/x2x-1.27-r3 b/metadata/md5-cache/x11-misc/x2x-1.27-r3
index f0ab57795ef9..c025805489df 100644
--- a/metadata/md5-cache/x11-misc/x2x-1.27-r3
+++ b/metadata/md5-cache/x11-misc/x2x-1.27-r3
@@ -1,5 +1,6 @@
+BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/imake
+DEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
 DESCRIPTION=A utility to connect the Mouse and KeyBoard to another X
 EAPI=7
 HOMEPAGE=http://www.the-labs.com/X11/#x2x
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
 SLOT=0
 SRC_URI=http://ftp.digital.com/pub/Digital/SRC/x2x/x2x-1.27.tar.gz mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz mirror://gentoo/x2x_1.27-8-initvars.patch.gz mirror://gentoo/x2x-1.27-keymap.diff.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1f711d34590fff2f002e5941de905462
+_md5_=abd5cebce33eceef077b8e9b000c22b0
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p7 b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
index 5b79581892fd..ecc79fc1f69c 100644
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p7
+++ b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
@@ -1,5 +1,6 @@
+BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
+DEPEND=x11-libs/libXScrnSaver
 DESCRIPTION=An automatic X screen-locker/screen-saver
 EAPI=7
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-7.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=08267d5a08d5162df4d5e8723e87580b
+_md5_=94ab67536d33111cf082bae387df8b47
diff --git a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1 b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
index 57c97e2221ec..c17bdd99dda7 100644
--- a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
+++ b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm x11-base/xorg-proto x11-misc/imake
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Notebook battery indicator for X
 EAPI=6
 HOMEPAGE=http://www.clave.gr.jp/~eto/xbatt/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/
 SLOT=0
 SRC_URI=http://www.clave.gr.jp/~eto/xbatt/xbatt-1.3pr1.tar.gz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=77b7cf0838d7676382faecdd7fffd019
+_md5_=b1d5d9712f15a255baaaeddb1bfe5cc0
diff --git a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2 b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
index d8047c8722dd..8e8022c7b049 100644
--- a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
+++ b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-base/xorg-proto x11-misc/imake x11-misc/gccmakedep motif? ( >=x11-libs/motif-2.3:0 )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 x11-misc/gccmakedep motif? ( >=x11-libs/motif-2.3:0 )
 DESCRIPTION=A simple interactive calendar program with a notebook capability
 EAPI=6
 HOMEPAGE=https://www.freebsd.org/
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/
 SLOT=0
 SRC_URI=ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/xcalendar-4.0+i18n.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=934edd06f1d14d8759e28eb111a55346
+_md5_=0b973061058483fc1103c86d52b98a62
diff --git a/metadata/md5-cache/x11-misc/xearth-1.1-r1 b/metadata/md5-cache/x11-misc/xearth-1.1-r1
index 9815db669c93..a7e301e7ed5a 100644
--- a/metadata/md5-cache/x11-misc/xearth-1.1-r1
+++ b/metadata/md5-cache/x11-misc/xearth-1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto x11-misc/imake app-text/rman
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 app-text/rman
 DESCRIPTION=Xearth sets the X root window to an image of the Earth
 EAPI=5
 HOMEPAGE=https://hewgill.com/xearth/original/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=ftp://cag.lcs.mit.edu/pub/tuna/xearth-1.1.tar.gz ftp://ftp.cs.colorado.edu/users/tuna/xearth-1.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=498ac1469c2fb2b9e09c437c2d307901
+_md5_=ecaf4df1f972f7669971deda3b871b8a
diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.5 b/metadata/md5-cache/x11-misc/xfishtank-2.5
index 787d7240b8ee..6e90fb9541ca 100644
--- a/metadata/md5-cache/x11-misc/xfishtank-2.5
+++ b/metadata/md5-cache/x11-misc/xfishtank-2.5
@@ -1,6 +1,6 @@
-BDEPEND=x11-misc/imake
+BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure
-DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
+DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 DESCRIPTION=Turns your root window into an aquarium
 EAPI=7
 HOMEPAGE=https://jim.rees.org/computers/xfishtank.html
@@ -10,4 +10,4 @@ RDEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/xfishtank-2.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=98ceb0f4a4b2e65e00e9d35cf5f6993c
+_md5_=fcb5cf396ae4d2288d6f8802485c6524
diff --git a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
index cefdf89b8083..50884b3a9798 100644
--- a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
+++ b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
@@ -1,5 +1,6 @@
+BDEPEND=>=sys-apps/sed-4 x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps >=sys-apps/sed-4 x11-base/xorg-proto x11-misc/imake
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps
 DESCRIPTION=GUI frontend to xmodmap
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/x/xkeycaps.html
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47.orig.tar.gz mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47-7.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ec1a490d0cc8d3c0224d7b802f183d0d
+_md5_=a4482a70e019710d9d7bc596af333744
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r1 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r2
similarity index 93%
rename from metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r1
rename to metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r2
index eb8e07868def..6de3648dc87d 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r1
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r2
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/xorg-cf-files-1.0.6-solaris-prefix.patch.bz2
-_md5_=9aaab903619806d78f5e6e54eadf88a2
+_md5_=5860f73207c7e202be055fe07246806f
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45 b/metadata/md5-cache/x11-misc/xscreensaver-5.45
index eb2771891950..cf702ee57569 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.45
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45
@@ -11,5 +11,5 @@ RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appr
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e274315b6ccc15918e82cf2790b217c5
diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
index 6bffff7fcb98..c2cbb66d6bb6 100644
--- a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
+++ b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm app-text/rman dev-lang/perl x11-base/xorg-proto x11-misc/imake
+BDEPEND=app-text/rman dev-lang/perl x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm
 DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen
 EAPI=7
 HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/
@@ -9,4 +10,4 @@ RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-l
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ebd680a652358a3f5fba5821ae300004
+_md5_=1eb1f7160cbf9243c4f81e31c56c5350
diff --git a/metadata/md5-cache/x11-misc/xtitle-1.0.4 b/metadata/md5-cache/x11-misc/xtitle-1.0.4
index 0b7031f4ec58..f81c3c5eb10d 100644
--- a/metadata/md5-cache/x11-misc/xtitle-1.0.4
+++ b/metadata/md5-cache/x11-misc/xtitle-1.0.4
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-misc/imake
+DEFINED_PHASES=configure install
+DEPEND=>=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Set window title and icon name for an X11 terminal window
 EAPI=6
 HOMEPAGE=https://kinzler.com/me/xtitle/
@@ -7,4 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://kinzler.com/me/xtitle/xtitle-1.0.4.tgz
-_md5_=c367627c8d9b48764f2df9c761ed173b
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6e2d1961cf1bbc063edac4246125330b
diff --git a/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2 b/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
index 4163776ee0d1..9ebcd0a3c549 100644
--- a/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
+++ b/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=app-text/rman x11-misc/imake
+BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=Xtoolwait notably decreases the startup time of an X session
 EAPI=7
 HOMEPAGE=http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://ftp.x.org/contrib/utilities/xtoolwait-1.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6544e96f36923fe99c23885cbd94d06f
+_md5_=24a57a39261653c7ce895f73d53854c2
diff --git a/metadata/md5-cache/x11-misc/xtrlock-2.13 b/metadata/md5-cache/x11-misc/xtrlock-2.13
index cee1a632702d..0ae72800e638 100644
--- a/metadata/md5-cache/x11-misc/xtrlock-2.13
+++ b/metadata/md5-cache/x11-misc/xtrlock-2.13
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-misc/imake
+BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11
 DESCRIPTION=A simplistic screen locking program for X
 EAPI=7
 HOMEPAGE=http://ftp.debian.org/debian/pool/main/x/xtrlock/
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xtrlock/xtrlock_2.13.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=211b253b9e272563eaea710fc0a618f8
+_md5_=60abdade63236bfeb1d62fffee663421
diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
index c254c3ea6d7d..3c773e6c727f 100644
--- a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
+++ b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/imake svg? ( virtual/pkgconfig )
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1 svg? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
 DESCRIPTION=eXtended XKB - assign different keymaps to different windows
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=59b4e73d21b4f6679a5cf1a21fe3d5d6
+_md5_=53920838e5b7e59c3ac710a492fa718f
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index fa4a094dc232..a3bfeed0d2d5 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/vicious-2.5.0 b/metadata/md5-cache/x11-plugins/vicious-2.5.0
index ffaf115f7e64..13dd573bac2c 100644
--- a/metadata/md5-cache/x11-plugins/vicious-2.5.0
+++ b/metadata/md5-cache/x11-plugins/vicious-2.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-wm/awesome
 SLOT=0
 SRC_URI=https://github.com/vicious-widgets/vicious/archive/v2.5.0.tar.gz -> vicious-2.5.0.tar.gz
-_eclasses_=optfeature	a3678a005063e7c50aed4e37d04197ab
+_eclasses_=optfeature	2e90be23a14db1ea432d6b216eb2a81e
 _md5_=87fe59b3f0fc3520bc8bae6cb85b8f1c
diff --git a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2 b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
index 85da2d056338..36436d3f081f 100644
--- a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
+++ b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-misc/imake app-text/rman
+BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 app-text/rman
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=WMnet is a dock.app network monitor
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmnet
@@ -8,4 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmnet-1.06.tar.gz mirror://gentoo/wmnet-1.06-misc.patch.bz2
-_md5_=cc489ad45175403407b4d5d5978bb635
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9abf52adf7b92da148c45bc9dbf5baf8
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 51aab0d490cb..777bf6bddff4 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/kitty-0.19.3 b/metadata/md5-cache/x11-terms/kitty-0.19.3
index 42d64fea6710..6d83a8865fb6 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.19.3
+++ b/metadata/md5-cache/x11-terms/kitty-0.19.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2239503f9a856fccb436d7f5cbb9aa2
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index 8708a91385af..2c9823e70570 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= media-libs/lcms sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	a3678a005063e7c50aed4e37d04197ab	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8593cbec872bdc025665f1f35571f938
diff --git a/metadata/md5-cache/x11-terms/kterm-6.2.0-r6 b/metadata/md5-cache/x11-terms/kterm-6.2.0-r6
index 4ae0ed884d98..50de296a7e8f 100644
--- a/metadata/md5-cache/x11-terms/kterm-6.2.0-r6
+++ b/metadata/md5-cache/x11-terms/kterm-6.2.0-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile Xaw3d? ( x11-libs/libXaw3d ) virtual/pkgconfig x11-misc/gccmakedep x11-misc/imake
+DEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile Xaw3d? ( x11-libs/libXaw3d ) virtual/pkgconfig x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Japanese Kanji X Terminal
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,4 +10,4 @@ RDEPEND=app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://gentoo/kterm-6.2.0.tar.gz mirror://gentoo/kterm-6.2.0-wpi.patch.gz mirror://gentoo/kterm-6.2.0.ext02.patch.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e13a1d28771ec2a8bee0a5505274f5d
+_md5_=650db363da99c40e9fa98c48235b1c97
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r4 b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
index 96b5130fa1ff..cbb0aff0159e 100644
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r4
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
@@ -1,5 +1,6 @@
+BDEPEND=>=x11-misc/imake-1.0.8-r1 app-text/rman x11-base/xorg-proto x11-misc/gccmakedep
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-misc/imake app-text/rman x11-base/xorg-proto x11-libs/libX11 x11-misc/gccmakedep
+DEPEND=x11-libs/libXext x11-libs/libX11
 DESCRIPTION=Terminal to display (multiple) log files on the root window
 EAPI=7
 HOMEPAGE=http://oldhome.schmorp.de/marc/root-tail.html
@@ -10,4 +11,4 @@ RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=607a89140799515f7cd6315d9a3312bf
+_md5_=0eb19d4227cdd6488faa3f9fc214b9df
diff --git a/metadata/md5-cache/x11-terms/terminator-2.0.1 b/metadata/md5-cache/x11-terms/terminator-2.0.1
index de0c9c556c3e..92d28d653867 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.0.1
+++ b/metadata/md5-cache/x11-terms/terminator-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/archive/v2.0.1.tar.gz -> terminator-2.0.1.tar.gz
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1eea17d679900a08a711cf88940b60bc
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.0 b/metadata/md5-cache/x11-terms/terminator-2.1.0
index b7394a5c46db..1cdff47f107a 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.0
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.0/terminator-2.1.0.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.0/terminator-2.1.0.tar.gz.asc )
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbcefe20e8939c00e117ddc8c17c5578
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.1 b/metadata/md5-cache/x11-terms/terminator-2.1.1
index 84962ceff918..894792a709ef 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.1
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz.asc )
-_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	a3678a005063e7c50aed4e37d04197ab	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b29c7bc9415be3c2d37c691fa82ba5e8
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index fef2e89ee66c..9d78604cf593 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.14 b/metadata/md5-cache/x11-themes/greybird-3.22.14
index 0fb8310b742f..5b4ab82c9a74 100644
--- a/metadata/md5-cache/x11-themes/greybird-3.22.14
+++ b/metadata/md5-cache/x11-themes/greybird-3.22.14
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 x11-themes/gtk-engines-murrine
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.14.tar.gz -> greybird-3.22.14.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=41315893e91fa8364e18addf0263860b
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 3c49d5a77d29..49dc38b48599 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1 b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
index 0dc211ab6d7f..3ce3648fff2e 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x1
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.24.2
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19421496955c073f676a921d82d551a7
diff --git a/metadata/md5-cache/x11-wm/i3-4.19-r1 b/metadata/md5-cache/x11-wm/i3-4.19-r1
index 9201aafb3388..8141f77c8298 100644
--- a/metadata/md5-cache/x11-wm/i3-4.19-r1
+++ b/metadata/md5-cache/x11-wm/i3-4.19-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.19.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=c342e03b16464d6b0d9ca42cf519e933
diff --git a/metadata/md5-cache/x11-wm/i3-4.19.1 b/metadata/md5-cache/x11-wm/i3-4.19.1
index d594995d38e5..268dd14fdb9a 100644
--- a/metadata/md5-cache/x11-wm/i3-4.19.1
+++ b/metadata/md5-cache/x11-wm/i3-4.19.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.19.1.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=a2d0f67d615565663fcb4b71aca85f2b
diff --git a/metadata/md5-cache/x11-wm/i3-9999 b/metadata/md5-cache/x11-wm/i3-9999
index ddab99cc2b7d..91f1d31615dc 100644
--- a/metadata/md5-cache/x11-wm/i3-9999
+++ b/metadata/md5-cache/x11-wm/i3-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-libs/cairo[X,xcb(+)] x11-libs/pango[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a
 _md5_=a2d0f67d615565663fcb4b71aca85f2b
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.19 b/metadata/md5-cache/x11-wm/i3-gaps-4.19
index fb7d40df2c93..3d98932391d2 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.19
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.19
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/c
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Airblader/i3/archive/4.19.tar.gz -> i3-gaps-4.19.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=25378cddb02c25154eaa2f147f617c99
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.19.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
index c8df051068af..3f0a73683285 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/c
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Airblader/i3/archive/4.19.1.tar.gz -> i3-gaps-4.19.1.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	a3678a005063e7c50aed4e37d04197ab	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	2e90be23a14db1ea432d6b216eb2a81e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a1536a85f1d44b363ef2ed6d1de560f1
diff --git a/metadata/md5-cache/x11-wm/icewm-2.3.0 b/metadata/md5-cache/x11-wm/icewm-2.3.2
similarity index 96%
rename from metadata/md5-cache/x11-wm/icewm-2.3.0
rename to metadata/md5-cache/x11-wm/icewm-2.3.2
index 023e58f0261d..9b5248d27275 100644
--- a/metadata/md5-cache/x11-wm/icewm-2.3.0
+++ b/metadata/md5-cache/x11-wm/icewm-2.3.2
@@ -11,6 +11,6 @@ RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/li
 REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.3.0/icewm-2.3.0.tar.lz
+SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.3.2/icewm-2.3.2.tar.lz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
 _md5_=5babf10b1421abe9fa23bc4253aa2bc3
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
index 20c78aee8c45..a069817195d0 100644
--- a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
+++ b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
@@ -1,5 +1,6 @@
+BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 x11-misc/gccmakedep app-text/rman
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/xorg-proto x11-misc/imake x11-misc/gccmakedep app-text/rman
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 DESCRIPTION=Tiling window manager for X11, based on 9wm by David Hogan
 EAPI=7
 HOMEPAGE=http://www.fnurt.net/larswm/
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.fnurt.net/larswm/larswm-7.5.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2262222d77b12fa579942f6895a0512c
+_md5_=e0dbb8445dad737b5ac7c2a8c11fc180
diff --git a/metadata/md5-cache/x11-wm/lwm-1.2.4 b/metadata/md5-cache/x11-wm/lwm-1.2.4
index 1d236c6903de..8794ee419c39 100644
--- a/metadata/md5-cache/x11-wm/lwm-1.2.4
+++ b/metadata/md5-cache/x11-wm/lwm-1.2.4
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-misc/imake
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=The ultimate lightweight window manager
 EAPI=6
 HOMEPAGE=http://www.jfc.org.uk/software/lwm.html
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.jfc.org.uk/files/lwm/lwm-1.2.4.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0311dad79c6577a5c3de9517edec1ed8
+_md5_=3e14023a4abc2ac07bf4aa5e66cc1d0e
diff --git a/metadata/md5-cache/x11-wm/mutter-3.38.4 b/metadata/md5-cache/x11-wm/mutter-3.38.4
index 18f2d130ada9..29dbfa3b0b5b 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.38.4
+++ b/metadata/md5-cache/x11-wm/mutter-3.38.4
@@ -5,7 +5,7 @@ DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 >=media-libs/graphene-1.9.3[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.30[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-3.37.2[introspection?] >=dev-libs/glib-2.61.1:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.7 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.0:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=mirror://gnome/sources/mutter/3.38/mutter-3.38.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22dad193f9e22917982458c67567f2be
+_md5_=9bd1793addfe604e0fa91ad90b6bfb08
diff --git a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2 b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
index ae83435853f3..6e027bdc0107 100644
--- a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
+++ b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
@@ -1,5 +1,6 @@
+BDEPEND=app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay ) app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto x11-misc/imake
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay )
 DESCRIPTION=TWM descendant that implements a Virtual Desktop
 EAPI=7
 HOMEPAGE=http://www.vtwm.org/
@@ -10,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs
 SLOT=0
 SRC_URI=http://www.vtwm.org/downloads/vtwm-5.4.7.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9959610b229cf5d08532d33e84f88677
+_md5_=9d014b897e13f2944f09ee2334ec03aa
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 52880a612a86..7ddd1fd899a8 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/exo-4.16.2 b/metadata/md5-cache/xfce-base/exo-4.16.2
index 974645e3c358..e4dd6301c4c3 100644
--- a/metadata/md5-cache/xfce-base/exo-4.16.2
+++ b/metadata/md5-cache/xfce-base/exo-4.16.2
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1
 DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/exo/4.16/exo-4.16.2.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44fd6add5893f9c71f3c1ac6f336dc71
+_md5_=a9b0902e65a22c0a74fb251dde0b69a3
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2f1b6538e618..8df68041ff80 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Apr 2021 08:08:31 +0000
+Thu, 15 Apr 2021 09:08:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4d372b296aad..ab4e184fde12 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Apr 14 08:08:30 AM UTC 2021
+Thu Apr 15 09:08:28 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bb0e527bdb83..4332f487d3b8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Apr 2021 08:30:01 +0000
+Thu, 15 Apr 2021 09:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8cb0334c7c6e..f205a5bdd016 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7376402bdc479441a16517c07a0f0182311ebad3 1618387156 2021-04-14T07:59:16+00:00
+9c8d89b2e2bb9afc7ab67676430aeb38879fbdc1 1618477420 2021-04-15T09:03:40+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0b3a7a39689b..6710cfde1d71 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1618387501 Wed 14 Apr 2021 08:05:01 AM UTC
+1618477501 Thu 15 Apr 2021 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2f1b6538e618..8df68041ff80 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Apr 2021 08:08:31 +0000
+Thu, 15 Apr 2021 09:08:28 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3fcb6a3c6416..00c9a13e6bd6 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 5cad5caf1f93..b1ca67b3597c 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1 +1 @@
-DIST NessusAgent-8.2.3-es8.x86_64.rpm 14554872 BLAKE2B 532a2d26b8aeb2d185da059e14eda1de0a48dddccbefcbccc3ed6636e8679dd13a8c55f12dd2bc4f8e49794f7da0a2c0db13007fa6390254a3ca276df9083184 SHA512 c6bb315c30723a292968254bd5616d71bc07ba5b30a71ad4f57d395535ebcf16d42df393ab30d63fb8929fd7edc09d1d79bcccaafd7fb2f9762e147f63ee90e3
+DIST NessusAgent-8.2.4-es8.x86_64.rpm 14630416 BLAKE2B 00a2f180da2864426654c4cf9afaef4d4c5a517984a942acf877e82f782d4d1532a18cd797864282389161819513e3e2b8a3b6fbe0244d1d3dae4868534320a9 SHA512 6c4c17f3c2bcf7018794b11a81fc0e3d5adfa7af52a2e6b97b0f77ee88d82fab890de12c7c7ab046a7183e3571934bb9e6c3ccf90e53eceba7e77fa94770eba0
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.3.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.4.ebuild
similarity index 100%
rename from net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.3.ebuild
rename to net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.4.ebuild
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index b7de8f360248..59901af69aaa 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1 +1 @@
-DIST Nessus-8.13.1-es8.x86_64.rpm 41186604 BLAKE2B 462cc6bd9c2f5b50fce330fa5919e9b6e5c93285361c385d06d6f0377ecb9fa8ce349714b71d0f97604c4e755d54e510edb5561c9dccfdb1fad3e35a7e6504d6 SHA512 d2a2b3a94b78bbf6261ae0ad4f66475cf0aea14316de1f2133795767c14048cb12b9857e497182770b04e006c00f65a7fe592f4fce0c480d08efafb2c17ad7a2
+DIST Nessus-8.14.0-es8.x86_64.rpm 42769924 BLAKE2B ad0136b8c74d6e4cbd4b77aaac73c7d7ebaa9e26d41c964c63e28086429ea4571378439b3578a728a28c73e1f4a094d1030fe636896cd94b6f788e9db8370981 SHA512 6705dc7e036211c5aa5662713a5bd4a502674de3d53c9a79df1fe77adeacbc3d36afbcef0129189582c1f3a9399efc5d7e7885ae54ab1ddbc3096e99f00345f7
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.14.0.ebuild
similarity index 100%
rename from net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild
rename to net-analyzer/nessus-bin/nessus-bin-8.14.0.ebuild
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9d3c18a4c863..6ad86d557f0b 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 126e7ae66fc7..0411dc061d1b 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -27,8 +27,9 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	|| ( purple xmpp msn oscar )
-	xmpp? ( !nss )
+	purple? ( plugins )
 	test? ( plugins )
+	xmpp? ( !nss )
 "
 
 COMMON_DEPEND="
@@ -64,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
 	"${FILESDIR}"/${PN}-3.5-libcheck.patch
 	"${FILESDIR}"/${PN}-3.5-libevent.patch
+	"${FILESDIR}"/${P}-disabled-plugins-use.patch
 )
 
 src_configure() {
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 220b6904f2d3..b1eb2f2c62c0 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -27,8 +27,9 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	|| ( purple xmpp msn oscar )
-	xmpp? ( !nss )
+	purple? ( plugins )
 	test? ( plugins )
+	xmpp? ( !nss )
 "
 
 COMMON_DEPEND="
diff --git a/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch
new file mode 100644
index 000000000000..0973bd4bd5fa
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch
@@ -0,0 +1,55 @@
+This patch is taken from upstrem https://github.com/bitlbee/bitlbee/pull/156
+where it was already merged.
+
+From a8196d6f72b44be9c315b9ad7dc45276d2aaca0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Tue, 23 Mar 2021 13:07:18 +0100
+Subject: [PATCH] root_commands: prevent linker error when plugins are disabled
+
+This commit fixes compilation issue with disabled plugin support
+(./configure --plugins=0), where get_plugins function is unavailable.
+The problem has been introduced with addition of new 'plugins info'
+subcommand, where get_plugins is used in cmd_plugins_info function,
+which should be conditionally available only if WITH_PLUGINS is defined.
+
+Bug: https://bugs.gentoo.org/739510
+Bug: https://bugs.gentoo.org/617604
+Fixes: 6908ab747d1e ("Add 'plugins info' subcommand, only show plugin details there")
+Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
+---
+ root_commands.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/root_commands.c b/root_commands.c
+index 8358c030..a4e72f83 100644
+--- a/root_commands.c
++++ b/root_commands.c
+@@ -1168,6 +1168,7 @@ static void prplstr(GList *prpls, GString *gstr)
+ 	g_list_free(prpls);
+ }
+ 
++#ifdef WITH_PLUGINS
+ static void cmd_plugins_info(irc_t *irc, char **cmd)
+ {
+ 	GList *l;
+@@ -1201,6 +1202,7 @@ static void cmd_plugins_info(irc_t *irc, char **cmd)
+ 		irc_rootmsg(irc, "  URL: %s", info->url);
+ 	}
+ }
++#endif
+ 
+ static void cmd_plugins(irc_t *irc, char **cmd)
+ {
+@@ -1208,7 +1210,9 @@ static void cmd_plugins(irc_t *irc, char **cmd)
+ 	GString *gstr;
+ 
+ 	if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) {
++#ifdef WITH_PLUGINS
+ 		cmd_plugins_info(irc, cmd);
++#endif
+ 		return;
+ 	}
+ 
+-- 
+2.26.3
+
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 6b9094fdcf70..d52cae25e93d 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,4 +1,5 @@
 DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
 DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
 DIST gajim-1.3.0.tar.gz 9886259 BLAKE2B c9d0912f4d2cb76668978ca48fb1bc2db203cae7ea8dba7fd03c40d1cfee3da84131e2cd82ed6b27ed4c9a70a37328c57551fe1190e29bbd0c9a3cd6f9fa4a66 SHA512 4b68b97f6e4edcc2aa4b009a0131e4781c4ca52340ce98369154c602f7ee71e974e0840af0ae6ab28fc9e2fd34433ec0f304e10847e6cc257de3cde60b90b349
+DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
 DIST gajim-1.3.1.tar.gz 9885129 BLAKE2B ee1fac7f1354576879c5ef14d167d4f7248e497f5b7c468d4bdeb9bf93b749482e221e4ad7a965c86799baa959020303b1b3e49ca99ce1607fc721d0722cbffd SHA512 840b9424c4f93281fe32569331917ba3bdd0afc51428d778ec357b1b0dfc9aecdf77a48c44fa4b66259d82633ca277ccab6b4d6ead47e7eb66d22f078e8ebb84
diff --git a/net-im/gajim/gajim-1.3.1_p2.ebuild b/net-im/gajim/gajim-1.3.1_p2.ebuild
new file mode 100644
index 000000000000..68604b8786a6
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.1_p2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${PN}-${PV/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
+S="${WORKDIR}/${PN}-${PV/_p2/}"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	')"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index 3c3bb122ec66..e044567d91c0 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1 +1,2 @@
 DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
+DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index 291481d18572..697f99071d07 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="notification">Adds support for GTK Status Notifier tray backends</flag>
+		<flag name="notification">Use snorenotify for desktop notifications</flag>
+		<flag name="spellcheck">Enable spell cheching support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">qTox/qTox</remote-id>
diff --git a/net-im/qtox/qtox-1.17.3.ebuild b/net-im/qtox/qtox-1.17.3.ebuild
new file mode 100644
index 000000000000..c43dea81fae1
--- /dev/null
+++ b/net-im/qtox/qtox-1.17.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="qTox-${PV}"
+inherit cmake xdg
+
+DESCRIPTION="qTox is an instant messaging client using the encrypted p2p Tox protocol"
+HOMEPAGE="https://qtox.github.io/"
+SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="notification spellcheck test X"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/qTox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	|| (
+		dev-qt/qtgui:5[gif,jpeg,png,X(-)]
+		dev-qt/qtgui:5[gif,jpeg,png,xcb(-)]
+	)
+	dev-db/sqlcipher
+	dev-libs/libsodium:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode:=
+	media-libs/libexif:=
+	media-libs/openal
+	media-video/ffmpeg:=[webp,v4l]
+	net-libs/tox:0/0.2[av]
+	notification? ( x11-libs/snorenotify )
+	spellcheck? ( kde-frameworks/sonnet:5 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# bug 628574
+	if ! use test; then
+		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE="Release"
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-DUPDATE_CHECK=OFF
+		-DUSE_CCACHE=ON
+		-DSPELL_CHECK=$(usex spellcheck)
+		-DSVGZ_ICON=ON
+		-DASAN=OFF
+		-DDESKTOP_NOTIFICATIONS=$(usex notification)
+		-DSTRICT_OPTIONS=OFF
+		-DGIT_DESCRIBE="${PV}"
+	)
+
+	cmake_src_configure
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index d77a34edde0c..575db8aa9631 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_1.40.1_amd64.deb 109871658 BLAKE2B f2ac08327943112e8bc00f191e9e75392837ad6cf1f3460b9d02f76b589eb23fc9d0448b92d56292982c4b6a4a50e81d7b7f22ec09acde3c5daec57fbc935deb SHA512 dfe2c0e3244e37bdf02df2340d2cadd98f907c027d671fb0eafb8953d676ea28e1b3344e3f84e93e30844cd1d0ce3766b5620059029b313c1b2cfbe6267506d1
+DIST signal-desktop_5.0.0_amd64.deb 106294742 BLAKE2B 4458bdbd52f97c0a0c945d6e918c4f90e4b2ae66c711c957fc915a10449ad9cb34d1c3ec3fd51b0a76370e89e14fae5fe981773e6419654536c51df38d4cb765 SHA512 08a443531e4fe1fba81ee9863a42a5766e74e4b93ffb9c7d6687fe91a62a37892b37222bf0c6dd4bf336315466c8fcf4707c7fddb2c12e027f431262f2fc0e59
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.40.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.0.0.ebuild
similarity index 97%
rename from net-im/signal-desktop-bin/signal-desktop-bin-1.40.1.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-5.0.0.ebuild
index f39a92c2d0ae..b9d805614449 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.40.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.0.0.ebuild
@@ -68,6 +68,7 @@ QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/swiftshader/libGLESv2.so
 	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux_x64.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
index a6b12cd81002..fdf7162dfdf0 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug networkmanager"
 
 RDEPEND="
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 6c9e538c3ed2..21ab7b264719 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
index 93299731defc..183663a926d6 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 056e0a34db92..e015eb311722 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/farstream/farstream-0.2.9.ebuild b/net-libs/farstream/farstream-0.2.9.ebuild
index 4c76af4f7c7f..eb7ddd40101c 100644
--- a/net-libs/farstream/farstream-0.2.9.ebuild
+++ b/net-libs/farstream/farstream-0.2.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp valgrind"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
index 3d51fb532d10..a87f183e1381 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
index d8184154dea5..cca319670b85 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38.0:2
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 34c60c718c31..51c707b235b4 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
index 98c1d10adb11..677d74b3a719 100644
--- a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/vncrec/vncrec-0.2-r2.ebuild b/net-misc/vncrec/vncrec-0.2-r2.ebuild
index cb4d1e4f751c..71f1c49f2578 100644
--- a/net-misc/vncrec/vncrec-0.2-r2.ebuild
+++ b/net-misc/vncrec/vncrec-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	app-text/rman
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
 DOCS=( README README.vnc )
@@ -38,13 +38,16 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CXXFLAGS}" \
+		AR="$(tc-getAR) cq" \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}" \
 		World
 }
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
index 65c9a6691948..4d294cbd5075 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,16 +21,16 @@ RDEPEND="virtual/ssh
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
 BDEPEND="app-text/rman
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 src_configure() {
 	econf --libexecdir=/usr/"$(get_libdir)"/misc \
 		--disable-installing-app-defaults
-	xmkmf || die "xmkmf failed"
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf failed"
 }
 
 src_compile() {
-	emake includes
 	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}"
 }
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 11b03b7b4708..642edc062328 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index d54c8e8baca2..a8ec3b16bc06 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -3,7 +3,7 @@
 
 # Mike Gilbert <floppym@gentoo.org> (2016-11-17)
 # Enable both efi and pc by default.
-# https://bugs.gentoo.org/600110
+# bug #600110
 sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 5a70a7f0cc97..38d96d878055 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -105,7 +105,7 @@ sys-block/fio python gnuplot
 # Craig Andrews <candrews@gentoo.org> (2019-10-08)
 # net-libs/quiche is not available on all arches
 # Track addition arch keywording of quiche at:
-# https://bugs.gentoo.org/694320
+# bug #694320
 net-misc/curl quiche
 
 # Craig Andrews <candrews@gentoo.org> (2019-10-08)
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 0522aa34b618..5ef64c04f901 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -199,7 +199,7 @@ networkmanager
 gcj
 
 # Samuli Suominen <drac@gentoo.org> (2007-03-02)
-# See https://bugs.gentoo.org/show_bug.cgi?id=157881#c3
+# See bug #157881#c3
 battery
 
 # Saleem Abdulrasool <compnerd@gentoo.org> (2006-08-18)
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index d2c98333a107..3cccc93153f3 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -93,7 +93,7 @@ sys-apps/flashrom jlink-spi
 
 # Jimi Huotari <chiitoo@gentoo.org> (2019-07-28)
 # Mask unkeyworded, untested dependencies.
-# https://bugs.gentoo.org/689606
+# bug #689606
 lxqt-base/lxqt-meta admin powermanagement processviewer screenshot sudo
 lxqt-base/lxqt-panel cpuload networkmonitor pulseaudio sysstat
 
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 49235cd7f46d..f4d8446a5d1f 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -38,7 +38,7 @@ sys-libs/compiler-rt-sanitizers -profile
 
 # Alexey Sokolov <alexey+gentoo@asokolov.org> (2020-10-28)
 # dev-qt/linguist-tools-5.15.0 and 5.15.1 OOM with bad_alloc.
-# https://bugs.gentoo.org/751418
+# bug #751418
 >=sci-astronomy/stellarium-0.20.3 nls
 
 # Sam James <sam@gentoo.org> (2020-10-05)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 63be2ec51920..8466820a2636 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -452,7 +452,7 @@ app-emulation/libvirt openvz
 # rather sensitive when it comes to compiler flags, resulting in
 # black screens, hangs or crashes. The average joe should have no
 # need or even advantage to set custom compiler flags at all.
-# Example: https://bugs.gentoo.org/619628
+# Example: bug #619628
 sys-boot/gnu-efi custom-cflags
 sys-boot/refind custom-cflags
 
@@ -524,7 +524,7 @@ dev-java/icedtea cacao jamvm
 
 # Justin Lecher <jlec@gentoo.org> (2015-09-22)
 # Downloads files during installation
-# https://bugs.gentoo.org/show_bug.cgi?id=533876
+# bug #533876
 >=sci-libs/vtk-6.1.0 examples
 
 # James Le Cuirot <chewi@gentoo.org> (2015-08-18)
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 4a915b1d0d79..232b2f1281a2 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -19,7 +19,7 @@ php7-2
 # Nothing depends on those ROS messages. dev-ros/geneus
 # is half broken in our setup where it looks for packages
 # on the filesystem and causes build failures.
-# See e.g. https://bugs.gentoo.org/741076
+# See e.g. bug #741076
 ros_messages_eus
 
 # Hans de Graaff <graaff@gentoo.org> (2020-06-13)
diff --git a/profiles/default/linux/amd64/17.0/deprecated b/profiles/default/linux/amd64/17.0/deprecated
index c11d41187d8d..91595130b2d6 100644
--- a/profiles/default/linux/amd64/17.0/deprecated
+++ b/profiles/default/linux/amd64/17.0/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/deprecated b/profiles/default/linux/amd64/17.0/desktop/deprecated
index d29b4ea76578..b726cb19ea7a 100644
--- a/profiles/default/linux/amd64/17.0/desktop/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
index e65fc37f913d..995ec40fcfe2 100644
--- a/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
index d5c8416510da..e64ddd762146 100644
--- a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
index c05ef3691bc5..2eecded52231 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
index f817b8c47e0e..83189d77ef50 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/developer/deprecated b/profiles/default/linux/amd64/17.0/developer/deprecated
index 5628b3931f36..f3fe9f7f95bd 100644
--- a/profiles/default/linux/amd64/17.0/developer/deprecated
+++ b/profiles/default/linux/amd64/17.0/developer/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/hardened/deprecated b/profiles/default/linux/amd64/17.0/hardened/deprecated
index 1c1eadf982e9..04b24997b203 100644
--- a/profiles/default/linux/amd64/17.0/hardened/deprecated
+++ b/profiles/default/linux/amd64/17.0/hardened/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
index 7a9f9d079a5b..255b567bbbf6 100644
--- a/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
index 7c071d514eed..b031cc932e9e 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
index b5d8bd8b093d..bd30b21ce48e 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
index 0d123229db03..46ee10d2470c 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/selinux/deprecated b/profiles/default/linux/amd64/17.0/selinux/deprecated
index 06df9d539675..2e4dfe1314c0 100644
--- a/profiles/default/linux/amd64/17.0/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/selinux/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/amd64/17.0/systemd/deprecated b/profiles/default/linux/amd64/17.0/systemd/deprecated
index 9d35e3be2e3f..cb52626392cd 100644
--- a/profiles/default/linux/amd64/17.0/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/systemd/deprecated
@@ -56,4 +56,4 @@ For known issues, please see bug #506276 [1].  If you have any problems
 with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
-[1] https://bugs.gentoo.org/506276
+[1] bug #506276
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 511d4bbaff66..0a7c8e5cb3c3 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -3,7 +3,7 @@
 
 # Peter Levine <plevine457@gmail.com> (2019-10-01)
 # Native inotify support is preferred on linux.
-# https://bugs.gentoo.org/697476
+# bug #697476
 net-fs/samba fam
 
 # Patrick McLean <chutzpah@gentoo.org> (2019-09-17)
diff --git a/profiles/default/linux/x86/17.0/musl/use.mask b/profiles/default/linux/x86/17.0/musl/use.mask
index a965b6969945..a676f6deb519 100644
--- a/profiles/default/linux/x86/17.0/musl/use.mask
+++ b/profiles/default/linux/x86/17.0/musl/use.mask
@@ -1,5 +1,5 @@
 # Copyright 1999-2020 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
 
-# ssp is broken on x86 musl: https://bugs.gentoo.org/706210
+# ssp is broken on x86 musl: bug #706210
 ssp
diff --git a/profiles/features/prefix/package.use.force b/profiles/features/prefix/package.use.force
index 95c5b369755e..c8e401afccd7 100644
--- a/profiles/features/prefix/package.use.force
+++ b/profiles/features/prefix/package.use.force
@@ -5,5 +5,5 @@
 # We want to use rust-bin (with fixes) or source-built rust
 # to bootstrap rust properly.
 # See https://github.com/gentoo/gentoo/pull/19815 for discussion
-# And https://bugs.gentoo.org/682370 https://bugs.gentoo.org/682370
+# and bug #682370, bug #682370
 dev-lang/rust system-bootstrap
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index d3ebebe2d5a0..ea56128002dc 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-14)
+# because of unmasking java 11, which does not support bytecode older
+# than 1.6, those are deprecated in the ebuild. also, as the lowest
+# java version we support is 1.8, the restriction is lifted even more.
+<virtual/jdk-1.8
+<virtual/jre-1.8
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-20)
 # dev-qt/qtwebkit is in the process of being removed, tracker bug #684580
 dev-qt/qtwebkit
diff --git a/profiles/package.mask b/profiles/package.mask
index 33b487a5db53..03bd19068a3a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Jonas Stein <jstein@gentoo.org> (2021-04-15)
+# Depends on gtk2, which is EOL
+# Removal on 2021-06-01.  Bug #782904.
+x11-themes/gtk-engines-aurora
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-14)
+# java libraries not used by any other package,
+# masked for removal
+dev-java/odfdom
+dev-java/saaj
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-04-14)
+# QA: Mask sys-apps/openrc-0.43 because of bug 782808
+=sys-apps/openrc-0.43*
+
 # Jonas Stein <jstein@gentoo.org> (2021-04-14)
 # Open bugs, dead upstream.
 # Removal on 2021-06-01.  Bug #782730.
@@ -64,7 +79,7 @@ games-misc/games-envd
 
 # Lars Wendler <polynomial-c@gentoo.org> (2021-04-08)
 # Masked for testing and until revdeps have been fixed:
-# https://bugs.gentoo.org/781188
+# bug #781188
 >=dev-libs/icu-69.1
 >=dev-libs/icu-layoutex-69.1
 
@@ -104,11 +119,6 @@ sci-biology/gatk
 # Bug #625492, removal in 30 days.
 sci-biology/diya
 
-# Michał Górny <mgorny@gentoo.org> (2021-04-04)
-# Reported to contain an unintentional ABI breakage leading to crashes
-# when loading extensions on 32-bit systems.
-=dev-lang/python-3.9.3
-
 # Mikle Kolyada <zlogene@gentoo.org> (2021-04-02)
 # TexLive 2021 mask
 # Only unmask these versions if you know what you are doing
@@ -259,34 +269,12 @@ sys-devel/autoconf:2.71
 # Removal in 30 days. Bug #768228.
 mail-mta/protonmail-bridge-bin
 
-# Joonas Niilola <juippis@gentoo.org> (2021-03-16)
-# A library without consumers, unbuildable for years, ebuilds not
-# touched in years either. Bugs #664776, #747592. Removal in ~30 days.
-dev-libs/zookeeper-c
-
 # Göktürk Yüksek <gokturk@gentoo.org> (2021-03-14)
 # Dead upstream. No revdeps.
 # Removal in 60 days to allow people extra time
 # for transitioning out. Bug #776262.
 app-admin/lastpass-cli
 
-# Brian Evans <grknight@gentoo.org> (2021-03-08)
-# No longer consistently maintained, severely broken with PHP 8
-# No reverse dependencies, fails tests
-# Removal in 30 days.
-dev-php/PEAR-Config
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-03-06)
-# Fails to build, multiple bugs, outdated, nontrival, unmaintained
-# Bug 729876 and several others; removal in 30days
-dev-libs/klibc
-
-# Sam James <sam@gentoo.org> (2021-03-03)
-# Declared abandoned upstream and stuck
-# on Python 3.7.
-# Removal in 30 days.
-app-office/moneyguru
-
 # Sam James <sam@gentoo.org> (2021-03-03)
 # Doesn't seem to sync clock correctly
 # in some cases.
@@ -337,7 +325,7 @@ www-apps/webmcp
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-30)
 # broken acl handling, possible broken chattr handling
 # needs more testing
-# https://bugs.gentoo.org/751739
+# bug #751739
 =sys-apps/opentmpfiles-0.3.1
 
 # Stephan Hartmann <sultan@gentoo.org> (2021-03-21)
@@ -395,10 +383,6 @@ dev-lang/vala:0.50
 # regarding runstatedir (not using /run).
 =net-misc/networkmanager-1.22*
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-27)
-# Vulnerable old version of icedtea-web #711392
-<dev-java/icedtea-web-1.8.4
-
 # Eray Aslan <eras@gentoo.org> (2020-03-09)
 # Mask experimental software
 =mail-mta/postfix-3.6*
@@ -435,7 +419,7 @@ net-misc/gnome-remote-desktop
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
-# https://bugs.gentoo.org/700020
+# bug #700020
 =app-arch/cpio-2.13
 
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index fe5ecc24637d..38a3feb6605a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4970,7 +4970,6 @@ media-video/mjpg-streamer:output-udp - Plugin receiving content over UDP and sto
 media-video/mjpg-streamer:www - Installs WWW content
 media-video/motion:mariadb - Add mariadb database support
 media-video/motion:mmal - Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.
-media-video/motion:supervise-daemon - Add experimental suppport for OpenRC's supervise-daemon process supervision
 media-video/motiontrack:multiprocess - Enables multi-process support (SMP/cluster) for motiontrack programs
 media-video/mplayer:bl - Blinkenlights video output
 media-video/mplayer:bluray - Enable playback of Blu-ray filesystems
@@ -5760,7 +5759,8 @@ net-im/psi:webengine - Enable themed, html-based chatlogs using dev-qt/qtwebengi
 net-im/psi:whiteboarding - Enable experimental interactive SVG drawing
 net-im/psi:xscreensaver - Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events
 net-im/psimedia:extras - Enable Psi+ mode (required when built for Psi+)
-net-im/qtox:notification - Adds support for GTK Status Notifier tray backends
+net-im/qtox:notification - Use snorenotify for desktop notifications
+net-im/qtox:spellcheck - Enable spell cheching support
 net-im/spectrum2:frotz - Enables the Z-Engine backend.
 net-im/spectrum2:irc - Enables the IRC backend, based on net-im/libcommuni.
 net-im/spectrum2:purple - Enables the libpurple backend, based on net-im/pidgin.
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index d3e1cf9043a2..7a935d6bce1e 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
index e76181650805..c9740ad088e8 100644
--- a/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,15 +16,19 @@ IUSE=""
 
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	app-text/rman"
 
 S=${WORKDIR}/${PN}
 
 PATCHES=( "${FILESDIR}"/${PN}-{keypad,order}.diff )
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+}
+
 src_compile() {
-	xmkmf || die
 	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index c443e4152748..c1cf3e93d295 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
index 6c8eb7c7eea0..960a5d0f4657 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-base/xorg-proto
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 #S="${WORKDIR}/${PN}-2.7.5-${VERS}"
 S="${WORKDIR}/RasMol-${PV}"
@@ -78,7 +78,8 @@ src_prepare() {
 	mv vector.c v_ector.c || die
 	mv vector.h v_ector.h || die
 
-	xmkmf -DGTKWIN || die "xmkmf failed with ${myconf}"
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -DGTKWIN || die
 }
 
 src_compile() {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d6007519649e..37e6ed8f41c8 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild
index b5ec42484014..56929b85f919 100644
--- a/sys-apps/busybox/busybox-1.32.1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.1.ebuild
@@ -25,16 +25,17 @@ IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslo
 REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )
 	virtual/libcrypt:="
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	static? (
 		virtual/libcrypt[static-libs]
 		selinux? ( sys-libs/libselinux[static-libs(+)] )
 	)
 	>=sys-kernel/linux-headers-2.6.39"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
diff --git a/sys-apps/busybox/busybox-1.33.0.ebuild b/sys-apps/busybox/busybox-1.33.0.ebuild
index 580a436eb1d2..1b069a81190c 100644
--- a/sys-apps/busybox/busybox-1.33.0.ebuild
+++ b/sys-apps/busybox/busybox-1.33.0.ebuild
@@ -25,16 +25,17 @@ IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslo
 REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )
 	virtual/libcrypt:="
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	static? (
 		virtual/libcrypt[static-libs]
 		selinux? ( sys-libs/libselinux[static-libs(+)] )
 	)
 	>=sys-kernel/linux-headers-2.6.39"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 7cc9e91d45be..d52691079702 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -25,12 +25,14 @@ IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslo
 REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
 	>=sys-kernel/linux-headers-2.6.39"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
index fd8e8d3461c8..6168bb1b1391 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat elogind gnome systemd"
 REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	>=media-libs/libdvdread-4.2.0:0=
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
index e3903da5e692..e81056f2891c 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
index b76468286d57..109cfb6ee818 100644
--- a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a4ca9e5146aa..768486fadafa 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.28-r1.ebuild
similarity index 97%
rename from sys-cluster/ipvsadm/ipvsadm-1.28.ebuild
rename to sys-cluster/ipvsadm/ipvsadm-1.28-r1.ebuild
index ed048c1f31b9..5d9163943dba 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.28-r1.ebuild
@@ -46,7 +46,7 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		HAVE_NL=1 \
 		STATIC=${STATIC} \
-		POPT_LIB="$($(tc-getPKG_CONFIG)--libs popt)"
+		POPT_LIB="$($(tc-getPKG_CONFIG) --libs popt)"
 }
 
 src_install() {
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b28e7d36112a..a23a1766cd0a 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/zfs/zfs-2.1.0_rc2.ebuild b/sys-fs/zfs/zfs-2.1.0_rc2.ebuild
index 4defe4c20fdf..fbce8715910b 100644
--- a/sys-fs/zfs/zfs-2.1.0_rc2.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0_rc2.ebuild
@@ -11,14 +11,17 @@ inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam sy
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	MY_P="${P/_rc/-rc}"
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS=""
 	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64"
+	fi
 fi
 
 LICENSE="BSD-2 CDDL MIT"
@@ -31,7 +34,6 @@ DEPEND="
 	net-libs/libtirpc[static-libs?]
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
 	virtual/libudev[static-libs(-)?]
 	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	!libressl? ( dev-libs/openssl:0=[static-libs?] )
@@ -50,10 +52,12 @@ BDEPEND="virtual/awk
 	)
 "
 
+# awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
+	virtual/awk
 	rootfs? (
 		app-arch/cpio
 		app-misc/pax-utils
@@ -82,7 +86,7 @@ pkg_setup() {
 	if use kernel_linux && use test-suite; then
 		linux-info_pkg_setup
 
-		if  ! linux_config_exists; then
+		if ! linux_config_exists; then
 			ewarn "Cannot check the linux kernel configuration."
 		else
 			if use test-suite; then
@@ -172,7 +176,7 @@ src_install() {
 	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
 	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
+		find "${ED}" -name '*.la' -delete || die
 	fi
 
 	dobashcomp contrib/bash_completion.d/zfs
@@ -194,14 +198,14 @@ src_install() {
 pkg_postinst() {
 	if use rootfs; then
 		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
 			elog "  sys-kernel/dracut"
 			elog "  sys-kernel/genkernel"
 		fi
 	fi
 
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
 		einfo "Adding ${P} to the module database to ensure that the"
 		einfo "kernel modules and userland utilities stay in sync."
 		update_moduledb
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 7aeab7806af7..fbce8715910b 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -11,14 +11,17 @@ inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam sy
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	MY_P="${P/_rc/-rc}"
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64"
+	fi
 fi
 
 LICENSE="BSD-2 CDDL MIT"
@@ -31,7 +34,6 @@ DEPEND="
 	net-libs/libtirpc[static-libs?]
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
 	virtual/libudev[static-libs(-)?]
 	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	!libressl? ( dev-libs/openssl:0=[static-libs?] )
@@ -50,10 +52,12 @@ BDEPEND="virtual/awk
 	)
 "
 
+# awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
+	virtual/awk
 	rootfs? (
 		app-arch/cpio
 		app-misc/pax-utils
@@ -82,7 +86,7 @@ pkg_setup() {
 	if use kernel_linux && use test-suite; then
 		linux-info_pkg_setup
 
-		if  ! linux_config_exists; then
+		if ! linux_config_exists; then
 			ewarn "Cannot check the linux kernel configuration."
 		else
 			if use test-suite; then
@@ -172,7 +176,7 @@ src_install() {
 	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
 	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
+		find "${ED}" -name '*.la' -delete || die
 	fi
 
 	dobashcomp contrib/bash_completion.d/zfs
@@ -194,14 +198,14 @@ src_install() {
 pkg_postinst() {
 	if use rootfs; then
 		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
 			elog "  sys-kernel/dracut"
 			elog "  sys-kernel/genkernel"
 		fi
 	fi
 
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
 		einfo "Adding ${P} to the module database to ensure that the"
 		einfo "kernel modules and userland utilities stay in sync."
 		update_moduledb
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index ceea20c04e06..003e8edf8d72 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 010076049790..458ef8c4b913 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,102 +1,40 @@
-DIST genpatches-5.10-27.base.tar.xz 862992 BLAKE2B 6b8e6bc6b1a1b9b07d6de58f38efec32272c6d5d4b01ab9761821b9ee1d45fa805c504b2a6e6755a03558138fcb098113cddb0da349a811ddfb8290b8206b451 SHA512 c9290804d54af33212bec8ef1515cc8162226a949b7043fc65c9b73261c06c61d65df1a6ba5706cf3a31d80acb659a7046c722612cd4868f1fa19e3799be8047
-DIST genpatches-5.10-27.extras.tar.xz 1772 BLAKE2B ef13bdf8726981575e0c123f198ae7fe93172ae6deaafad5df08e61eb57af5cb920853fa3bafd29e20433368372a11cc1c6e13fe95bff893776f5267ffeded67 SHA512 b75bbc811ae2998ad0b3a56dabe1d84437753c33b5c584c73d3c3e90af5befb91856efb331c5a3260de2c26d5669006bed8ed453374e39c125dd493b40f0abdc
-DIST genpatches-5.10-29.base.tar.xz 932392 BLAKE2B eff5249f3471134c5601aaabf1b470dcdf7d2e38c79ff79cc8bd4a0cf33e0dcce63e7e01370eda084c02862af422b442953e3ea4e8a8a6f012df5d8ebf8cca8b SHA512 0909fa9f9fb62dc87e5a18cb15aedf483c9a3c3470e917768e86d0b7eb4bf1240c1ab2b0f406e1c26819cbe7924f1898019c8a2b7981f1c6e8081c92f67de1a7
-DIST genpatches-5.10-29.extras.tar.xz 1772 BLAKE2B 30b3a5b57b99b046872907007fabffbed366cae11aebc2979129716be3c779ccfd87c6834f2e4b77dc1131c603ced8ffdd089c11264abc8b70d7590cdd191562 SHA512 ea9c1408543fa3b0a3a32ac11c7cd2591d7a5df73139b4ddff752b7a37963806fcea422f0cf23b8153b84e8dab1ed8169e51cce105c75c255d6ed91c03955a06
 DIST genpatches-5.10-30.base.tar.xz 991908 BLAKE2B 524e7e66358b3bf311f1347e6a8c8daeed82e6a71340e51157a207580e4e028f230caea696c1e611d57d129113948938a62ef105adcf8f09c5041baedde93aa4 SHA512 3986617d71cd582ece369693624f0013cd88b57a65c3a051975da30931973b161e01fce104abc6d2f08295a2c27e536b98782435c1110086175c7fd5051d62d1
 DIST genpatches-5.10-30.extras.tar.xz 1772 BLAKE2B 7fd98f16922f7a3ea703a5dd2622152b761a47fb7da8a108281e4a9ecb37f9295347a23081b2859039b8b47049ac530d74a05358b7fdb4a8c9a97fffd8103c44 SHA512 ca23be16f47ebea149496eafb0ce9c6068a3a46be01abf9d95b5e693e5a5063e7692003bc23658269d55f923233f1124854515a3f35a94dc385410c6978e25ac
-DIST genpatches-5.10-31.base.tar.xz 1031500 BLAKE2B fe484cfb72e01fc14720b118ade769fb6f74c04a8abffe1a7da73cf57a895395db7249fac2276ddd2b53bb9e087214c814547133ee84887ee889169970e9964b SHA512 749a725e9d8b942f316501151c10146ab1d8f25aca08b56d07c1096fd2d66f537b513f3b41a3f562bd2a78ff0bcdba13a453d377412d1e72dd4ca2af8c2c050d
-DIST genpatches-5.10-31.extras.tar.xz 1768 BLAKE2B b81ec73dbe1aa7da5ad15985b6a753db57095233f112ce323c291862ae85641dd9d8bfe4262dc7e4e6fea701369cbfbca1df213452627d79d0e7279e26f6e426 SHA512 a01e49ea3bfd689c23ee063d6f35ef7f8ea1dc67551d1443fbc2e7bc4c2e6cb265a153c881fdf87cb8a881bee911fbd815d7509167363fadbe9d158f74d84940
 DIST genpatches-5.10-32.base.tar.xz 1038952 BLAKE2B 0414cd3c9ebb99fda1eb70204a83388d2f1439dfd0cadb2e08bfceb002a9ff34685329ea1108646cf08f8a1a1469165444baab72bede69724d2ae32f1b1c1f9c SHA512 6aa75e5481d038b8e2196c6841c88ad6f3801ceac0f5adec68e2f461d48ceaa9f6a964508adf4a8fc8720f46b71164ed5344b546677fe32f7c5e6f69dd30541d
 DIST genpatches-5.10-32.extras.tar.xz 1768 BLAKE2B 3177bae554ac8e5ff49ef98fb594ebab849be1e2b639e22bc4412140f12cbe93177553a0ed404c176891a67314db3c468852237ad7f7b7fbaf8039263a51f483 SHA512 f13419f37e72f3eefdf2d3c18ae68060c45a5f561dc4e493e331566bf718d40cb89f1a30f88d6563c8d834b781d256977a383befc0b0b397008421010aad6ad7
-DIST genpatches-5.11-10.base.tar.xz 410388 BLAKE2B cd23030c9a62c45f3d59e7d071698ba00c5de7d958eac2969538c2ce3e0956a610abc6135157a60555ff8cc958be125aa43568b7d8d3f11138880c3ec1e5e0c9 SHA512 430c8f3d19b435c72207593fc748be93c4bbcc56f7662859f229a46a31f346ee89612357fd7d7657e4a6863e823221c210695cf94bbb1774cb6c596abc83c4cf
-DIST genpatches-5.11-10.extras.tar.xz 1772 BLAKE2B 1b1bbea48041fe9188a2d8983d2bfb37eb98cbd45ace7e9870b03f30a5e5f5a5c5dde9b505dd4a1885408366b7a499df3ac6f46b1aa55d2861ed32c5dc69f325 SHA512 71163faa9bd807340009e65c752b29ff9848d0af7a9f77ee794de2e9db2d8d004155b0626f41953e9b25b7250bdc355a5fb2ff5dbcf947bcc48993ad4d39d67b
-DIST genpatches-5.11-11.base.tar.xz 410528 BLAKE2B cdc71103e3cf40231cddb71f320c10cb2f948636fd48d1d1df66d6cd535b2f291f22a7da0db9b8fea40e64ad503abe4542506cd928409cf1ac0c8e0944a44435 SHA512 451628c197f3544438f41fd5a604d451981c4e352ea40a53b60492b6f1b57438281c00b0209064cd7a46b57a70ae307a2108549cebef8574955fe0b66d277fc9
-DIST genpatches-5.11-11.extras.tar.xz 1772 BLAKE2B aa1f6397aae7927d1aac1d29e98d8535b6e8f7b2b6b2009594497b846946cb5dda2dd3dac69a1f29989b54aa2ef9e2879418145a525865179f32e7ab76987e66 SHA512 a72b4fb93e09919aadc9c1d306d3817135f3e4160e1b10f69367e3cb49b1502706dd9cd6e399945f946cbecf047d53f8100459acda04dce231890fe9fe212a08
-DIST genpatches-5.11-13.base.tar.xz 437712 BLAKE2B 3120f9e413b8bf9c0630a9d11eae4c77d0162f67e1b84f9a84b3ea9321ddda5ce2872d61d9451bc363ff23c3fe8bc409693ac903641ca4f1e42c405099b77fef SHA512 7c2488f2e5e857b50f5616f90f743df308686d5e671cb2186bc647ac74e79eb04550d7f6f1d12623d847cd168dcbaa431bbdf128e57863672b084addf8ac0c2d
-DIST genpatches-5.11-13.extras.tar.xz 1772 BLAKE2B 86e00dbb0dd3a48b83fc4c73d6c10f4dd0031bbb34a0f1b0e2cbc263ad6eadf55b32fff5e4c9bae5077101d90b2fb42758ad5517004a57661f2befdc745576ee SHA512 e8233834781ba3e6582ae26d8bef09490e755e9daca0396a8e94fe3dc65f49c399c422b1143a00eeb693b2f6885ade600d599c89165dba809b578d601aaedda1
-DIST genpatches-5.11-14.base.tar.xz 512392 BLAKE2B 96c67f4b7029c2368e14e3b02dc45dbe4e72108cda692483b32f6e036bd27e82faef0a950e9ede69bdbd8152bc2f88d446eaf04055d135f654753074fffb1ec2 SHA512 6ec28a0c1084046ebb4d201a550866a202d6a2852f5ffc8e327861fd8e964a22ab0a565fd99277010fd2d6038fd0d81f2bd126faa78a351d97c7310dd30904bc
-DIST genpatches-5.11-14.extras.tar.xz 1772 BLAKE2B 811235dc06b33befddfc22a9e018d1e5447fcf361f637e3a58de2c14fa5860fd8ce027db43892a332eb0ffa99311a357b170ba2bd37a7a4c4888307dd8cc6354 SHA512 0a8fc3dfa7efbbf393b1f2ae65f6cc4bd440a5e4bc6a36eaacb5ca25cba5a154fd19621124c025143da1ff499ef24463efd58437b76147fed1bee7e4ec1155e7
-DIST genpatches-5.11-15.base.tar.xz 556712 BLAKE2B 1ee9967fae0f563e6a7e5d37efc9ae7d9606fbdd2f8b7b455588a854ccf6a2c8b5c6c82d511bc8fc62b566b666c299106ade8a7be29615b8cbf61e67cace4d1f SHA512 d3efc1a42a5da295c732d7d022e6481d8045419f9d95fcf543b9ebd3f56f25d26629acf82d8027d635976fd869bf339bade23d7f1f0a55b364b3d2002a654c52
-DIST genpatches-5.11-15.extras.tar.xz 1772 BLAKE2B 235c443e234ee51740bdbe05f68bc62202b660e5742841450ea0aa231519dc11f1b6b2cf3bc5817d12dae04c419e20cc02c46b63b5c639b1fdea49fbe4efd2f1 SHA512 a463e77a352a54a4446eda32085dd5dcf295b1758952dbb4b18d7dadc2c17c6f528089369882e38350b1950bb3e405e3d59e59e55a1b4c1b2c0866e1a7e0f82d
+DIST genpatches-5.10-33.base.tar.xz 1088684 BLAKE2B a3d76185ce3e0cd6bc769ce500ddf041fd5b554ee4995b05f823e67adccbf94a6245e25c06df2a3440acad7f4fe577b62048f6e431c71defcb21e1a9ec9affc6 SHA512 119d69d2bee6944ac90bf882faf48402e311a084d43e6f89c6ec8bd43ae3701994f7dbb44170eb6f2d22b30a3c8560ae117892dee478d10818314c0f1ce82e5d
+DIST genpatches-5.10-33.extras.tar.xz 1772 BLAKE2B 92bf4a1dc1551b703096c0a54cbaa0dbf0ac1c012efebddb78671231e850b7e05162c48af81eee114b68495338562b04a67486fc9cf142ee82465489c332707a SHA512 f369685fdd2ca7a1d9385d8e304c1d1e9dffdeefa22b8ff0cd01bb4a258ba57b132e93caab59c72829419f0cb92fae9b06e0f6af638e87d8935a9e0a3ea6c2e4
 DIST genpatches-5.11-16.base.tar.xz 567216 BLAKE2B cee97030c5e59b9d7eea622bd4b8d99f8ec86cfb5e559abcee5184d0fc9acecc5f3b048f0c8f8949f5ea52169ad60e182c2239778d4cf758f41daa1cd593fd71 SHA512 f3d320de79222c26d5fc16030752fce85d3b4cd2c9a769da59aec64f410c1a63f76d7c4c429932a046a4611a12fab2c2f259f7ba4821b7381d1e0a7a2c2df9d4
 DIST genpatches-5.11-16.extras.tar.xz 1768 BLAKE2B 12e78dfc00d3ce8e0b9903f62a6c4b1219e4559a9e6e736d5e4f807a429d91531d39e69f46667297f65824a074af4cf7665e741086efafff83bac195fe649455 SHA512 091b3f9f3589a098c35c3172f1192c56b774f6fcf90c30230a4a6de237db14895f13a75e51324acf83c5b5d8af14f636034eb3bbb33b6070804adf62ab7ad194
-DIST genpatches-5.11-6.base.tar.xz 294752 BLAKE2B 324b5e8647c47b3d876ebc500664af314c7288966d4b375858e66e3d71200ec6624ea7c1fdf348650e9a3780ec3b9058b8e4b2836d5f86ce15d65f3904a1a4ed SHA512 467bafdf407ad2752279935cf5de62de1e5db868efde563369ceb2dda73455a83c313dd60a6ef633fa13e60a69c538de833335b9d2c95ac2d8a63d48994c5958
-DIST genpatches-5.11-6.extras.tar.xz 1768 BLAKE2B c9244edc9b61c2a190c72c93a33ea45144a788b9b331af3541c05fa200e706961471472fd586f5d6ea44c38858f62d65e4fad5424e27361ba27baa49e080b3be SHA512 db9e2da16874304103103f71f87799c4c7799ee87ea6343b0603d85cefb4ff41c49309025e4c74a870d88337caf0e478a73c8d3a755ae16760f9528c8ca77de7
-DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
-DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
-DIST genpatches-5.11-8.base.tar.xz 399768 BLAKE2B 13df51c5a4bf35b2a87a0a5ab86f94f8d2cb012db34b6bbc2fab65f4901a8066f00303408aa864cc735bfdded7ee27bebe476533edb8758b6c86b38d770f26e1 SHA512 5a0ce9facca4f5fe2d2d469e424cb35d77630151dd67733260eb759c43a549d63bf597de515403ef3ae47e020540d3aacbe52c28301288a2a4079a43c9ec4566
-DIST genpatches-5.11-8.extras.tar.xz 1772 BLAKE2B 2181060dc6ef787a5bb82d614774a576218291f822c968321744d0d81ac0b07919f9980cfb9b2f858f4551c2d84f7db9f58d6d85158cdca90454a8f17674ac4a SHA512 b507ec60456d1e95a28a4a7710df7b7187030444d21d9f65b3f5429aefd6851c31b2395ff30c76d257ab86e766d5bf7604befd3c117b624f02a77aa04ddefd04
-DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
-DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
-DIST genpatches-5.4-108.base.tar.xz 3195852 BLAKE2B 9ddc7aceb4ccc71a9a479d67b81945da5a360f863706a7c5d14bee7c7048dc2e4c7b6711e1afada810499a447c5d96ff34031bf5fd8aa5844f992e96cb7f9046 SHA512 ecc529d86c152df564829cffcb294c6f8c7f6abea013b2e7344de8b50af75f0ae3dd6b8a6ff4e3530979f3e6486cea823d4833ce033ed3d32ede89358a29d9ff
-DIST genpatches-5.4-108.extras.tar.xz 1772 BLAKE2B 470e18f95432cf133e75508d5f0bbe2b22a464e1e398165b9986a138a1a396ca729d5652c36885948d7a3b1cc22dee78bb2690b99bb370bd0718a70c7bfa95ee SHA512 4d01432cbe8303fb1234395f7d06855c14f3acd6854a8cb38b5cac46f001d2ac71d69a9829a9b927da5ecc1d8cdaf4355e95eb9b5105181d91ad5ec0b106f6fa
-DIST genpatches-5.4-109.base.tar.xz 3231408 BLAKE2B 3823cb07dccb45ac11ca7c6cd19db8828f6048c18f66d81f232048fba774cdec93300f4a3fc60262a4a19436349626c1acb55a0e59b2b149816460a8dd38c8ea SHA512 4598f94943024e64ae95e56c0d34e71420c1ee1f38db7ba2028bd52b493469f0380e81952ecfb22dcde1d16fc0c182d27c2490d07a5d7232426b22cf03b0ea4b
-DIST genpatches-5.4-109.extras.tar.xz 1772 BLAKE2B a8a73fb000874269d37e9240600a2372213d026e74a1b5386ed688d9b35bc2535888a75aadc8760122f77d7b281cd859d3d2e0db31bb57078fa9abf4ceda705d SHA512 034f678e9d5b5e919e4e981e11d25187c97fc76cb787bc38fe1af3fdc6da6648d3e778c483cb1a57f862d69baa40ce5ebc1494bb945b95969985782bfed0044b
-DIST genpatches-5.4-111.base.tar.xz 3256780 BLAKE2B fa7af9b2cf10f383b81a8b9cadb2183a8f0227e00fc1214bd0e25df8bf58b0d0578024af9f6df6842a51b7ef7e6d7bb9b61577b38216d59113b53774e66bc681 SHA512 a9831a943e788fa479a481723f231b7610d37606ffb3af703906d88f52870159772f9ccfb96608c390af26f033b1b6e948e6cf7d09612e2e4f42414561fc036d
-DIST genpatches-5.4-111.extras.tar.xz 1772 BLAKE2B d27e2763c7e802ebbcce7e9ac6207a6e73d8d710873d4c4a53d0bb1db973904ccc8a17553d6916eb3211036cb6f2bf30c80864f1339c9e194187dd5cb5ac3a7b SHA512 c38e92e22a5a92af06eef3176ab793ad9e85332dc8e37ac2d32a86b22bd072c47e45d13a7abff9fd6e864c2c063676c5fdbb7e94732f431a5a390b9597da75b2
+DIST genpatches-5.11-17.base.tar.xz 626484 BLAKE2B 4b6d07334c1da48619d820b102df5bfc2d15113d97415e9ad789e8484a39a66509cc360019368834c525a66af0b577b165c5bb898756a60372f1bb21802ee8b6 SHA512 36ca2dcdccd03be5f3c3a350c4f721d5f00adda12c87ba08146b13fd034644ed82eb9e3151ed6210fcc16a37a7ae10d4353be5477a320110e8d89fff74218ec4
+DIST genpatches-5.11-17.extras.tar.xz 1768 BLAKE2B 2b8d33e5c6c03098dc43b95701937a3ac372301bdb9671a0e4fc40b9f8dcf2a9f6bf00de7f60d1136e3d904983273f17366bb4852e02ef229a92b166e37a30a0 SHA512 966c57720d558bb60e16b9c0f9d7e94e155cf1b3ee61c230b7c26a28757a1178e06a047edc5cd7b83bbd4aa31d6376156c390b1165e8b26fd6bf50439b2c16a3
 DIST genpatches-5.4-112.base.tar.xz 3278220 BLAKE2B 11c4a33da1081ce777019604d06740368895e74893cb88f4ba6e3988fe3204f2d5a0ffe2204f77aed427ce8decdd77c5ea7dd374e893cbf7ab346b8fb87a918d SHA512 d2c5378076390358ec60346e832a9454f1b61e67c68da4c6652d7d6cfa29223417fd0b95ea526cead86af5692e4e702a0ee5a169a894d04644f95bbbdd7d727e
 DIST genpatches-5.4-112.extras.tar.xz 1768 BLAKE2B 7f77e833bc17035063b98d89135455fe6200eda135a92221c0f2eef63c6b41235653a8d11a7c99e542010c2195c1af8f5ae84a7da27d159fef67be5192537722 SHA512 6dda1c917736f8a45b1d79e3d7f30b243f922b274425975f520d1d2a5a0fb95b0ab242e0f24bd3a5e0b09e8eac76b6f71eab94cbe1747e3162ce85d892a6da5c
-DIST genpatches-5.4-113.base.tar.xz 3302232 BLAKE2B 106c01266550457aba13bff1ec60b9d0cbab403757f780f7e9b69cd1697b28dd6624fbbb78462891bf8e51b4eef2fb1d9c0ed4cc8909996bc629b9ff5164043e SHA512 5cc835c4150b4a1fa9ac8090143e75274c025c43e4998748f056e5d0fbf048a354f20bb3f66a3628772c1ab2ff9f6da1b4c7547d6bd6543e5a299948a9debdc4
-DIST genpatches-5.4-113.extras.tar.xz 1768 BLAKE2B e2546e7a593e709e3994efb176853f8212a33324c048412b14c037b0f55b6d216bdb8231764066250f1e6b96048ba2f8ca743f51041e71c1d512741e0b58b069 SHA512 21f45e81787d150936dc4a330d28baaf372b7f9e241b93739708667107cb42c525a8b97eba4afebe3638204f67111ce14d90cfa2876e0a67d06840d4606f78cf
 DIST genpatches-5.4-114.base.tar.xz 3305288 BLAKE2B 345acf1ef846178a5a70f385f3d9c2dea25b1892fb755cbd43c78f3aa553097294549a5f24e9552ab0d37d5086fb58e98b72db5230ab8506e725a0908edd5143 SHA512 fdbb6b9c10eafc3069b72460db1209843ec4d4d024548a384dca72592e3c6e5e4eb3b9b34058266499da26caf0a168a1469de7bf4934e0855c6a5db1f4d8d69e
 DIST genpatches-5.4-114.extras.tar.xz 1768 BLAKE2B 506b391e93021d06af44ad90a1da1937aa45e51938220d9de89a525a073cee83b43966b546cfb6dedcc631a07134e55acb7e208a64a117d41f88db99273ba9a7 SHA512 9d13965d4a2db92647946c4126bd40d5a05ac0d848aedda82a6ea8a19f562ec1d8debc13594332cb1fc2a3bac9df76b08c5f666d5bf79b4285483c0d7ca02ab7
-DIST gentoo-kernel-5.10.24-1.amd64.xpak 64100066 BLAKE2B 0f18bedb448c5c0bd8165846a190278b9a96264b04a09be97fc51968fd74f66f29ea7ff845ac874748c1ac60c4c4a4aa4a72d7a273e84551fe09d870715407b9 SHA512 414a12ae14da6a81dd0dbdf80f05e511d686bdba7f5fffe5c754144f7dd9245368ee3a1673df16e996e80985b7f435613d888c5e5324d967dd622b9db03407fc
-DIST gentoo-kernel-5.10.24-1.arm64.xpak 59359560 BLAKE2B 2fb468b36a4886a3fd48420c4b6e84cc320bbb83c35d59298f751e272135b9eb81a05f0fa528468ee9d3d36b2047bdb86867d99f97a3db6d6de47aba5ecb64ea SHA512 212bda91b7feae5f307cbbac95e0a9295dbb0f371d25b120f76263dfe49aa7a53be1be48aab0ab25ae675e974f4ff309e3803d86b407dad3e97d3a141ac54dbd
-DIST gentoo-kernel-5.10.24-1.x86.xpak 57056253 BLAKE2B 5925e7739cda2fd853d919a4681f28849afb9552acfd7cb91387828d6c7286ce9b1b32b93e55339311696e5bf62974a2a117c668221fca3ec062bf574569837f SHA512 395019c3a8d40eea18d92db2507386bd2202a8f13e25bb7a247724820a8f0ee854a05c6e999129556e894443b011928e80fa41612bef6a6c070035ecf11c749f
-DIST gentoo-kernel-5.10.26-1.amd64.xpak 64108960 BLAKE2B 704436ea8e692dc3d646b8f8ff624b26e2074afb848114584c4d79a8b42c7daff79ee0ade653aff07d6e693074e2ebab54db6c4cd81804dec6a6664a003dd255 SHA512 4bc06b586f6ae2ced42e42fe117dfc0505263028b6338e283a55159afc3d0a8f7960f50b8305b939362e575d13ae85520fd83d2097aebb55ee8165e0ab16e27e
-DIST gentoo-kernel-5.10.26-1.arm64.xpak 59322442 BLAKE2B 98e0be8da3142cf40d78b9ac7884781ae2832bb1f0ec134b21aaeeba61454de947990a64de66dcabcd7b9beacd650b37a2376571fb43a8a1aa9a522dc57690a8 SHA512 1471461a15bff406151126cd65f158bc7f6aed993d6afea19780c7de3e620fae43283a630e8100c58dee09507e928605dee18817528beb43e1b1dc6450f2b1cb
-DIST gentoo-kernel-5.10.26-1.x86.xpak 57063604 BLAKE2B 51802d43ac1e7f8e36aa7aff4abc3a1d6924aa01f9210f5fdbfd0573b2c37ae2f9a57b7bb275af3bf51bc1846cf409667ec0b1b7659ac9de1f07811d8680b8c0 SHA512 0c6f362201e64f3e07b5dde92e518af613496009edbceea3973a42ecabb817a36053869fe37fdd96078b2ee2532c414239e15f7aabd335c607c421b5e8029ab2
+DIST genpatches-5.4-115.base.tar.xz 3335100 BLAKE2B 49863f2b97492223e0a42eecc0dfc6b53ed054810ec1281f064e39cc47e45b4897f795f8c2e43dcf3b974531221b2275ab26592914c845f4c18468be520f5f7d SHA512 b3b8b279a8fbd0cb58f4ec18e6351a08083fe06bde33cc53f378f82757ca8f004c016a562dedd4092412ce41be62f6f58a885deb12af87ffd288a597e9eaadf8
+DIST genpatches-5.4-115.extras.tar.xz 1772 BLAKE2B 49c7ee35b73827fc454adf526f5ceed9f7c71b6ac2c2e954943142999ed7c1e7a58a543d1519c1d3d6b7e4e9aa3970094650663f10b65408414155909037b23f SHA512 d45ff15542dd01aa7381e992fee90391000cb42d421fab243563fcc547acb8576ab74ef78bf2eb1d81fcd327bf76ee3cc3a6addad5f5ead7eba47837d139792a
 DIST gentoo-kernel-5.10.27-1.amd64.xpak 64103968 BLAKE2B 68f1d8dda132b7e808f2becb52f9b035c12f4ad6a353bfa51618ec2ba24f527a5c1c3f4244b1cd1418cc34041d4114703e44c98cacd9aab13aa3e7e9941d2abe SHA512 c5eba8f18288936e621956248b3021c7d3c25c0a598ac1f7301287e2ae5bbef29c45d29f0b8b347dff99dc0b9408fbb299162998f4c7d85f330aa5526e4a6eeb
 DIST gentoo-kernel-5.10.27-1.arm64.xpak 59322840 BLAKE2B 35b4da2456931ff3316cf424448991c96d580dc7d63c6211f72b630ec40b27afa684c3e471995ace7d33c535e61c3bcb2443bef6a780b7ce1450e9e3abe7825f SHA512 c3465d647975785093fac8812d4cf2e7be9e4ee0c13afeb92ace0c93f54559c030ef5b746e169ec362b53d9d5df1bcb6c3aa9869acdda56c792803fc3ccde7c5
 DIST gentoo-kernel-5.10.27-1.x86.xpak 57074563 BLAKE2B ec113b1cd361f46d948004f58b0cc81edcc96d68fc5e949a6f4c0d4c634189ad014de8fa028d9282c89f8e75ccacb95034c0e01db21f465931e2ba78ee81f7ea SHA512 c1892e2fa4db321572f76f92231e9f5b3fa4a88a8af17fa5d4f8d754dd565c40eaa8f83dd2e991ab5837d821abe5d7f012fd56cd793f6e0fd6b3f2f78dab1621
-DIST gentoo-kernel-5.10.28-1.amd64.xpak 64327405 BLAKE2B 85bfbebe3f8c8aa7e26559c452ac965a14405808ead2c7e622d217e4bb1f216460f82286131e4f263841451d4df4c2cc6d38867dddce3ccb4e25d230c46f0048 SHA512 9d32c7e93802b795ae95b219aa715711c6427a3013cc77c4e50494f6c7c42ab6a13ebd1e205a84834da70e02fdd31301a2f409b88f3bdcf7d89cb5f24976bbe5
-DIST gentoo-kernel-5.10.28-1.arm64.xpak 59318052 BLAKE2B 3de4e208154880d34af7b8cd583a154d68606e41c9ee498e56f549928ee07a0576eb9883b7c7dfd3c786e5d55d5265f00a256686bb1a4047b4fe4ab4e5b6e697 SHA512 6397018c98d163f23b4a90489f1be74851a2e1729403d198116aa677bb7a61cbdab153ca58963203722ed90b5915be956431e27a8793580a7599f73d5fe9f90e
-DIST gentoo-kernel-5.10.28-1.x86.xpak 57242375 BLAKE2B b2b67edb4057141558f15cf4a36c36805c0e4d0831627b3dc2757c2354adf1432460ea196194c89c3412f772aeb20c547d1e800e297a19422d31c23d52bbca14 SHA512 6a6fc6252a901675807c5639c5030774c3ce86f5bf9caef3f9a9154bb6dd313e4d0c43e8a11096a843fb80c714fb618f49635d2398af0ea788624de2f65539e1
 DIST gentoo-kernel-5.10.29-1.amd64.xpak 64314691 BLAKE2B dd51b610e9229390188e000a96eba3a736360ee601d5089b100f6d497bbb2bd7518ae666c8c2d45ac163a3de272f6d4168f3176a8e34f26a1258f304e20ba56d SHA512 9f81e808e66eab49d4bacde5d660ab7fe6f949270c04f136a0a337fe71bb024b73e8090ad55ebc34e8a47399d7bf01d56bb54f0cc967cfade050d83d030123f9
 DIST gentoo-kernel-5.10.29-1.arm64.xpak 59322979 BLAKE2B 4fafbbaa1a68759e6160af99108a96be667c524a92ef28a7b24326a8fee8838cb9830b3b7772b584541611ada0b4f2c2d427e86ca20860b0bfe73fe33a0ba27e SHA512 54cbd04255d221a380d34c16e63ea18866dc2e287506bf7b4892866a89481a980e569e18c1c10703134ea2b89420af595cdf56e38a7b90c0b62a2b5e3e7e143b
 DIST gentoo-kernel-5.10.29-1.x86.xpak 57248683 BLAKE2B 4b803e88b396e16b80dad57bd50fd2b4ff952a5a353992f9da69001a6356a6bf4d5e32d4a2d469338d1f9694c42b2b8fc3191a85a9e61c3d3e85e138b79e37f7 SHA512 29cfd3db63221efdf962a4387a8d27f61ce4980d582462d6238c84fea751c2196537d0bfc763daed889a89067f0b0db8b6014e343c3b2d18ac8363a29b36078b
-DIST gentoo-kernel-5.11.10-1.amd64.xpak 64501303 BLAKE2B d1bd941d62520fe0a2b7156a56ba43f2123ae758804c361d3953f88ed01079a8d9925770d9f3a7485326fce555824c31fd1ac1e646f8134565228c04e36c94e9 SHA512 b54e2f095933d34c795e4a3d239c77db09fa0392db89252775d4ce7b04fc4f0e1129a45ff65f5de352dfdcb7439659ec17893d9891be69ce127858ea112b0b38
-DIST gentoo-kernel-5.11.10-1.arm64.xpak 59801228 BLAKE2B 1ce4d7955ad3d32abe57ac01f008d7dd8b811fad2658c09b03069bad693d9b653262e0c69abfa65ff1ee2a2117cfc92427c644de53971fa70ce4b99fd360a28e SHA512 2375505cf7ff4ddeed3f352049fd6b041b3449e9cf021fdd8bd59d7661ac17434a75e5e3aef85134185a50ec5832b11a260ad4f4e395ab3d6db4b95664b041ab
-DIST gentoo-kernel-5.11.10-1.x86.xpak 57456795 BLAKE2B 8245a1da8c783456bcaff4a5ca2ded9ffadf03d2cf858a689ee9a5003ab495461f3640bd5ac9c16bdd5f7e7dda1dacb73b512e065b2c5c7038f5422ca9df599b SHA512 af4b8126200b45faa5173bbe325469e6c0f233ff70f2da476d059ef2f92f21d2e6931313fb6d43b4cf6c47570f54b305b47595067ca3fc083b98864959f5acf1
-DIST gentoo-kernel-5.11.11-1.amd64.xpak 64531577 BLAKE2B 2c7f94f0288b77f16c1b9770e5a31fd7c50dad7c9dbfb5728b348d19c2c8834a4df9f506de04ecc5729cbc5c39468e1afe69db2c8ecfa9d926d051bb4aa6f1a5 SHA512 a35e580c8aabff1f39f177a3c01ef61a53f7d0c5541585f444ead741718a6822074c5b8b29bf73ebb4c954baa4ee225a4d547707fe4d8f04007c390c4a05838b
-DIST gentoo-kernel-5.11.11-1.arm64.xpak 59829994 BLAKE2B d12c066c27cab9480f9341b5fc1b4b58f439e0622b8b491ed78c56129becd8c858ea1278ee3a164d2de8ea7f9dfcb7265360478db92c22a8f5c28ed11f2bf3fb SHA512 ea076e166644984bb88209ff43ac566d21219e6a4f7d4cab8750ef22038822b50a3c98897f62d1761f33e4acedc0b680b31885bace70844387e68d780f94e775
-DIST gentoo-kernel-5.11.11-1.x86.xpak 57470778 BLAKE2B abf3c054de67118de4adf50121ffef53ac206e7c439d6b4f71e2044573fbc8f42ece325c18c1f706c21d2e87472c3419e9195058ba8f4eb3e44ccd7fe8a443b7 SHA512 1b01790396650f6db68621e1febf2810835a03ce2f5a872b5f8d9e5f01cb6cce0bf5490e582c4aaa5aa953b6ac3a125a450c2911ab0080d20df59493366bbacc
-DIST gentoo-kernel-5.11.12-1.amd64.xpak 64702763 BLAKE2B 2e94dc30ef2ad0728db804b3f24febe8996868b4f137a34319650f93f848fa94070224e465f7d9b30c308a5e9de97ae9c0aed636075f7f11a53b59f2f071e0bd SHA512 f64db00ffc9eb29898017db60a4b7cdc628c5192ec92f2e7835918ee94e9279b45677b501a50205ceff36cdb59637a1894d346f062d5e403480fb151bea8e7e4
-DIST gentoo-kernel-5.11.12-1.arm64.xpak 59788658 BLAKE2B 826a575adb837ec51cd1169e5f56218b24a3544621ca56f222686ee982141adab992f555f53eb98f9099a445aa5693c238dfe11c55895bf3f2fbe1b620296ac0 SHA512 47f0072f95e07197248e90d70fefae33f6c2248efa8d5546a0aea27229dc1bdd5c4eaf9263f8a3da24a16b56d2d25bbc86f905258498fd8332470f255a1df3ac
-DIST gentoo-kernel-5.11.12-1.x86.xpak 57631535 BLAKE2B 487b8298e9053061d18dd7e1d4e7a68f7ef9aee0762b48779d3c28ee5fc76a620941c449cb3aca38623f385e8aa2ca0a2992820b61a33bbb2233b4dec2ea49c8 SHA512 4afde6eb532978e59665b213280aa8cddabe440257f10c53357ef00a7ce576daf89e3a42b8e73278bd8a20561977e3c23b487ca13c165ac61aca1b4e1024f90d
+DIST gentoo-kernel-5.10.30-1.amd64.xpak 64347202 BLAKE2B 85a0fc2d2df1d1a134738e4712c3e1477062199ddb56437507a7ecfc0bbacdfff5e6794b4e547da3494b28016db95616166f75fc8dd3c29aea21dce464658da7 SHA512 d246c134815a02ca95be0c063f170a220bdcdc023797b0dd6a61c17e0336eab194a0c50ea8580bd71e3fd1ec2fa8b7fde97d4eebbfa886052b1bff2d7ecefb04
+DIST gentoo-kernel-5.10.30-1.x86.xpak 57245779 BLAKE2B 22b2dcaecb0fe062e1ecf61aee6fcb7c27d23ebd2d858bdd4933453724c50af23197635827a262e5cd8f6ad045919a3670d51c5c3ac63e6096d109ff4c44b99b SHA512 3a0e669b9c7b1f7e8207c8f8429beaafb0a440b4680206efa2ccfbebe3717e1c1b6e7151ebdad32a4c6cb9d6cbcfc43cb271b47aea7f27790dbb92f3f38cc137
 DIST gentoo-kernel-5.11.13-1.amd64.xpak 64685029 BLAKE2B 7d6794c5fd15434d2ad93d36678476e4a6aa3ad9ff77140a0bc8d74b0c87155898e8f1f76dfd40f72c878d9ddca7b7f1a9f0d4be2a600c5e2c18a77a3439e9d5 SHA512 d8c0fb975ee35e6d71b3b255800179805c9e70bfa7ef5299a38145c6cfd4f60720281c70f2d16a409a10c4ee6c6f26ac2e0c3151b114ced91c747371b59885b0
 DIST gentoo-kernel-5.11.13-1.arm64.xpak 59816443 BLAKE2B f3bd4b929cd103f95b91f0c0f28f324f8e316e1cc4b310742d159b8dbdb6c288d9424984e0859873924ac7eb34f12278b2086ad48fbf11da955f0b390dfda619 SHA512 6aae6cd29857eb897a167e359f9628692803bb75a0a1f235468a1b95e9c2f3d9525f33d6673b5c12edb5d9feba29210a79d8030d151a5b7260119a81eef57e1d
 DIST gentoo-kernel-5.11.13-1.x86.xpak 57618749 BLAKE2B d7e3d71d8eb7c35b4f86bb95cdf945f4fa7eadd0b87e380ef37f3b63385a15566246e91f12bffc0a7e3e42285f702cd99387fd9b7e11cb59fe3bc2a9da83f160 SHA512 51450b58469fdd8b663ee7b997b392232c658281fd243c2508f8feb190a74f5ab952b1041e64a9b4204cc1e08fe328f06262ca46966e16a0f0c962b389254fc1
-DIST gentoo-kernel-5.11.5-1.amd64.xpak 64924579 BLAKE2B b4484bb69d8355f63acecadac5a604ab57f61ae87a4341cba16c6b3cdc35d19c64c6d8042fedc69aa1272c151d09ba5957b9b26f2a6ab067a46451fd0a928b9b SHA512 218d649adc456f13055e7ec7ce3de1ead2cfdcc41d6d5d023de67dcc7a21679154dfe057dcf72592ab7a7315a8cf1a4d7a96f7904c21f0f8e219f3a277dae21f
-DIST gentoo-kernel-5.11.5-1.arm64.xpak 59869818 BLAKE2B 26d4431d1e9e3dd58f1d352ab872cf2749d64ae768a114d42cf1bf3ac342c9792dfa19ccd1bf502ea26ee99a0bb00e75783b2958726d5073d8f69c3f66e29a9c SHA512 ea64669b86cb1a3c86f92016f8a9838eabf1328c9a996084c8e8226b736d526b7d246f42d24ff9d07d2d0606cc0db914251b7007caa74080a482c0bcdd4a0bc6
-DIST gentoo-kernel-5.11.5-1.x86.xpak 57891193 BLAKE2B f9f1eed75c7a81067994fe07a8305e5d70001c4ac969ae4d39d222960cf70c5fe5591db0a4e19fbaca9faa53e6dc1206158c0ad071cf3907761a61b00eedf098 SHA512 9494f10ae5a2ad3a0232e9eca5cb16647e4967f5ded3b45b5752f2e380b1c21437b9239d2fc7336cd84a246b488dc405e389c844263834a1feeea9257b2f8779
-DIST gentoo-kernel-5.11.6-1.amd64.xpak 64926961 BLAKE2B 3134919e40bd922dc334999c7b32d5810779c7833b2719ba0d5b2fb975afce70142faa3dd047c73f12384a74aa1eafd8e9900357feedb58dc8b074b563a61501 SHA512 fd4cfb53d2ca7c2a4869951c1dd9f32fe7878274d337b851b5dfd8fe3ab2bc7a0ec41164441ca49e0dbbde93dcfaa2969c1a60ae529b82c47ad7c1247be1b21c
-DIST gentoo-kernel-5.11.6-1.arm64.xpak 59930936 BLAKE2B 9008b2da3dc3cec09f7835eb96ed8beb32c33dcede73bc696ffb50468f69a7d30031545c11c63dd2156c82a9df0c39fed81466946b9f2788c1e6b6ecbc165931 SHA512 3d7d080fcce9cb5084fae188eddf4c0c0bbfa5e946f5e021a82f4ab798746bcfff6dc25cc246a0e31c8ea29d2fd80d184ca6332f40d96bc805709843edb4e497
-DIST gentoo-kernel-5.11.6-1.x86.xpak 57886583 BLAKE2B 6199bac90efa9c4d9db1b69151ddef53152406a8e8e3a67124dfef3abc4334ecfa387f70842c10751ff0b41efe9efdaa1aa0db675c86fb6b4f41f90ad597b3d4 SHA512 546185317fad3bac4e2908c9685b357cbdfd311ad4ff378b1d99c2b0212d4a5a68c8148efd48441647363d087d223a87ca2b7c8e6a4286513ca9eb9a74d44c72
-DIST gentoo-kernel-5.11.7-1.amd64.xpak 64458248 BLAKE2B 119a8440af915cd2b6040b6be0905614632bd6f99fd9f0d8cb3d3694e2a9720fd2b3623f5572441b570c1a46f1a3f49985a4c2f66107d327ad95761afcb6970d SHA512 4b03ee42ec8e25c286e85283026e3284509a689d1b91f1be3ec6312a8a85382a5718ca8f1c8708ec57118d2884bacf3d456c7448552390a98caefe16124afa4b
-DIST gentoo-kernel-5.11.7-1.arm64.xpak 59843600 BLAKE2B de90e638a0f5fd26d8da66f53db20064dc3f2a236ef6d25018c669a47b84363de63ff012899014ad413e41b47a166c00d30fcd7dfe95974a3772634c3f8e39aa SHA512 149f43424e6a6238ff4ff3d493c480d0c695a9e90230f68cacb5c3b80ee328a17b253b2817fff4bc9cfb18a9dfb51472f83943aeee8cd94180528fd2b564e8b2
-DIST gentoo-kernel-5.11.7-1.x86.xpak 57450576 BLAKE2B bce3c47f76d16da2b6865a0f890d34ad6b4cc9fb0e129c7c458e1aa33e2110d8633d3279ce8b50e3d012acda8e219c574c9d952f98c2b773d0a8783224af5223 SHA512 76dcf77c7f46706c44f21e975cc96aa48037631ec4349e5dd15b9488fc28b299ddf75db2f2c2147f64a32eb37ed7682c553d0a6b9940a89c70e227a097d7f00b
-DIST gentoo-kernel-5.11.9-1.amd64.xpak 64496821 BLAKE2B dd1ec40c2ec9fda3670acb5386068ed6b816b5fec35086bc8885b20c777ddd2df5a049416584a95c9471a7ea93eb4034987d4d64a66c8fa623b333ff2b56a087 SHA512 ee6b5218d554bcfa2f61c863a4f01a996db36122239fd1ea2515ceb9aba8a70e23ceeb3403137b810b9fee50a00c561dbf802f87656cfb921ac77b7060018fd7
-DIST gentoo-kernel-5.11.9-1.arm64.xpak 59831921 BLAKE2B 377a1ecb4bf87910b54143aacb94eca92581b0e381db67ab1c4fbe7579354bcb07ad095ff6cfcf903782213620cad1ee302d4a22cb7163d1e793e49791345e5a SHA512 69b707dd8a1b0c9b1a8709f20734f9929fef7a228cdc1b18600382f115939afae773b2fbf754842d0e35ce13f7d4532e3b406176585d7d150ff70ffa4f362e69
-DIST gentoo-kernel-5.11.9-1.x86.xpak 57459994 BLAKE2B fcc91b08daae0fc1f95533c6bf3eb1778b2367a3f440c74c7463ce39c98aeceddbeca62573f4bac2d189b59300f824da49c57228d19ecbf34d3e2aabc50a7c16 SHA512 002c926c968188330e6ec6986920907a82ee5f5e5ced8345123e2135c040c9176ede73d79b66ce97afa401f75ceb46ae573bd1c8413f44922160a385e0cf60f9
-DIST gentoo-kernel-5.4.105-1.amd64.xpak 61143714 BLAKE2B 7b404897b1da5790dae7990a35d1ce8b041989d958a9ac9eb974b2e7dfcb5ffac177d1055bf6a228530c35e7d5471a946f38650633d7ffb6a5a3a61c15b1bd0c SHA512 73502f24aa6de2b31002e37c638fdfe16ad990666c76221766240ddba7da2e902caa609a6bede8f0832bd7c14b56df440c210890c16c36194471b9b36403e7b1
-DIST gentoo-kernel-5.4.105-1.x86.xpak 52996400 BLAKE2B 13dd3bfb78f48560ca8716f0baa2d5c30c4505c95dae85c2c5b2e7b116da182945ce878a7b7e451a23ce528b8dfa222ca485271c4c040b7dad0befababb78e01 SHA512 0841f2fe7f0910952b880dd5652934a8aa64a7dcae56dfcbf4a97ac0647ef750645f1b83e161f2db1c351a909d6e7a60c6228ba129366adf6f036ed1390f3e18
-DIST gentoo-kernel-5.4.105-2.arm64.xpak 56452913 BLAKE2B 40668123ed047a7a5e5d8489062f3d02b8b3b59a9baa668788a356624afe962e6424acf7f55739fdae7ec13b8ad0be8f85a63e7c2599ce9290cb80c822b9ee31 SHA512 e7c717d8ad8999ccdf25b14b2f8e94be91f8012cf97f0f5379f31dbebcf2c548e05ea6e39e871c3309ec4206bd268bec363fa515722ad1a584b552424959d268
-DIST gentoo-kernel-5.4.106-1.amd64.xpak 61146719 BLAKE2B eb8ae4d9042e3ad9e69a5fae488763964c257e7a78f3b08b8d7b8a313bcdb48e975c4116c9b8e68be42c45351e7035e6ab892e155600a0ac3560ae54f84f6170 SHA512 b823ec881b83f42e54e2b393ed5060d84a7dcf9b7ed3967dc43124a88548f834c3eab56a679b8277d3427e9e05601ea3b06e218fc9923b5aa39bac09774194e1
-DIST gentoo-kernel-5.4.106-1.x86.xpak 52989825 BLAKE2B fbcb31f68a1a03d1395e66c5491e35006ef642090d1c4b14892eb43d56b818663e40666ead8dcda0c0b7814739b41e3c4fa27c3d9a7ddee05a652f3560a1e3a2 SHA512 ad9c927f9b4311921de6c59706c84872a7d3955dbea393c11179504a730a1495981b473483e44ea204b003e6b8fd11b7bb6198c642b79191d39d04dc2878147d
-DIST gentoo-kernel-5.4.106-2.arm64.xpak 56398328 BLAKE2B 7e35845e10b6e299e951886ea8821afc700d89cbfa0552e28a50b0078c3a44750246b8c77f0ca409f7162a200ad7110eefe3853754f23a54506945194ea9806e SHA512 c45278caa7e4e6212643ea87029c7a60522308d65547be87276eb391af0890dc602c7c4c34f17406679b6763a3d38bdfde1e7d90f7daabb03d3316f773645a1d
-DIST gentoo-kernel-5.4.108-1.amd64.xpak 61175107 BLAKE2B 75b91a1bb41642cf4bd6dc193a802c220e8f2dedb640f23dfb0d1d994d724061c69d4356a78e1c5618236d98513c026dedf662b203ea4f08ede7128272653e4d SHA512 0ea1e7a04a3fb756e6e91dfcf7450c32036283d67d660c63d292849750562f26e69c2771b50308bade8d7a65bcc28e820eb0ffe781f981d3e13b6e3f0b17df7f
-DIST gentoo-kernel-5.4.108-1.arm64.xpak 56476237 BLAKE2B b0834e97fd92abaa2acf2887e9e2f7ead98a5134b2d789a716037cc80398bf260fbb4ea913fe958b29ea172b52104afa5b5786985337f5a4b84280be1eb1b7d8 SHA512 4ee727e0b0773ed461ca4756937e8b0c55e57ef81f33e87d498f64feed0666ecf24934c9a2cf371ad7100ea21dcff285ef3dec600da065030511db5b8ef4802d
-DIST gentoo-kernel-5.4.108-1.x86.xpak 53014350 BLAKE2B 6924f9905ffa7626b90eed819f8f9e8a7c71e67315f9ad0a25ff31219bee44fb58b382b13324f13dd9f56f43ff4b2a56c91f1689a585dda2dfcd7fdbd4ac3f27 SHA512 c72041904e43bd11c42cd613f957c1a838f4bc4abe492712901a3c690d58064e96ff6094594e9e9fc1299f2265c63628b1078f97c90fdfec17c3fe3c63f546cc
+DIST gentoo-kernel-5.11.14-1.amd64.xpak 64686322 BLAKE2B 2745c0f99d467c891310be987b9e2ec8064d63277fbfaea43f53e2813755f4c6b5f0ec8d8431eaa10a13ffd338d2545a3c6b7fcb4c149c5a87ced8ae266d6912 SHA512 18bb1e1844cc9184e520da37d914ffe811223a451a14079e167c8ca56e569080614e51bec978d7b27f4cd9491fbe649222d7fac37869a372d696f1cf16325941
+DIST gentoo-kernel-5.11.14-1.x86.xpak 57630219 BLAKE2B 6740a21c62ccd56699f6df096112346d8f5d581689d7a604b3e2bfa512d29df73fcd8142c7f20df9df6a4bd048c4980b2741392582b25f5a291bc4c668d1e448 SHA512 f2a295092146aadde77d89f8e539a8d65ec28397a41ce4ddd0bc7a4c8b11ee9a82160e9d5a747cd8b7a99f3ebf1c42b444939f0a1042c0807a24034f82058255
 DIST gentoo-kernel-5.4.109-1.amd64.xpak 61197533 BLAKE2B d192b84c8e00a992256d44bce33975e29f7ae330a62a5902df14ca08ac5222c3bdbcb1ac27df36db615deecd7af7e264842c2aa358e4cc54e830f3507f5ad034 SHA512 33f192621fa3aa692e7b77897e57e50c7af81cb3ba6a40fd090bdafb5ed7b83dc83438028fc6999723e7f82a22635462746a92ced5439f136c56e0559c85b945
 DIST gentoo-kernel-5.4.109-1.arm64.xpak 56430663 BLAKE2B 6079b762ab5cdeb0c745a1a030e4a3af36883588c88dcb8c8cd811aa47d7cbaebc573b152f01fed451dbbfda1ec89ed400270e6fda4e3e1df1aec497b3f7815a SHA512 2d29230577255473618d698363af8c7ef8dd9dd3dcaeaec8fc8802e453838d2c1685e001a6ceb784f6c6ab77fb2b991366e213fec9c45b5763a3a5f57674cef7
 DIST gentoo-kernel-5.4.109-1.x86.xpak 53002823 BLAKE2B eb9548ce9e285fa665e2adc01f33198b9f2b2ae1ea21ddbaf10c9a92664ac6bb12da1c7c6c1923e2efe4746879d3ee27b75f560a69d958465fcea03ebb4f3a7d SHA512 f3848ac5f9ba9e04af65e1b1888e7a2b9836dfeb8ca3f5a692146f524f8e8d87d7b6766183879c879004d8505f013553d13885ffcf97724ba6f1df49c724af3f
-DIST gentoo-kernel-5.4.110-1.amd64.xpak 61394099 BLAKE2B 5907a7f6ffa336e6044c47b1f22b060307759c11e1e10cd28bd7bb68859525fb0480795aa46d476bdf654b412d2b311c642455b935cbf8b190f07b6e6c9b9545 SHA512 3bc0a82f09fd722cfdc4803a8f72289bfa7e528725ebf34c39831c61a2797c8947af5fdac3aecf9855c2ad4d51ef55eb9387e1ac0a3d85ada2775c103673a2c7
-DIST gentoo-kernel-5.4.110-1.arm64.xpak 56429255 BLAKE2B 714380f1f515bc30796d7b19c21b5565664c0ec1db016f10371d2d4e03ebd3d6fdef0d6891b694bda5032f99e98805960e19012723de1168f9cf41b44022bee2 SHA512 4ab7b907d9dec2147390a13052b7579fcbf9473cebff5d3bca25934de8b12c04935f9d2a62a3beae136e3897dc7702c7dd00aba6d60cd662d940b07a68dcd3af
-DIST gentoo-kernel-5.4.110-1.x86.xpak 53179555 BLAKE2B 39ed8da5d56906c750502a33062aecd67d0561f69df1efbbefe55ea960167baad1ed70a8b9c27a0158fad8fc7378f8af1bc86784c3b2fdbe5661fda3cee0a853 SHA512 f0aa83b79be333191a7e161533604e9fde45e62cf32df535059883b0daf101e54ecdaf93ee1b278228ce8ccd9228b750d05206223ecd922383688158c847bc2d
 DIST gentoo-kernel-5.4.111-1.amd64.xpak 61359873 BLAKE2B 4144dc53feda9d1169edfa36d8e4993b92bb363020cec09a34a7ea03df0e802a332d7d3fb58d3a74ed5c668c81fcd0a3a0c1b8add2658126dd208f88ff7b513c SHA512 a9bbe6e08cecb1da40359d3a69e2cb20e751773dd4702c1d6406fa7cfc5fd09c966931984cc1c88c12776c7e979c5293a6cb85fa975d96f3bfcd81c704a7da3b
 DIST gentoo-kernel-5.4.111-1.arm64.xpak 56472651 BLAKE2B 07ff38c5424d59125adfc12d3f300c6bc4431fca371fbf9a743b0f3f9ce964713fa549163ac89180029e3cf3989729a7011215cc1c3b18f6291d0e4ef61c942c SHA512 9fed19fb0c3be2ad3ca8c55ff0b8b275def071d93b41b7d9b52f8b131faaec2f4b6a6165d799082bd6cc5dee7226ada3e6a00933b0f172b506bb99a0be603272
 DIST gentoo-kernel-5.4.111-1.x86.xpak 53176206 BLAKE2B 0c0975b11d7c10d53544d1323f24c576a85dbdb86ad923262c2fe1c5785385127d5de1c6752d2b8926a372f96ccbaf10eb562970db73ebd25281f00016e40cb1 SHA512 e32b887d059b0a6ecc83929a1a0e406620dce2db21cd672386f3b5a81af02449a08d890a4321ce4f7eb9afa58023170b076ddae8d8b71b240edecad0721620d0
+DIST gentoo-kernel-5.4.112-1.amd64.xpak 61380061 BLAKE2B 00388f010fbfad30b59df09a87f93f4fdd73dc04adda26104d1a55d4d5bd456831df314ef8d181abe6118775a70fac5d86147353ad8a1d6a960c7e92ad55952f SHA512 4ba4e62ca1c23f84cbbc38ac8cd1077c1a40205bd04f469b0c14fbaf3f15234f90aba702cf9ece1419d6f00c8f93ddf52d104fc1abcc16cc8f9834427d84a05d
+DIST gentoo-kernel-5.4.112-1.x86.xpak 53174832 BLAKE2B 90e93a7034c98e309c1cd2aa5bfe51e3a1d8e5a9fc22d803106165effda5c4507a6a754adf75a3e6552f65b831baee1aad5b4a16930b29b11c84d74f4d288c6b SHA512 00f536f700184b0d9c63ee0f998a07981045eb068d81d5a8d1e783c78ea41b1e15010cf2e74e923f17b213f20de00316ee7cb1555c16ce840ea574a7486529d7
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24-r1.ebuild
deleted file mode 100644
index 18c02d4c0f39..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${PV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.26-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.26-r1.ebuild
deleted file mode 100644
index 8198cf5ace09..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.26-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.28-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.28-r1.ebuild
deleted file mode 100644
index 8198cf5ace09..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.28-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.26.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.30.ebuild
similarity index 100%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.26.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.30.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.10-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.10-r1.ebuild
deleted file mode 100644
index 2760e617c656..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.10-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.10.ebuild
deleted file mode 100644
index 6208453ad7c9..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.10.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.11-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.11-r1.ebuild
deleted file mode 100644
index 2760e617c656..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.11-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.11.ebuild
deleted file mode 100644
index 6208453ad7c9..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.11.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.12-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.12-r1.ebuild
deleted file mode 100644
index 2760e617c656..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.12-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.12.ebuild
deleted file mode 100644
index 6208453ad7c9..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.12.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.28.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.14.ebuild
similarity index 100%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.28.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.14.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.5-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.5-r1.ebuild
deleted file mode 100644
index 1d8f27f26279..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.5-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${PV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.5.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6-r1.ebuild
deleted file mode 100644
index 1d8f27f26279..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${PV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6.ebuild
deleted file mode 100644
index c31025c57600..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7-r1.ebuild
deleted file mode 100644
index 88b69ba290f2..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${PV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
deleted file mode 100644
index e00d3ebb8dc1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.9-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.9-r1.ebuild
deleted file mode 100644
index 88b69ba290f2..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.9-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${PV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.9.ebuild
deleted file mode 100644
index e00d3ebb8dc1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.9.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105-r2.ebuild
deleted file mode 100644
index cb437c5da9cf..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-2
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105.ebuild
deleted file mode 100644
index 03adecd203fb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106-r1.ebuild
deleted file mode 100644
index 1cb9dc7d81c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-2
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.108-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.108-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.108-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.108.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.108.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.108.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.110-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.110-r1.ebuild
deleted file mode 100644
index b63276300c50..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.110-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.arm64.xpak
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.110.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.110.ebuild
deleted file mode 100644
index 550411ea18c7..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.110.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-BINPKG=${P/-bin/}-1
-
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
-			-> ${BINPKG}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_unpack() {
-	default
-	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${BINPKG} failed"
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH=$(tc-arch-kernel)
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
-}
-
-src_install() {
-	mv lib usr "${ED}"/ || die
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.112.ebuild
similarity index 100%
rename from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24.ebuild
rename to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.112.ebuild
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index e513b30fac82..379d9b8672b5 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,62 +1,32 @@
-DIST genpatches-5.10-27.base.tar.xz 862992 BLAKE2B 6b8e6bc6b1a1b9b07d6de58f38efec32272c6d5d4b01ab9761821b9ee1d45fa805c504b2a6e6755a03558138fcb098113cddb0da349a811ddfb8290b8206b451 SHA512 c9290804d54af33212bec8ef1515cc8162226a949b7043fc65c9b73261c06c61d65df1a6ba5706cf3a31d80acb659a7046c722612cd4868f1fa19e3799be8047
-DIST genpatches-5.10-27.extras.tar.xz 1772 BLAKE2B ef13bdf8726981575e0c123f198ae7fe93172ae6deaafad5df08e61eb57af5cb920853fa3bafd29e20433368372a11cc1c6e13fe95bff893776f5267ffeded67 SHA512 b75bbc811ae2998ad0b3a56dabe1d84437753c33b5c584c73d3c3e90af5befb91856efb331c5a3260de2c26d5669006bed8ed453374e39c125dd493b40f0abdc
-DIST genpatches-5.10-29.base.tar.xz 932392 BLAKE2B eff5249f3471134c5601aaabf1b470dcdf7d2e38c79ff79cc8bd4a0cf33e0dcce63e7e01370eda084c02862af422b442953e3ea4e8a8a6f012df5d8ebf8cca8b SHA512 0909fa9f9fb62dc87e5a18cb15aedf483c9a3c3470e917768e86d0b7eb4bf1240c1ab2b0f406e1c26819cbe7924f1898019c8a2b7981f1c6e8081c92f67de1a7
-DIST genpatches-5.10-29.extras.tar.xz 1772 BLAKE2B 30b3a5b57b99b046872907007fabffbed366cae11aebc2979129716be3c779ccfd87c6834f2e4b77dc1131c603ced8ffdd089c11264abc8b70d7590cdd191562 SHA512 ea9c1408543fa3b0a3a32ac11c7cd2591d7a5df73139b4ddff752b7a37963806fcea422f0cf23b8153b84e8dab1ed8169e51cce105c75c255d6ed91c03955a06
 DIST genpatches-5.10-30.base.tar.xz 991908 BLAKE2B 524e7e66358b3bf311f1347e6a8c8daeed82e6a71340e51157a207580e4e028f230caea696c1e611d57d129113948938a62ef105adcf8f09c5041baedde93aa4 SHA512 3986617d71cd582ece369693624f0013cd88b57a65c3a051975da30931973b161e01fce104abc6d2f08295a2c27e536b98782435c1110086175c7fd5051d62d1
 DIST genpatches-5.10-30.extras.tar.xz 1772 BLAKE2B 7fd98f16922f7a3ea703a5dd2622152b761a47fb7da8a108281e4a9ecb37f9295347a23081b2859039b8b47049ac530d74a05358b7fdb4a8c9a97fffd8103c44 SHA512 ca23be16f47ebea149496eafb0ce9c6068a3a46be01abf9d95b5e693e5a5063e7692003bc23658269d55f923233f1124854515a3f35a94dc385410c6978e25ac
-DIST genpatches-5.10-31.base.tar.xz 1031500 BLAKE2B fe484cfb72e01fc14720b118ade769fb6f74c04a8abffe1a7da73cf57a895395db7249fac2276ddd2b53bb9e087214c814547133ee84887ee889169970e9964b SHA512 749a725e9d8b942f316501151c10146ab1d8f25aca08b56d07c1096fd2d66f537b513f3b41a3f562bd2a78ff0bcdba13a453d377412d1e72dd4ca2af8c2c050d
-DIST genpatches-5.10-31.extras.tar.xz 1768 BLAKE2B b81ec73dbe1aa7da5ad15985b6a753db57095233f112ce323c291862ae85641dd9d8bfe4262dc7e4e6fea701369cbfbca1df213452627d79d0e7279e26f6e426 SHA512 a01e49ea3bfd689c23ee063d6f35ef7f8ea1dc67551d1443fbc2e7bc4c2e6cb265a153c881fdf87cb8a881bee911fbd815d7509167363fadbe9d158f74d84940
 DIST genpatches-5.10-32.base.tar.xz 1038952 BLAKE2B 0414cd3c9ebb99fda1eb70204a83388d2f1439dfd0cadb2e08bfceb002a9ff34685329ea1108646cf08f8a1a1469165444baab72bede69724d2ae32f1b1c1f9c SHA512 6aa75e5481d038b8e2196c6841c88ad6f3801ceac0f5adec68e2f461d48ceaa9f6a964508adf4a8fc8720f46b71164ed5344b546677fe32f7c5e6f69dd30541d
 DIST genpatches-5.10-32.extras.tar.xz 1768 BLAKE2B 3177bae554ac8e5ff49ef98fb594ebab849be1e2b639e22bc4412140f12cbe93177553a0ed404c176891a67314db3c468852237ad7f7b7fbaf8039263a51f483 SHA512 f13419f37e72f3eefdf2d3c18ae68060c45a5f561dc4e493e331566bf718d40cb89f1a30f88d6563c8d834b781d256977a383befc0b0b397008421010aad6ad7
-DIST genpatches-5.11-12.base.tar.xz 437596 BLAKE2B 18203256f36ac4f0dcc959b362130902c38b5c0b3c0d6109b284e4eb15e02c8fa2bd1db2ab03e3efbace6b50a21a928434372684d14563ffb9e63fcc772e3b28 SHA512 64c06e53f8e03d27de6c6e9d7d9beca2ece09644bb7baa4b72b1942168e957ad7714dc3b25c7d8f300a23bc952b78e9e86914e3fe6f8ad5a307cbaeeffea1ae8
-DIST genpatches-5.11-12.extras.tar.xz 1768 BLAKE2B b590414d965e422aeb00a1cf719f96133485b53941b15387d665affef08e7e67ff88380d667e2b95ad85abd0c2e3dd6ef67098e58d0536ec389823a38db18939 SHA512 f3af5e943766337eff397f94166eb173817a634c133938c596878d47b99a417bb8eec0c05fad9067914625dccdfbf1d39629bfba6ed5b82269ba468ccbcdfde0
-DIST genpatches-5.11-13.base.tar.xz 437712 BLAKE2B 3120f9e413b8bf9c0630a9d11eae4c77d0162f67e1b84f9a84b3ea9321ddda5ce2872d61d9451bc363ff23c3fe8bc409693ac903641ca4f1e42c405099b77fef SHA512 7c2488f2e5e857b50f5616f90f743df308686d5e671cb2186bc647ac74e79eb04550d7f6f1d12623d847cd168dcbaa431bbdf128e57863672b084addf8ac0c2d
-DIST genpatches-5.11-13.extras.tar.xz 1772 BLAKE2B 86e00dbb0dd3a48b83fc4c73d6c10f4dd0031bbb34a0f1b0e2cbc263ad6eadf55b32fff5e4c9bae5077101d90b2fb42758ad5517004a57661f2befdc745576ee SHA512 e8233834781ba3e6582ae26d8bef09490e755e9daca0396a8e94fe3dc65f49c399c422b1143a00eeb693b2f6885ade600d599c89165dba809b578d601aaedda1
-DIST genpatches-5.11-14.base.tar.xz 512392 BLAKE2B 96c67f4b7029c2368e14e3b02dc45dbe4e72108cda692483b32f6e036bd27e82faef0a950e9ede69bdbd8152bc2f88d446eaf04055d135f654753074fffb1ec2 SHA512 6ec28a0c1084046ebb4d201a550866a202d6a2852f5ffc8e327861fd8e964a22ab0a565fd99277010fd2d6038fd0d81f2bd126faa78a351d97c7310dd30904bc
-DIST genpatches-5.11-14.extras.tar.xz 1772 BLAKE2B 811235dc06b33befddfc22a9e018d1e5447fcf361f637e3a58de2c14fa5860fd8ce027db43892a332eb0ffa99311a357b170ba2bd37a7a4c4888307dd8cc6354 SHA512 0a8fc3dfa7efbbf393b1f2ae65f6cc4bd440a5e4bc6a36eaacb5ca25cba5a154fd19621124c025143da1ff499ef24463efd58437b76147fed1bee7e4ec1155e7
-DIST genpatches-5.11-15.base.tar.xz 556712 BLAKE2B 1ee9967fae0f563e6a7e5d37efc9ae7d9606fbdd2f8b7b455588a854ccf6a2c8b5c6c82d511bc8fc62b566b666c299106ade8a7be29615b8cbf61e67cace4d1f SHA512 d3efc1a42a5da295c732d7d022e6481d8045419f9d95fcf543b9ebd3f56f25d26629acf82d8027d635976fd869bf339bade23d7f1f0a55b364b3d2002a654c52
-DIST genpatches-5.11-15.extras.tar.xz 1772 BLAKE2B 235c443e234ee51740bdbe05f68bc62202b660e5742841450ea0aa231519dc11f1b6b2cf3bc5817d12dae04c419e20cc02c46b63b5c639b1fdea49fbe4efd2f1 SHA512 a463e77a352a54a4446eda32085dd5dcf295b1758952dbb4b18d7dadc2c17c6f528089369882e38350b1950bb3e405e3d59e59e55a1b4c1b2c0866e1a7e0f82d
+DIST genpatches-5.10-33.base.tar.xz 1088684 BLAKE2B a3d76185ce3e0cd6bc769ce500ddf041fd5b554ee4995b05f823e67adccbf94a6245e25c06df2a3440acad7f4fe577b62048f6e431c71defcb21e1a9ec9affc6 SHA512 119d69d2bee6944ac90bf882faf48402e311a084d43e6f89c6ec8bd43ae3701994f7dbb44170eb6f2d22b30a3c8560ae117892dee478d10818314c0f1ce82e5d
+DIST genpatches-5.10-33.extras.tar.xz 1772 BLAKE2B 92bf4a1dc1551b703096c0a54cbaa0dbf0ac1c012efebddb78671231e850b7e05162c48af81eee114b68495338562b04a67486fc9cf142ee82465489c332707a SHA512 f369685fdd2ca7a1d9385d8e304c1d1e9dffdeefa22b8ff0cd01bb4a258ba57b132e93caab59c72829419f0cb92fae9b06e0f6af638e87d8935a9e0a3ea6c2e4
 DIST genpatches-5.11-16.base.tar.xz 567216 BLAKE2B cee97030c5e59b9d7eea622bd4b8d99f8ec86cfb5e559abcee5184d0fc9acecc5f3b048f0c8f8949f5ea52169ad60e182c2239778d4cf758f41daa1cd593fd71 SHA512 f3d320de79222c26d5fc16030752fce85d3b4cd2c9a769da59aec64f410c1a63f76d7c4c429932a046a4611a12fab2c2f259f7ba4821b7381d1e0a7a2c2df9d4
 DIST genpatches-5.11-16.extras.tar.xz 1768 BLAKE2B 12e78dfc00d3ce8e0b9903f62a6c4b1219e4559a9e6e736d5e4f807a429d91531d39e69f46667297f65824a074af4cf7665e741086efafff83bac195fe649455 SHA512 091b3f9f3589a098c35c3172f1192c56b774f6fcf90c30230a4a6de237db14895f13a75e51324acf83c5b5d8af14f636034eb3bbb33b6070804adf62ab7ad194
-DIST genpatches-5.11-6.base.tar.xz 294752 BLAKE2B 324b5e8647c47b3d876ebc500664af314c7288966d4b375858e66e3d71200ec6624ea7c1fdf348650e9a3780ec3b9058b8e4b2836d5f86ce15d65f3904a1a4ed SHA512 467bafdf407ad2752279935cf5de62de1e5db868efde563369ceb2dda73455a83c313dd60a6ef633fa13e60a69c538de833335b9d2c95ac2d8a63d48994c5958
-DIST genpatches-5.11-6.extras.tar.xz 1768 BLAKE2B c9244edc9b61c2a190c72c93a33ea45144a788b9b331af3541c05fa200e706961471472fd586f5d6ea44c38858f62d65e4fad5424e27361ba27baa49e080b3be SHA512 db9e2da16874304103103f71f87799c4c7799ee87ea6343b0603d85cefb4ff41c49309025e4c74a870d88337caf0e478a73c8d3a755ae16760f9528c8ca77de7
-DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
-DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
-DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
-DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
-DIST genpatches-5.4-108.base.tar.xz 3195852 BLAKE2B 9ddc7aceb4ccc71a9a479d67b81945da5a360f863706a7c5d14bee7c7048dc2e4c7b6711e1afada810499a447c5d96ff34031bf5fd8aa5844f992e96cb7f9046 SHA512 ecc529d86c152df564829cffcb294c6f8c7f6abea013b2e7344de8b50af75f0ae3dd6b8a6ff4e3530979f3e6486cea823d4833ce033ed3d32ede89358a29d9ff
-DIST genpatches-5.4-108.extras.tar.xz 1772 BLAKE2B 470e18f95432cf133e75508d5f0bbe2b22a464e1e398165b9986a138a1a396ca729d5652c36885948d7a3b1cc22dee78bb2690b99bb370bd0718a70c7bfa95ee SHA512 4d01432cbe8303fb1234395f7d06855c14f3acd6854a8cb38b5cac46f001d2ac71d69a9829a9b927da5ecc1d8cdaf4355e95eb9b5105181d91ad5ec0b106f6fa
-DIST genpatches-5.4-109.base.tar.xz 3231408 BLAKE2B 3823cb07dccb45ac11ca7c6cd19db8828f6048c18f66d81f232048fba774cdec93300f4a3fc60262a4a19436349626c1acb55a0e59b2b149816460a8dd38c8ea SHA512 4598f94943024e64ae95e56c0d34e71420c1ee1f38db7ba2028bd52b493469f0380e81952ecfb22dcde1d16fc0c182d27c2490d07a5d7232426b22cf03b0ea4b
-DIST genpatches-5.4-109.extras.tar.xz 1772 BLAKE2B a8a73fb000874269d37e9240600a2372213d026e74a1b5386ed688d9b35bc2535888a75aadc8760122f77d7b281cd859d3d2e0db31bb57078fa9abf4ceda705d SHA512 034f678e9d5b5e919e4e981e11d25187c97fc76cb787bc38fe1af3fdc6da6648d3e778c483cb1a57f862d69baa40ce5ebc1494bb945b95969985782bfed0044b
-DIST genpatches-5.4-111.base.tar.xz 3256780 BLAKE2B fa7af9b2cf10f383b81a8b9cadb2183a8f0227e00fc1214bd0e25df8bf58b0d0578024af9f6df6842a51b7ef7e6d7bb9b61577b38216d59113b53774e66bc681 SHA512 a9831a943e788fa479a481723f231b7610d37606ffb3af703906d88f52870159772f9ccfb96608c390af26f033b1b6e948e6cf7d09612e2e4f42414561fc036d
-DIST genpatches-5.4-111.extras.tar.xz 1772 BLAKE2B d27e2763c7e802ebbcce7e9ac6207a6e73d8d710873d4c4a53d0bb1db973904ccc8a17553d6916eb3211036cb6f2bf30c80864f1339c9e194187dd5cb5ac3a7b SHA512 c38e92e22a5a92af06eef3176ab793ad9e85332dc8e37ac2d32a86b22bd072c47e45d13a7abff9fd6e864c2c063676c5fdbb7e94732f431a5a390b9597da75b2
+DIST genpatches-5.11-17.base.tar.xz 626484 BLAKE2B 4b6d07334c1da48619d820b102df5bfc2d15113d97415e9ad789e8484a39a66509cc360019368834c525a66af0b577b165c5bb898756a60372f1bb21802ee8b6 SHA512 36ca2dcdccd03be5f3c3a350c4f721d5f00adda12c87ba08146b13fd034644ed82eb9e3151ed6210fcc16a37a7ae10d4353be5477a320110e8d89fff74218ec4
+DIST genpatches-5.11-17.extras.tar.xz 1768 BLAKE2B 2b8d33e5c6c03098dc43b95701937a3ac372301bdb9671a0e4fc40b9f8dcf2a9f6bf00de7f60d1136e3d904983273f17366bb4852e02ef229a92b166e37a30a0 SHA512 966c57720d558bb60e16b9c0f9d7e94e155cf1b3ee61c230b7c26a28757a1178e06a047edc5cd7b83bbd4aa31d6376156c390b1165e8b26fd6bf50439b2c16a3
 DIST genpatches-5.4-112.base.tar.xz 3278220 BLAKE2B 11c4a33da1081ce777019604d06740368895e74893cb88f4ba6e3988fe3204f2d5a0ffe2204f77aed427ce8decdd77c5ea7dd374e893cbf7ab346b8fb87a918d SHA512 d2c5378076390358ec60346e832a9454f1b61e67c68da4c6652d7d6cfa29223417fd0b95ea526cead86af5692e4e702a0ee5a169a894d04644f95bbbdd7d727e
 DIST genpatches-5.4-112.extras.tar.xz 1768 BLAKE2B 7f77e833bc17035063b98d89135455fe6200eda135a92221c0f2eef63c6b41235653a8d11a7c99e542010c2195c1af8f5ae84a7da27d159fef67be5192537722 SHA512 6dda1c917736f8a45b1d79e3d7f30b243f922b274425975f520d1d2a5a0fb95b0ab242e0f24bd3a5e0b09e8eac76b6f71eab94cbe1747e3162ce85d892a6da5c
-DIST genpatches-5.4-113.base.tar.xz 3302232 BLAKE2B 106c01266550457aba13bff1ec60b9d0cbab403757f780f7e9b69cd1697b28dd6624fbbb78462891bf8e51b4eef2fb1d9c0ed4cc8909996bc629b9ff5164043e SHA512 5cc835c4150b4a1fa9ac8090143e75274c025c43e4998748f056e5d0fbf048a354f20bb3f66a3628772c1ab2ff9f6da1b4c7547d6bd6543e5a299948a9debdc4
-DIST genpatches-5.4-113.extras.tar.xz 1768 BLAKE2B e2546e7a593e709e3994efb176853f8212a33324c048412b14c037b0f55b6d216bdb8231764066250f1e6b96048ba2f8ca743f51041e71c1d512741e0b58b069 SHA512 21f45e81787d150936dc4a330d28baaf372b7f9e241b93739708667107cb42c525a8b97eba4afebe3638204f67111ce14d90cfa2876e0a67d06840d4606f78cf
 DIST genpatches-5.4-114.base.tar.xz 3305288 BLAKE2B 345acf1ef846178a5a70f385f3d9c2dea25b1892fb755cbd43c78f3aa553097294549a5f24e9552ab0d37d5086fb58e98b72db5230ab8506e725a0908edd5143 SHA512 fdbb6b9c10eafc3069b72460db1209843ec4d4d024548a384dca72592e3c6e5e4eb3b9b34058266499da26caf0a168a1469de7bf4934e0855c6a5db1f4d8d69e
 DIST genpatches-5.4-114.extras.tar.xz 1768 BLAKE2B 506b391e93021d06af44ad90a1da1937aa45e51938220d9de89a525a073cee83b43966b546cfb6dedcc631a07134e55acb7e208a64a117d41f88db99273ba9a7 SHA512 9d13965d4a2db92647946c4126bd40d5a05ac0d848aedda82a6ea8a19f562ec1d8debc13594332cb1fc2a3bac9df76b08c5f666d5bf79b4285483c0d7ca02ab7
+DIST genpatches-5.4-115.base.tar.xz 3335100 BLAKE2B 49863f2b97492223e0a42eecc0dfc6b53ed054810ec1281f064e39cc47e45b4897f795f8c2e43dcf3b974531221b2275ab26592914c845f4c18468be520f5f7d SHA512 b3b8b279a8fbd0cb58f4ec18e6351a08083fe06bde33cc53f378f82757ca8f004c016a562dedd4092412ce41be62f6f58a885deb12af87ffd288a597e9eaadf8
+DIST genpatches-5.4-115.extras.tar.xz 1772 BLAKE2B 49c7ee35b73827fc454adf526f5ceed9f7c71b6ac2c2e954943142999ed7c1e7a58a543d1519c1d3d6b7e4e9aa3970094650663f10b65408414155909037b23f SHA512 d45ff15542dd01aa7381e992fee90391000cb42d421fab243563fcc547acb8576ab74ef78bf2eb1d81fcd327bf76ee3cc3a6addad5f5ead7eba47837d139792a
 DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa SHA512 ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
-DIST kernel-aarch64-fedora.config.5.11.1 225847 BLAKE2B 50e3db29a9afc3db3c35e3af173e89e2e8d3b573dd8af7c35584e3d0152211cbd5e6ddb749acb3d6d2caa54392a3f51e52b5394a5d032d43ed35861230b277d0 SHA512 6d0594658e205767599453d4d8695c37eabc065d6c17362c3775dd745f6ca62131d7c15126ec41a17e757d3ae2a0569cea6621a7ada4666a8f90e4414391b3dc
 DIST kernel-aarch64-fedora.config.5.11.11 225875 BLAKE2B 132f9ef1393edf843a7a5026da736975a465084e550b354e09a13c598fed6942c9eef7f46c2f04dd40861ed227b533041c5efb6f6fde442bdbad718aa563ef0c SHA512 9def40a4df1d20497050c2badedb8b8828d67793b465855405fcebdd04d624b6c3314347c93db07acbff0262a41e68290365d2865945138468cf5ba4419594db
-DIST kernel-aarch64-fedora.config.5.11.7 225828 BLAKE2B 1f5d50514adb57195f2878e3c6c587705d90d5f888e2b1c84d5ca8aefa91c23cc70db34a12a23575cf3e91cd7779769ac5242a3a3ef38f72bf30f73bae2e009e SHA512 b43550dabeee5618664e298b56025ed33d9983e741f70dc190135028ab43e72226b9090da361c26a64938e5759ef80e6008b20a623093e830af45e877a71a77c
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
-DIST kernel-i686-fedora.config.5.11.1 208027 BLAKE2B b4183e8d1121aa8b3f65d0a4542b8ba0f507430ab4cf0004dd0e8b1e24b3be1783316b8bf6becb2002f7fbacc8236b640f533fc2e9dc5696e84d1627c3b0e9c4 SHA512 5b107e376ddef783ee6852ef67143a94340b37ab764ef3ee3c6642401883d314809c959c2025d976336923c115d21d6b39332aa1699c0f884d1faad1d9c3fa32
 DIST kernel-i686-fedora.config.5.11.11 208044 BLAKE2B b6600736914e25e3de288850759e044731b08c3a386eb65dc6e44613552f362905d14f02741a7b74e9047bf5ee7e624904e84a3be7ab86ba1112658208fd4cf0 SHA512 d5601dcb2b3a170d6af14633563891aba3df8d3f396e4496637236a59cff8d6da52d0154ea199af28faa0a614bce50868e08aabeaa374b910d21b591e6bbb11a
-DIST kernel-i686-fedora.config.5.11.7 207997 BLAKE2B da0d9cc56ec9a9ecd9c05b809313301538e902f94799f418c522fa55d97be9ef72b7c23fba15721cf355227adfd93a9d6d8537b84572d6da16c16e13e2cd4dbb SHA512 4c6dfb2efa2cf0d48792aa2f37c8f37b929524a93c534a1ba48effd4645fa3f064bc6b88a900533d8cd8ebd4bbac8f0f1faaba57d25d59005af2cf2608eb0c0b
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
-DIST kernel-ppc64le-fedora.config.5.11.1 194870 BLAKE2B df6e5a0a789dc6d0c2fbec45820f5e19ec455388f02f04d88d7b3dd5081d2f11e89cfd0159b7a3885aaa029470e916743d59ec3f86756ff4182aa56552aa8476 SHA512 e170912e76e8980435df2a1387792d616490ededda4df681a90312f7fc8ce4065f1c9fd7559d746d8edc0fccfbd35b20fd5db294774f9db7f4635d898cd0dab1
 DIST kernel-ppc64le-fedora.config.5.11.11 194887 BLAKE2B afc34e8e59a0c99be6f5547dc0b60ffb1a68293ecf46a594ee951feee7cbb689f186d0686dab02658ca55dfb2e7c40de1bd37951270046bed71e1f11cbfd888f SHA512 eb60ea14dc4bb7d2e87b650d1f59ad50d622c4cb2229882f393def628a447bbbea378ff788c91ae1227fd44289a1ed604ad41215f561641c4048a3f82c6a9c83
-DIST kernel-ppc64le-fedora.config.5.11.7 194840 BLAKE2B 0fba17ad9a4272a19678beb007a07d30a1facd2e9af259e888b733129540e647378d21166ffbc459f2419b1b4fde7deb7e59db1f3c74aeef5b137424abe14bd2 SHA512 b77fc04281c049a312ac8135c4b60460b747c97299d1cd24c31a56aadcb8291b4c47ff3b87a427c47abbe8adea36216e6615a4715c6c7482b655de3b987b86a4
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
-DIST kernel-x86_64-fedora.config.5.11.1 208870 BLAKE2B 86e075a95cbc5d6c3cdecb0caf67e18f671ed663aee94b7d0688e25f111dfdf12d890e1f409df04446d18057b6fad8e0fc67adcde34ed581266d458d9c9cabbd SHA512 ab39c8b107471bdd492e6f9c2e181e85e44134b4a2934fedd2f454b9766a32aa2cef2cbf7ed83111e82ffd7794d4bf20f81d98b238751d505c13077abff2b543
 DIST kernel-x86_64-fedora.config.5.11.11 208887 BLAKE2B 012eb42b2ad148eb0f2ece1e3e6a95e71da409796c1e6dbe758f9f1031fac022e18a0b6ceac083f20928938aa7e353307c016950a53a9860dd9b1151808dc1e0 SHA512 0e0b61780a1d86760c50b523ce02e57bababa4e8175105d5908dfd77b699e30cb2dd5a64518a81d2293e56968e138e0dd8653d4e94a7bbac1b69d8297982a39f
-DIST kernel-x86_64-fedora.config.5.11.7 208840 BLAKE2B bead7ffcab503298371e61d37ccb0920e0ee3ba8d5dd019133e3d57bb8973cc2a13498a60c5e150b78f9d6af839a7010fbe89da1b0ecea97cab7036a5fc1aad0 SHA512 1777c0efba6c3c6108f094a5435169230b2a9ed496ab67d5f922054492a695a9f8eee95c2fe9651641c311cec49868a12a7c3614330d37f711ff795110c2c7e5
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24.ebuild
deleted file mode 100644
index 0bfad9481308..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.28.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.28.ebuild
deleted file mode 100644
index 0bfad9481308..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.28.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.26.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.30.ebuild
similarity index 100%
rename from sys-kernel/gentoo-kernel/gentoo-kernel-5.10.26.ebuild
rename to sys-kernel/gentoo-kernel/gentoo-kernel-5.10.30.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.10.ebuild
deleted file mode 100644
index ccd07507f316..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.10.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.7
-CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.12.ebuild
deleted file mode 100644
index 8da85bb8569b..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.12.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.11
-CONFIG_HASH=b2a0f449a2f5ccf83289b2817faba55e484a4c61
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.14.ebuild
similarity index 100%
rename from sys-kernel/gentoo-kernel/gentoo-kernel-5.11.11.ebuild
rename to sys-kernel/gentoo-kernel/gentoo-kernel-5.11.14.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.5.ebuild
deleted file mode 100644
index 6b0983892bb8..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.1
-CONFIG_HASH=07992209452cd7ba529ffdbdd83d01d44cd8ae14
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.6.ebuild
deleted file mode 100644
index 6b0983892bb8..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.1
-CONFIG_HASH=07992209452cd7ba529ffdbdd83d01d44cd8ae14
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
deleted file mode 100644
index 3289e86dc48a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.7
-CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.9.ebuild
deleted file mode 100644
index d6cf6123b873..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.7
-CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105.ebuild
deleted file mode 100644
index 6fe4c0d9fc1e..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.89
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106.ebuild
deleted file mode 100644
index 103fdd6ce9cc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.89
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.108.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.108.ebuild
deleted file mode 100644
index 103fdd6ce9cc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.108.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.89
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.109.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.109.ebuild
index 9c90a13fd46b..eb6abc38da09 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.109.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.109.ebuild
@@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.110.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112.ebuild
similarity index 94%
rename from sys-kernel/gentoo-kernel/gentoo-kernel-5.4.110.ebuild
rename to sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112.ebuild
index 103fdd6ce9cc..083b5b39ab9c 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.110.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112.ebuild
@@ -15,8 +15,8 @@ GENTOO_CONFIG_VER=5.4.89
 DESCRIPTION="Linux kernel built with Gentoo patches"
 HOMEPAGE="https://www.kernel.org/"
 SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
 	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
 		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
 	amd64? (
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 5a25a63b2228..426553aceddd 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -40,6 +40,9 @@ DIST genpatches-4.19-184.extras.tar.xz 3316 BLAKE2B d56c8b3091fc55850bc74c902cb9
 DIST genpatches-4.19-185.base.tar.xz 4509612 BLAKE2B 865c6ec4436ddd57882c8bcb06f3446f996d44bceea8a645fa5a8ba04cc9386bfa0f5340e7e961ee525c0718d64cc2ee7b984d5fd901a3b8c92724fda558b591 SHA512 4b8a08857c35ac6de4e3e0bf6304d6726667543dd002a5373a933273941a021b0f87be0a998915f7b56f0eeb154b7e9abca13f130078acb500f8e8ffab3290dd
 DIST genpatches-4.19-185.experimental.tar.xz 7504 BLAKE2B 2494c0d5ff88cdbb3cc324f2735d1b53843643de5f26e7b85367fe20723ca489dd7314f622149788c08c4146ade5630888c0dc98d6b8a03304767880befaf219 SHA512 5eb0370b3803bc712a609ae21b0c0a8a9e00ad51c0d21bba4b791ce214ae9093f239460215ae7d20cabf7dbc8e766ec2c5e443fa09e74c865cfaf8b684c1b384
 DIST genpatches-4.19-185.extras.tar.xz 3316 BLAKE2B 6f0867a0df1513e3f19ee621f0f92c3b1f7d4e4499df02c15e94112fd5f91cd6a097ffebc5facac49fce396cb5fa4e9763571d9ec07f561c06c5f879f8b4d8c2 SHA512 c190cac60a0f358c7ff441dc534d4ac73250768ea8a23ab415ad06139c35fc6acb804da0107ca44bf6fbc9211397a64969d9b4d3381ec52e54f0f93c8a07f895
+DIST genpatches-4.19-186.base.tar.xz 4521376 BLAKE2B fdcd42db994c9eed76834a9b0a0e12950d1127d717174e5e24530958beff49fde22ea797524842a902fa20ee27729af5037cf60485ee58bc80edc8d53fad7ad5 SHA512 31200d50966a888e7b984588042559e55216480fffdee52067a5dd2d9c9fcfe37d88c096a542b6517a901b1ae24cbcacb0d2495fdb10985218b880c24d7ab078
+DIST genpatches-4.19-186.experimental.tar.xz 7504 BLAKE2B 6e3422ed3001354b903fb8df48dcbb6dd2368b66d49da5cc997a158c67e8b156843a2a33bc49cf990214f5d338b1c4d2974f68b6692c1b7e71cc66f822d27dde SHA512 fc75f066e0ab029d295bcb8d2de85f7f536eaf6ae7dca080b7233a2d4fa8fd874354afe3a36421050bd3e33de7c26db16c39e5e1db4f7e72ae7dc3d6c5579b0a
+DIST genpatches-4.19-186.extras.tar.xz 3316 BLAKE2B 9918d80a116d4829e71b1ac708a3ea7bc9c358417bf82c3e25ffae5dd223e33d01c6862d3d33e51de9eca0db0911d686f043952233f74d8b1455016d5f6157b2 SHA512 b13570d3e6ccc76f7bd2202de62895df7af42167825d1e3c65a0f1769b964e4d985133a2dc7a2103fe8776265670e5ad0a1fdfa532c7c5a1a9b70de954c1f6ef
 DIST genpatches-4.4-259.base.tar.xz 4028152 BLAKE2B c01f5acc3523aea23b3d0d20e714db1a91b70b51b1ffe9bd57738882b28823ef8ef2fb2aa3766a050dd5efb597c1605d34be2584d83f170d4efa741ef49043c3 SHA512 8dc0bed820643799007068a1a00287c7cd55cc0df1c2b83a945c1ae7cb75fdbbf41a7f6df1cd3853079746dbd2b7e6c9ab21a531457ae1f71a4b03aafc8c23a5
 DIST genpatches-4.4-259.experimental.tar.xz 83312 BLAKE2B 998cc7fbe38a981251691026abba9fdcb17bdd388ed92d7aa61745a772c3072ad630be7e8cebda4ca1c64642e94ca6ba5e46452641f306c65a04908f58c47659 SHA512 9944a0bc502db83edd04c683ebcd15552f02edbe34e19b5687b04830786f2dcc7baaaa2b613bbcb568cca6abcee73da830e1bc4bcb9248aae80bfe15eda0222c
 DIST genpatches-4.4-259.extras.tar.xz 1788 BLAKE2B 4512f1496b02147d6237c970b9330af46511bab342645467687cd7f7d0417ba2373a1ae07361e4b0020caa878665f3c76a3763cd92edc07d3d677661a50226e7 SHA512 464129ea698d8515a6d3d2cd8603adf0b3c9bc8a3c5436c10ce1e43ffc7ca4b8ac1def12d20356705707cf3d25d10c79ff714ecea842ce1fe4f439cdbe3427fc
@@ -100,6 +103,9 @@ DIST genpatches-5.10-31.extras.tar.xz 1768 BLAKE2B b81ec73dbe1aa7da5ad15985b6a75
 DIST genpatches-5.10-32.base.tar.xz 1038952 BLAKE2B 0414cd3c9ebb99fda1eb70204a83388d2f1439dfd0cadb2e08bfceb002a9ff34685329ea1108646cf08f8a1a1469165444baab72bede69724d2ae32f1b1c1f9c SHA512 6aa75e5481d038b8e2196c6841c88ad6f3801ceac0f5adec68e2f461d48ceaa9f6a964508adf4a8fc8720f46b71164ed5344b546677fe32f7c5e6f69dd30541d
 DIST genpatches-5.10-32.experimental.tar.xz 16548 BLAKE2B 36b1dbef5ae698e3caecd182c11e4e1dbb4ebf52ebb667d400c288a67a6390e2267c086f2ce66739a804f7735dd2c39f64cbdba74152b02ca1ff17623e272886 SHA512 9bfb08a873b195a1ab0b703833bde2b3731841555a3abcfc843f8dcd29c7c1748229b686048c1fce28abda53f36d1dec692829237353d91699757ede9c23e684
 DIST genpatches-5.10-32.extras.tar.xz 1768 BLAKE2B 3177bae554ac8e5ff49ef98fb594ebab849be1e2b639e22bc4412140f12cbe93177553a0ed404c176891a67314db3c468852237ad7f7b7fbaf8039263a51f483 SHA512 f13419f37e72f3eefdf2d3c18ae68060c45a5f561dc4e493e331566bf718d40cb89f1a30f88d6563c8d834b781d256977a383befc0b0b397008421010aad6ad7
+DIST genpatches-5.10-33.base.tar.xz 1088684 BLAKE2B a3d76185ce3e0cd6bc769ce500ddf041fd5b554ee4995b05f823e67adccbf94a6245e25c06df2a3440acad7f4fe577b62048f6e431c71defcb21e1a9ec9affc6 SHA512 119d69d2bee6944ac90bf882faf48402e311a084d43e6f89c6ec8bd43ae3701994f7dbb44170eb6f2d22b30a3c8560ae117892dee478d10818314c0f1ce82e5d
+DIST genpatches-5.10-33.experimental.tar.xz 16552 BLAKE2B 7f18fb292ecd4328411321d328434e6988f3c95540ab006122ca7b70a1fab02b797bc5f094d78d2d65d242c2584322d57c8885b8044712cd58c1885576b4f97b SHA512 3c0650b4012fa719f52680f10c6ff04b12d4bd3be44f96c9798bf7511899f6b34f7fdf1a9d80a49946759c66ce87e589b70aa8c2603c33051267d655ca8e4a08
+DIST genpatches-5.10-33.extras.tar.xz 1772 BLAKE2B 92bf4a1dc1551b703096c0a54cbaa0dbf0ac1c012efebddb78671231e850b7e05162c48af81eee114b68495338562b04a67486fc9cf142ee82465489c332707a SHA512 f369685fdd2ca7a1d9385d8e304c1d1e9dffdeefa22b8ff0cd01bb4a258ba57b132e93caab59c72829419f0cb92fae9b06e0f6af638e87d8935a9e0a3ea6c2e4
 DIST genpatches-5.11-11.base.tar.xz 410528 BLAKE2B cdc71103e3cf40231cddb71f320c10cb2f948636fd48d1d1df66d6cd535b2f291f22a7da0db9b8fea40e64ad503abe4542506cd928409cf1ac0c8e0944a44435 SHA512 451628c197f3544438f41fd5a604d451981c4e352ea40a53b60492b6f1b57438281c00b0209064cd7a46b57a70ae307a2108549cebef8574955fe0b66d277fc9
 DIST genpatches-5.11-11.experimental.tar.xz 69424 BLAKE2B ae65060ce4bc38d46cae60bdf62809217a2f2b32ebc5f89af4bf95c460c643a474f7b0da89de83bb8747f30c2e4ca6a6754b37b825688b9df3307f3608213704 SHA512 92983999fcc1f710c80ecc48fb8510302d840e2f3ae39fe78aa369d8ace4bd9b85b7f3073d2d1d302cf48270595539bdf2e44894c53833c52c13fa60690c760b
 DIST genpatches-5.11-11.extras.tar.xz 1772 BLAKE2B aa1f6397aae7927d1aac1d29e98d8535b6e8f7b2b6b2009594497b846946cb5dda2dd3dac69a1f29989b54aa2ef9e2879418145a525865179f32e7ab76987e66 SHA512 a72b4fb93e09919aadc9c1d306d3817135f3e4160e1b10f69367e3cb49b1502706dd9cd6e399945f946cbecf047d53f8100459acda04dce231890fe9fe212a08
@@ -118,6 +124,9 @@ DIST genpatches-5.11-15.extras.tar.xz 1772 BLAKE2B 235c443e234ee51740bdbe05f68bc
 DIST genpatches-5.11-16.base.tar.xz 567216 BLAKE2B cee97030c5e59b9d7eea622bd4b8d99f8ec86cfb5e559abcee5184d0fc9acecc5f3b048f0c8f8949f5ea52169ad60e182c2239778d4cf758f41daa1cd593fd71 SHA512 f3d320de79222c26d5fc16030752fce85d3b4cd2c9a769da59aec64f410c1a63f76d7c4c429932a046a4611a12fab2c2f259f7ba4821b7381d1e0a7a2c2df9d4
 DIST genpatches-5.11-16.experimental.tar.xz 68172 BLAKE2B f52cc9497222fd0dc76cd3917e0f3d6701e2531942faacc382c7c7488f1c3e27bd2333e2a1b1664517d6a99c8ba0f19267b979c64ad80231302a6dd8261fc344 SHA512 60b0d7531ae30f5f297799dda2984136207871fe43492e02d457cd50567c21897998f9688171493f2109227065d4204bd1723953ae9192b1f4344c16c1d5e23a
 DIST genpatches-5.11-16.extras.tar.xz 1768 BLAKE2B 12e78dfc00d3ce8e0b9903f62a6c4b1219e4559a9e6e736d5e4f807a429d91531d39e69f46667297f65824a074af4cf7665e741086efafff83bac195fe649455 SHA512 091b3f9f3589a098c35c3172f1192c56b774f6fcf90c30230a4a6de237db14895f13a75e51324acf83c5b5d8af14f636034eb3bbb33b6070804adf62ab7ad194
+DIST genpatches-5.11-17.base.tar.xz 626484 BLAKE2B 4b6d07334c1da48619d820b102df5bfc2d15113d97415e9ad789e8484a39a66509cc360019368834c525a66af0b577b165c5bb898756a60372f1bb21802ee8b6 SHA512 36ca2dcdccd03be5f3c3a350c4f721d5f00adda12c87ba08146b13fd034644ed82eb9e3151ed6210fcc16a37a7ae10d4353be5477a320110e8d89fff74218ec4
+DIST genpatches-5.11-17.experimental.tar.xz 68160 BLAKE2B c00f91b46fe1d37166815fbd688389950751313e423b179acd925be347d616f814d7234f1b93c53ef088ea155a257b7938017e12d16945986f04c1add3f6d5c8 SHA512 ca2a927a5500bafe9b6cebf3e34497ab7249581e78be87acde88b79172924309d2766e9d167c3c3526e55990226ed7621b06e406bf37bbbc92b209c5e1d70919
+DIST genpatches-5.11-17.extras.tar.xz 1768 BLAKE2B 2b8d33e5c6c03098dc43b95701937a3ac372301bdb9671a0e4fc40b9f8dcf2a9f6bf00de7f60d1136e3d904983273f17366bb4852e02ef229a92b166e37a30a0 SHA512 966c57720d558bb60e16b9c0f9d7e94e155cf1b3ee61c230b7c26a28757a1178e06a047edc5cd7b83bbd4aa31d6376156c390b1165e8b26fd6bf50439b2c16a3
 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
 DIST genpatches-5.11-7.experimental.tar.xz 6440 BLAKE2B dd939c3f624cc84589cab0c3772c72d232038c32eb9a61f64d927a3e1f1de8a6af2c0dbff89ff542ff5332ecd4a7fe6e526db446373b63dc6591cfc801d94356 SHA512 c9a3702767bee74ab0ab13eb1ac65346ea8edc62feea5992a4b6a5ee564c15ffd4c3d21299f50d1996cf59ebce2fc03a15927398b2394428fc78cee3b6fc22d2
 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
@@ -145,6 +154,9 @@ DIST genpatches-5.4-113.extras.tar.xz 1768 BLAKE2B e2546e7a593e709e3994efb176853
 DIST genpatches-5.4-114.base.tar.xz 3305288 BLAKE2B 345acf1ef846178a5a70f385f3d9c2dea25b1892fb755cbd43c78f3aa553097294549a5f24e9552ab0d37d5086fb58e98b72db5230ab8506e725a0908edd5143 SHA512 fdbb6b9c10eafc3069b72460db1209843ec4d4d024548a384dca72592e3c6e5e4eb3b9b34058266499da26caf0a168a1469de7bf4934e0855c6a5db1f4d8d69e
 DIST genpatches-5.4-114.experimental.tar.xz 18532 BLAKE2B 8f52b70c74528286d18d0fc529d06ef7284dac6aefb532b5305424a0cf4694a52670b68ff571e6ef9509bf0e648684c734567909994b65598fe487de22f44043 SHA512 7ca837c3d386f02f2aa3812a8878c7de1011f64503bf752377ae121a82c788e04d2f28815413e057ed9ba44a7cd7d0b05b603c99cd558ed23b107369c38e7176
 DIST genpatches-5.4-114.extras.tar.xz 1768 BLAKE2B 506b391e93021d06af44ad90a1da1937aa45e51938220d9de89a525a073cee83b43966b546cfb6dedcc631a07134e55acb7e208a64a117d41f88db99273ba9a7 SHA512 9d13965d4a2db92647946c4126bd40d5a05ac0d848aedda82a6ea8a19f562ec1d8debc13594332cb1fc2a3bac9df76b08c5f666d5bf79b4285483c0d7ca02ab7
+DIST genpatches-5.4-115.base.tar.xz 3335100 BLAKE2B 49863f2b97492223e0a42eecc0dfc6b53ed054810ec1281f064e39cc47e45b4897f795f8c2e43dcf3b974531221b2275ab26592914c845f4c18468be520f5f7d SHA512 b3b8b279a8fbd0cb58f4ec18e6351a08083fe06bde33cc53f378f82757ca8f004c016a562dedd4092412ce41be62f6f58a885deb12af87ffd288a597e9eaadf8
+DIST genpatches-5.4-115.experimental.tar.xz 18532 BLAKE2B a0086f25656fb89470e9e336784df8d803914c0e196eaa1ae0a14777a01f5fbd3d5e3f2bf79f9e68faf359b52c8d9a44a626e3d8995fb1619c78a524cb58b1eb SHA512 5c8b21ea324a48c265cac8dde2a3bbe277d295caaf1b8e3f416284879abae140f947a6bf9e5488d4a5f377c8a7165d9e4f0da6c7b454f5d39365b3edb7761b54
+DIST genpatches-5.4-115.extras.tar.xz 1772 BLAKE2B 49c7ee35b73827fc454adf526f5ceed9f7c71b6ac2c2e954943142999ed7c1e7a58a543d1519c1d3d6b7e4e9aa3970094650663f10b65408414155909037b23f SHA512 d45ff15542dd01aa7381e992fee90391000cb42d421fab243563fcc547acb8576ab74ef78bf2eb1d81fcd327bf76ee3cc3a6addad5f5ead7eba47837d139792a
 DIST genpatches-5.4-99.base.tar.xz 3064716 BLAKE2B f71d76c88a9932d3b0e1b45d065fa0946f36a3100e3b59c5ce4c373519119066973067e4bb74d094cd5b79e689affa4615faf40da75a730b62df2259d3361c43 SHA512 833a83d7aecb1a216783fdf57e0fda342fd481c74166d976326a8333dfb2a13bd61f1b20b749f17b3498756b6134f8538a971507427f4e955bc9128742a3be5f
 DIST genpatches-5.4-99.experimental.tar.xz 18092 BLAKE2B a6263f1dd87eb2f701e248ce34c48251cb3ab796fc38ac4a9477c14528436eac0a767a3f380f634f8a68b987dad500b3c11ddba873982e958b0c8d14aaba2691 SHA512 995c465b79f4f67678c325c84abf3d66970b2e3de786b1b83863b224f2a83335401384f236a71b9294daa6a2d815ae79c6b612b0e157463a317c507e447eda76
 DIST genpatches-5.4-99.extras.tar.xz 1772 BLAKE2B 6ffe84c928fc61b306d3e9a096470c090b79bfe99c90981b64e324d40157e818b50c0aebbaf342f51eeba29867b8cf8a6e91394dd594c1ecdb4f2a64f8d76e00 SHA512 7f2db3353809e7922951e1e884d7fe4a426556750bf4e38619278185fb09d519b30a972f4b5aeda3f7aca335fc95372edcc5dadd0881febbf43403c4d5c1c497
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.187.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.187.ebuild
new file mode 100644
index 000000000000..4e0f2a00d56d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.187.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="186"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.30.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.30.ebuild
new file mode 100644
index 000000000000..af85f088ba22
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.30.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="33"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.11.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.11.14.ebuild
new file mode 100644
index 000000000000..28022484bfe5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.11.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="17"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.112.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.112.ebuild
new file mode 100644
index 000000000000..fd0f6251036a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.112.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="115"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 5c4894c9b44c..2bdc43759006 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -16,4 +16,5 @@ DIST pf-sources-5.11_p3.patch 3932843 BLAKE2B 655d68a6cced89aeab7b71cb67d0469567
 DIST pf-sources-5.11_p4.patch 4443076 BLAKE2B 294d1eb3ec09de6c5d6011913a8d831185a424a85e3bc6d245bd3ef4fe6b50d8e2b64decf398c153435de0b24c2417a7076ae854424201ce61cfdbbdedf4565f SHA512 3a14d63039e1a3701493d17b164364ef3c9167333e16aa8202b2967eebfaab3bd0c233b1e09af44a190a86a1b5599ee339f9ae06298c77404e7f99c6f9f14df7
 DIST pf-sources-5.11_p5.patch 4598966 BLAKE2B 8dc474e83816d698bceeba123ceef1c6d33eba551ff85cdc121d51eb2cfc4b81fd1b7fcb63a5254560b978368ec1b24bd9c49cef38432ba3ef956399f4d4e7f2 SHA512 296dda2e6fa1fdc8706ba1547122982e261f0bde82b80c423a2bd5f7b63d98113a75912fd64c630add18eb00f9d77dd1ebf3a0ebd33db985b30484b058d50547
 DIST pf-sources-5.11_p6.patch 5055069 BLAKE2B 75ea4ce13e12762c282c51f07a4bf4553dccd864a004b6af3b2e4531795e0d05d510ca22f890344d692a63f177888a094e265282527ebfb6ef1ce3f11f192205 SHA512 68454152046bde1f412d2c2da8c30d9e57d856f28b2efc88b0038235fac04ddb32e009d2ea4bd75364fa6d17336ea445bf0fa5487846ec81f790add33544d214
+DIST pf-sources-5.11_p7.patch 5538351 BLAKE2B 112f27ae4c640b5398dea06eb85b3f88518e9dfc94bcf104114cdd7d8a33a85c2decf32a696d8ce648c344cdf018af0b588b11785cb33394394a32f38b1d52db SHA512 f957283309a6d2116c0f130e59e944baf3b91d72991e5f74317e8badc6962153deccf4ba376fc33ff50ddae2d6f1b1f2d3419c68a036ec8fc68e94cfcd11c789
 DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p7.ebuild
new file mode 100644
index 000000000000..892784a56e6c
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+SHPV="${PV/_p*/}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch
+	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r2.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r2.patch"
+)
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES().
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d31eed8108dc..f31bc18200e4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,60 +1,30 @@
 DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa SHA512 ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
-DIST kernel-aarch64-fedora.config.5.11.1 225847 BLAKE2B 50e3db29a9afc3db3c35e3af173e89e2e8d3b573dd8af7c35584e3d0152211cbd5e6ddb749acb3d6d2caa54392a3f51e52b5394a5d032d43ed35861230b277d0 SHA512 6d0594658e205767599453d4d8695c37eabc065d6c17362c3775dd745f6ca62131d7c15126ec41a17e757d3ae2a0569cea6621a7ada4666a8f90e4414391b3dc
 DIST kernel-aarch64-fedora.config.5.11.11 225875 BLAKE2B 132f9ef1393edf843a7a5026da736975a465084e550b354e09a13c598fed6942c9eef7f46c2f04dd40861ed227b533041c5efb6f6fde442bdbad718aa563ef0c SHA512 9def40a4df1d20497050c2badedb8b8828d67793b465855405fcebdd04d624b6c3314347c93db07acbff0262a41e68290365d2865945138468cf5ba4419594db
-DIST kernel-aarch64-fedora.config.5.11.7 225828 BLAKE2B 1f5d50514adb57195f2878e3c6c587705d90d5f888e2b1c84d5ca8aefa91c23cc70db34a12a23575cf3e91cd7779769ac5242a3a3ef38f72bf30f73bae2e009e SHA512 b43550dabeee5618664e298b56025ed33d9983e741f70dc190135028ab43e72226b9090da361c26a64938e5759ef80e6008b20a623093e830af45e877a71a77c
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
-DIST kernel-i686-fedora.config.5.11.1 208027 BLAKE2B b4183e8d1121aa8b3f65d0a4542b8ba0f507430ab4cf0004dd0e8b1e24b3be1783316b8bf6becb2002f7fbacc8236b640f533fc2e9dc5696e84d1627c3b0e9c4 SHA512 5b107e376ddef783ee6852ef67143a94340b37ab764ef3ee3c6642401883d314809c959c2025d976336923c115d21d6b39332aa1699c0f884d1faad1d9c3fa32
 DIST kernel-i686-fedora.config.5.11.11 208044 BLAKE2B b6600736914e25e3de288850759e044731b08c3a386eb65dc6e44613552f362905d14f02741a7b74e9047bf5ee7e624904e84a3be7ab86ba1112658208fd4cf0 SHA512 d5601dcb2b3a170d6af14633563891aba3df8d3f396e4496637236a59cff8d6da52d0154ea199af28faa0a614bce50868e08aabeaa374b910d21b591e6bbb11a
-DIST kernel-i686-fedora.config.5.11.7 207997 BLAKE2B da0d9cc56ec9a9ecd9c05b809313301538e902f94799f418c522fa55d97be9ef72b7c23fba15721cf355227adfd93a9d6d8537b84572d6da16c16e13e2cd4dbb SHA512 4c6dfb2efa2cf0d48792aa2f37c8f37b929524a93c534a1ba48effd4645fa3f064bc6b88a900533d8cd8ebd4bbac8f0f1faaba57d25d59005af2cf2608eb0c0b
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
-DIST kernel-ppc64le-fedora.config.5.11.1 194870 BLAKE2B df6e5a0a789dc6d0c2fbec45820f5e19ec455388f02f04d88d7b3dd5081d2f11e89cfd0159b7a3885aaa029470e916743d59ec3f86756ff4182aa56552aa8476 SHA512 e170912e76e8980435df2a1387792d616490ededda4df681a90312f7fc8ce4065f1c9fd7559d746d8edc0fccfbd35b20fd5db294774f9db7f4635d898cd0dab1
 DIST kernel-ppc64le-fedora.config.5.11.11 194887 BLAKE2B afc34e8e59a0c99be6f5547dc0b60ffb1a68293ecf46a594ee951feee7cbb689f186d0686dab02658ca55dfb2e7c40de1bd37951270046bed71e1f11cbfd888f SHA512 eb60ea14dc4bb7d2e87b650d1f59ad50d622c4cb2229882f393def628a447bbbea378ff788c91ae1227fd44289a1ed604ad41215f561641c4048a3f82c6a9c83
-DIST kernel-ppc64le-fedora.config.5.11.7 194840 BLAKE2B 0fba17ad9a4272a19678beb007a07d30a1facd2e9af259e888b733129540e647378d21166ffbc459f2419b1b4fde7deb7e59db1f3c74aeef5b137424abe14bd2 SHA512 b77fc04281c049a312ac8135c4b60460b747c97299d1cd24c31a56aadcb8291b4c47ff3b87a427c47abbe8adea36216e6615a4715c6c7482b655de3b987b86a4
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
-DIST kernel-x86_64-fedora.config.5.11.1 208870 BLAKE2B 86e075a95cbc5d6c3cdecb0caf67e18f671ed663aee94b7d0688e25f111dfdf12d890e1f409df04446d18057b6fad8e0fc67adcde34ed581266d458d9c9cabbd SHA512 ab39c8b107471bdd492e6f9c2e181e85e44134b4a2934fedd2f454b9766a32aa2cef2cbf7ed83111e82ffd7794d4bf20f81d98b238751d505c13077abff2b543
 DIST kernel-x86_64-fedora.config.5.11.11 208887 BLAKE2B 012eb42b2ad148eb0f2ece1e3e6a95e71da409796c1e6dbe758f9f1031fac022e18a0b6ceac083f20928938aa7e353307c016950a53a9860dd9b1151808dc1e0 SHA512 0e0b61780a1d86760c50b523ce02e57bababa4e8175105d5908dfd77b699e30cb2dd5a64518a81d2293e56968e138e0dd8653d4e94a7bbac1b69d8297982a39f
-DIST kernel-x86_64-fedora.config.5.11.7 208840 BLAKE2B bead7ffcab503298371e61d37ccb0920e0ee3ba8d5dd019133e3d57bb8973cc2a13498a60c5e150b78f9d6af839a7010fbe89da1b0ecea97cab7036a5fc1aad0 SHA512 1777c0efba6c3c6108f094a5435169230b2a9ed496ab67d5f922054492a695a9f8eee95c2fe9651641c311cec49868a12a7c3614330d37f711ff795110c2c7e5
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.24.tar.sign 991 BLAKE2B 4a095d90b5703f0df09dfa742e72238f5f9c56d153d412c6268e41631338ee6927ac6547768e0ae41b9ef471227456c6d7f951b214f6c3db439ac8a9c49851cc SHA512 fd5ce3e528688481e84081c7d88824140b8738a7c49a10f8f88b434624c8e94f95bb85b11ca9dc643cab3db99b0c47a0c0e5cba2e92559366acec97675cec548
-DIST linux-5.10.24.tar.xz 116299600 BLAKE2B 104be7cceeff8a0e89c8f9a15a8c31f269e8f15eb00b573edbbb555df4861a8105a1a5547e790c23f74d36d20d5dc3be91457869d3a3766fafe536262ea45405 SHA512 27a3bbe8f01e420381dfd8a69e89ea68ae26454113286ab5104ad11e687f3628ae886db2dd3112a916fc39d182fb6269c52caa2117c9a8d22ad7d21e247c0141
-DIST linux-5.10.26.tar.sign 991 BLAKE2B d0a2b78b68f7220ea119926c9945d5354a6575d10974277c302e97adb51dc27fa48e76c31129963bb13423c36a9901986c582eb156e14057c9c1e8ef6a3b0cac SHA512 abac1ce410454a3abb055d4710bea27d8bc15dc06559c55a2ee29ba1928c65e83f225ba3419669607a2cd466cb0ef6c9f24d9882275de24c9daa4c98c5957480
-DIST linux-5.10.26.tar.xz 116302632 BLAKE2B cc3f1632ad24e205f485cc2fef036e4356f67d70fd8ec14e965a24555843e721f18edc0d2f588cba2141a34ae16c13945df21245e2abf03c812d9f35d62e0a15 SHA512 2ff537f519f9cd706f0f18c9635016cf091f2a97b1ae61779955b3861c006a338906acff3bede342d3dcf334cd636bf00a5756f4d55be0c9d924668149534755
 DIST linux-5.10.27.tar.sign 991 BLAKE2B cdc14c00dd1a472f72248e8dfdcdfa08bfccc2308b5a597fcbc71875f84abc6ce0afb43bdeb0ac711a192a69ec9aa4154394954092188c155afd71081d03382d SHA512 4c38f43a8d64896b586854fdeea8b66b00bd19a99a6522a0f775d4667be88b161925c827dd3aea59a8852a3fbdfe7b3d2e59c98000d848b10a19c74d8903b1ca
 DIST linux-5.10.27.tar.xz 116306960 BLAKE2B 0a88aad9f4cff1354069de700806b9d33a7fbe1a9729948178bb763b8513d62bfa71f581a50c2ff0852279f19f8af80e62cb332e950cb5660cad8024568ab321 SHA512 96175a9a08cfa1cdcc4ac510d29420b8b6551f2c9b2afd9b41356d31c287caf43f9ca7197c6f5ede69851fcda63606c7b6ea698e5b098a108671d7c9b2c73e30
-DIST linux-5.10.28.tar.sign 991 BLAKE2B f938f3ff84952ff141c63c6a298c69b57c52debc474504d4872e6bda0c04a15ea5e15f02b10210392e5f37f45875e22faa6fb46f2be558c275682ddc655b6e7f SHA512 c83c379bd06fa6bf588da987aee234962368f7196e5f9bd340dae04321ceeee218183cb9d860ccf7c089b76afe9c4141967fae3829f4b7a5c556153f463bd8fe
-DIST linux-5.10.28.tar.xz 116296264 BLAKE2B 3694a556c5f346ea9e38551810303ceeb392c26929151450a8c8b7d39c97465d697082c27086020f5ab34adaef1223acaa0ffbec498cd1633d31ce3fbcf09e81 SHA512 709359cd755c20b01fc4ec4f2e77d231919b3b50ef6a8ceb66b0e1ca2f0ed6f7efa32ea639a6a39e9814268c48d93de13c7de788e8c1495397dff2097dea2051
 DIST linux-5.10.29.tar.sign 991 BLAKE2B 96075030f4c6daff356ea09845b80d50785d0b9f999886de137fa8524664421374478e06f7cdfbddcf07c4d81190aafc62b54bb472f15e2853d6fc9a44d50386 SHA512 05a50a107aeffad93ab0ce7c652ac14db98d102e36eddead7c4b5e9e6c3d6f8e85144d20982a3dc01fb7dd35dd5f5184d7b48537782048433007d152ef90b3c0
 DIST linux-5.10.29.tar.xz 116306596 BLAKE2B c27637b39b12157cca4b9823bdb24f979f4f89e7a83f4bda6fffe3a25fe70ee82cb731d549b4ab682c6736fd40bef4f5f8e3ef0fed51a63f77a83c4150736859 SHA512 cb0f11b2b3ef0a98d73cbf386199d195d055ee9ac402f8fed7c2c7a09a932c938de63bf28a28a6bef8917a9974d35e7dc4118a408a50341196d1dc3617cc8498
-DIST linux-5.11.10.tar.sign 991 BLAKE2B 8c8e423e547e665369f7e62779b6f612f9b05ae2631a53e2333c623b7a65e3f69f25510451731555829e9d36f78dcabd83eddc350837025323c5ab5dc91e46ed SHA512 8f1e37e39e8ce56a3bb5972cf6a0045e1415395f0cb52a8c12f2c2440a7669114d5f19a739bd803a422abbefb073ebaf32dc6a5b3af46068b965217372bc33de
-DIST linux-5.11.10.tar.xz 117644104 BLAKE2B 84b97aeb190d570144d0e315edf8c0b51fd92a70f94a30f08ef49a65eedd48ee135b2c2f3a1a2827ace96fef2d1963e83948790c7729f3d7c1f615f8d32c9656 SHA512 504f73124e730df2a9e1399b64ba388fea4adf66b52f145cc39a9807a0476b998ea66b6de6d5aafdf9cc1930c1dc8de7bb8c1ae0da93d9ee9ca409ce0b0aff38
-DIST linux-5.11.11.tar.sign 991 BLAKE2B a32455da9348b68fad565c0aa3dcabaee6170720d5641d7e847d919c292393faa55fc1a334382d3cf0e211202fd4a7044a6933b089c40a99764f50c7e9d02518 SHA512 e50774feee452315fa05b1cb7c2f490c7ae36fc7770ab91b9f7ee73a122b11ad57800331ecb73e74bb6cfa9051276b33c41aecad0bc79c8faf66809e201fc55f
-DIST linux-5.11.11.tar.xz 117631560 BLAKE2B e82eca6aee8e983304d363f6b427784df593f1fa8c2e7c54b0c6317e9a59497d4398dcec60a0e1ef7efd1f964e1c55a8ee2e3fb1fbf238a87917b30fc049f30b SHA512 cb4f3e3d2cc8b59527f439b704e9fd8dc515424171fe2db720047f56fa987ea1736fd2cce1a20b2fe4ebf33306d6affe79024225bb5e67d617ae37574b316408
-DIST linux-5.11.12.tar.sign 991 BLAKE2B 521f8f0d9f1dc02ab8f6e0b2c519ba51d6eb5907e84d93a48e437f74b08df5733eafb441765fefd0f8275be311b82b88933811616bf65b88e083ab767b5b10d6 SHA512 a56f8d946ac6d12a403d6f1bcdd2ea7b97497853203a84ee8426f019c855f406b62c6bd42e829b2c47ab1683810a62935f9574bf2fbcb227b36badb0bec935a5
-DIST linux-5.11.12.tar.xz 117647840 BLAKE2B 1defa8e4ef10663e48f62f9c9f7d3a35dd52d6aeaa91fa08371ae96c73a3098196c0e0a17beb78b8a6e246cc51ff3e3e59ffb85abb94c2bd8c14b8282e1e82bc SHA512 fc852d3e6a5ebe0ba5cee46c31d8de435492f4c8904b5889c8eb7105222a9bdf3347347374e5a11e853f5f8fae6fe951f9bdf1676cfb4b35ae19da7dbec71060
+DIST linux-5.10.30.tar.sign 991 BLAKE2B 7bf651faf08ab2bb3b07670e32c0c6eb1cc09bedadaabab4f391495841ab372f119827fbe51ce7e6bc7047686748f9eb62b0bddbc7040fb9763308bf1f64998a SHA512 4507166c972cfbf484d90b49a1156f28eb67a8d5cab8d1ad602b02e1fad0b3a55339d87685b65504df98ad811828d335836dabb06f8873f39bd4ed7b222921e3
+DIST linux-5.10.30.tar.xz 116320464 BLAKE2B 688217cd054aed2d7e3860cb6279c278e1cf052a05257948ccf9e3b5899bfb43b1418130d3fb0f6a9efe2eb4956f795a36f1173487d4432c2451196d47b2a76f SHA512 965b5181a15c05e1365e4ed90b31492ac40c3e92384a27e3540175810bcbca7e32e3bdeb59786716d276f97576980ef8b0663a8b5bd3e6794b2df30878c6bf20
 DIST linux-5.11.13.tar.sign 991 BLAKE2B 32a8fbb32f1c1b6480377c76c157a78436399b7cbdc153650057780e92f8bb5cbbc0c352a2ed9fe8f61c481be874df9e30e96c2fbd2eb9040a4d979eca5d0e8f SHA512 d0e4df56efed1ca900b206f25b6639fcc502c9a5ace9d7f40dfcd2144e066853b8168774d430717511a78c54faf5f3d9ea58db1f37c89efa13ac193dc22c8e02
 DIST linux-5.11.13.tar.xz 117652480 BLAKE2B fd9537a0eb265660ed25d12ff4098ca208035576c580f81cb6a1355eedde2748bdb65521641f68e626a1aee49e7494c79627015a376b7ee4a6373622605ac760 SHA512 6502370280f3bb9d6d91a7aab1249406fbb1f9897eb62baf8bd72bb5845b0ad95931f94aa72de275fb05a36ce1f0d7931fdf53de93a507043f260116185643af
-DIST linux-5.11.5.tar.sign 989 BLAKE2B 7345a3b63a8226eb10e52c65e17babfad90b33fdb2ea5001bf8bfb11d74d6ecef0f573367aad75bb1d787847e2c95222230b46a158817274918b14a965399071 SHA512 ce2ca5332525b3729c7fb270f381316a70efe44d9b136200c25ef4bc322981c3e115b63c9e83050036533c400e92b3f9bcfe0e6f2cb61d9ef207b537ed2bea5b
-DIST linux-5.11.5.tar.xz 117630364 BLAKE2B 9e1f268251877d7508a11e9b7ecfafa50b20591c5f682287f453a28f1b1c06be46d8c8dcf8687542db28a9bd02a48a8496a393baffa072618228d78982f34027 SHA512 8c2a37358b07a5764c23e89d72c0ab68031af0bd9041ffbd4c95597f405fa6f50080d7e62669d55b3fee51e783a10b3548493d3f8171c6ec18cc12682108e97d
-DIST linux-5.11.6.tar.sign 989 BLAKE2B 67e8146202297bab466a41532c824b4aebd2a07fa72000509e50ed2afbe48481262a0be29904c9736a4b77277449b5558ad42aa5cb49007bf03b3416b6d09f8d SHA512 8211ae2c39ad7adc13d704c4a0afa7e7c145a445c49fce624e4c71cf247383be3643988b89b42b05b1cfbe693680ac67838217912d2016389b95a89d5b4d15da
-DIST linux-5.11.6.tar.xz 117637692 BLAKE2B c94885a274c835ce13e109aed4307831a1e57283c2e475dca1fc9c3c0cce97ad599e485b0413dabd182c5d48f9e5e30d071c3f9dcd0d6954e1affe0014279024 SHA512 52761568a81a4f2c8fa7e2ecd4a8d1b4657fc4fd9e31b3d0ba1d65a5ea968db16b0c77e4ae05ddef084f49f419899205b7658de1050b970670ba3111d9c49abb
-DIST linux-5.11.7.tar.sign 989 BLAKE2B 17f901de195cd073449eec6ddffd0de8ca917de6aa5a327a67a77b8880f75d05255661d3806be993afd825b4feac15339e5ec898b72e5ca186aa280a1d05e15e SHA512 38cb882e7f8256a3390886c529e93d755729f2a958739ea88b9cfa1bcdafa556cc2e0b9d5150d2d55edca6923dbe8b081c6dd7bb98689db85a96b3245d9d3310
-DIST linux-5.11.7.tar.xz 117629424 BLAKE2B a89e158b22c55858cb77d8ad71b6c7a31786973461ed04e09c87e7e59545b4ba5ad43f4d5bab7687d6b82565874ce06f2106f0842cf00a6e1c85cd9a1faaa218 SHA512 1cbbbc65b5ebeb49e3e3d08ba1739c11447cb089994551b559a94de7cb72b308161ba176ffbcf486ee89b0de5cc9460ff02af245ad4b19e104d8fe221a56550c
-DIST linux-5.11.9.tar.sign 989 BLAKE2B 4c88424c4612bb53cb6df846ba5379a728759796e24ca3c7d0dd9fbbdfe8874dc656126f594bb78b575aeb73b0c6c748328f0069cee98968c93135a6567ce362 SHA512 4698fcc87236bc61e77134b3569071f40d872d1c1e532fdd4f48132d6bcb4db61294422551232fa31a1d0631679da8675e1765d764b588a62ff35f9a312c769f
-DIST linux-5.11.9.tar.xz 117637496 BLAKE2B 356efa4629b2d9e9ab6ddcbc832a336e399e3aa20f26490633f0bf90cb9b67b94695035617fbc8b4f0f78f42f1d8fab10198871dfe76cb8fc7a7f5e4f6fcca54 SHA512 a79473dd868371e0f81a5700115c1f7278e6e9b40f3b2f1be2085dad8965841c4b575d8a7bd310a941d60e0635b7ae8b4d0bf2adc855378abde8f3cbea9c2385
-DIST linux-5.4.105.tar.sign 991 BLAKE2B 797d4d2e1b23e740c45113aa82a138d0632dc7e99705aed8eb512cc180768f59fd7c3ddbc6a2e8d84b8b4b4c32004d8dda87e441d0e8425795823f841acc5f5d SHA512 efd7f79b89224bf0b48a088beb57caaef49373f4e79dddfbb87b6a3c7e7586674939b43f4af524ef1abb3c20617636392ce4b425df404f671638c80b5a8ee1dd
-DIST linux-5.4.105.tar.xz 109086968 BLAKE2B 5a575d3fc8e7f51eeb244194a7e947dd4bf72890d7a4b90aa77f49f1b7c6c9d79bb03d68275608820642af6513402dc26f2179941f311d6357b722983000c457 SHA512 423be7e90bf49a4afa7f6f3dc8a8bfa9a1691b73ccdc081bf5bcfe0612a084b8cb37acdab77a480629d786cf6d66d48cbed84d505bd27d6f4d815934010eafe7
-DIST linux-5.4.106.tar.sign 991 BLAKE2B 06dc3b61daa4e5073b0f0d0b51b3f11ba2e27b59466a1b76a9ba1ecdf7ba884271575060dea8944f56380cf7f53fa9b785b8036c10d33f783ef32607beaa93c8 SHA512 d699fdaa8a4cce5ebe29dff5d4261797e9aae682562cdebf7017c0f9cee63b4c900e1955d4481ddd2b0f547eb989c12462684dd64299257621be8fc0967716a2
-DIST linux-5.4.106.tar.xz 109095288 BLAKE2B 5ae482c8ce2307350c7e5128a3ee416e3cec847dfe85ec849fab90543476c7f5d6121d65142bedaeadf24b98932e113aeeb85ef2a54e5d0eb93b4b17b434d41e SHA512 2944ecc631be58c62db28ae7203458e5fe9619931dced8f7f2db3ff861db667476f4b20f7826368f0d676a2025e7de4c86ce18684160bf16280db746e5097097
-DIST linux-5.4.108.tar.sign 991 BLAKE2B a85d0c5a613ae8653cce1b1665064be4a9df20b2ddf216bb7dd99966e500422f9e1abebc4975c855cf75af269869486b2b900d1cfb499e26de286ed6a8cd528c SHA512 e054078518a82103e072cd77162495b27f246336a026bbbd0dce7685844b47aa18d51c161e299563d268051743c768cceb2d895f702eb9a90c34595afeef9685
-DIST linux-5.4.108.tar.xz 109084048 BLAKE2B 6dbff4dbb0f3383068ad4eb781b079d344b0d3ad2b0090f60b78d52e25bb4a5b95a50b75b8eaeaa3eb0bfddb166df1b68107c9ff4049aa2b0f837f23554a8a8c SHA512 06ba8a30605e8ac6c840b443f3b776000a25a08018d255a2f0d9a7268cbfcf830bd68d7b248fd1d9da34209ce7ad43351511a082d37da6fe3c29935ceed4a9e3
+DIST linux-5.11.14.tar.sign 991 BLAKE2B b1a33b95e3745ff9bf361614daab255cdc90ebc51c243d4d5101ed24e911b3be357dc12d4d6aa453a957cbd0a9cfdfb1d1e76d264806b9ea4c836a84fad96bfb SHA512 d21bd52c50453d63ff68b8c79373620ad6d29b4becc09bc16b3898eec70b24084cd5d718110f78226b1eac9fae31b6885667da452741b8f30634e13ef4201fe1
+DIST linux-5.11.14.tar.xz 117651976 BLAKE2B bc7a8872d38975e727f71e7b73bf6624c1e2b146997a5a84dcc0754fb66209f9e8e64fb4ca0903ba664997c0d701f32e109a94dad96dd3dc50cc85d1c119ea2b SHA512 8dfc7ff184e5cb33fff74686071f1605f3a834669e201d272f3047aa00657339ec1a3cfd605d8761b8a0f335b8488c02c701e72ed30031856e9c154aa1ff2d88
 DIST linux-5.4.109.tar.sign 991 BLAKE2B 6701f7e216c48473c77140a4845c07726bc5d64956fe62e717871a379aef7dd966ded4101b2bf8d6b509508d50155e7cfaf9b87668bdce1f27949b9b05a5debb SHA512 53f5c65ce93fcfc81792b9e706b4f49963772e7c784c7c5c67f323b840ba5a99a16ab889376c734ac0e044fd3b396795511fb9bd8b19f28f5e0a4dfaa5e7500c
 DIST linux-5.4.109.tar.xz 109086324 BLAKE2B 1c989bf67953ae03d1e6fabbf653058d070aeae1e2d10680c8ae3ef96e42d2d3f44d0a40374fe30c547a53118d37fe25632ae81cd4b497cb5fed8db5ee0eaf4d SHA512 9c41d52c9a76088f670e81aca5d5a62c7218ea496176ac92823594a99893e1948ec550ec7d3434a455de1f79981c3d5b80c8520c375dc50b23a972e0bbe3b78b
-DIST linux-5.4.110.tar.sign 991 BLAKE2B 7b867b443b04df37f66edb0b8b6a5455157905125265b634838e1337cb17347c085c8c43efceed4f017db288de42b39229479ec9eec18d1229b353e059aa338b SHA512 0af3e2e327515a563bfadfb94b99530bff38dbb2318046ed1198a24fd8ad5d26ca32a2b501dd40d4b22bc2801c310db65766d4a1df223aa6326fd84a2f893160
-DIST linux-5.4.110.tar.xz 109093812 BLAKE2B 41664c20aca4a53e94aa7fa475e10284a37bd81d823ae48e7179fe8cbe3dc1ab603c4d162b1335abd0d51d8eb830633d724a4ca8763b494aca41b0ee06895579 SHA512 5b9c2c62d26e24c248a6dbda7607e8a27d6f0d9e969a784efe3e42808c5d89794c61146c1c75728b18274414a0f54c295cd5852581235d324712df01cf6896d0
 DIST linux-5.4.111.tar.sign 991 BLAKE2B 00ea726e62ca8810210ad3be33b40f46cfcd3daeab510b0b16f4788c37e576a0018ddc1e2a280c32a3a574fa89bd929af25d7516efe5eead7dc90bd9c55da199 SHA512 185804fd5afc9cea54911d0228b79860a484d2c45c65e68545944d5818397f735352f0525506685b2f7671de669db3ad6ea5b3ca1f873e8b79b1641eeed7c848
 DIST linux-5.4.111.tar.xz 109087996 BLAKE2B 843f9a6a8413c2d8a2b0f32de704421ebf9200793c5413c51b7ee812fb19a58f79fee90e26b6fa946899487644e4558aff033009f4bba2f229e914542c759662 SHA512 ef17ac3a47e3d2189cea60310fda30d48b2505c399f9f23ec8be2f2787fdd404c8616eec8382bb9398de3e64d5771dd09a942a102796385634af4ba2bbc5f488
+DIST linux-5.4.112.tar.sign 991 BLAKE2B 7f06eb8b2acf5b0529e60d7d6a09a6337c70378468368e552bac5dd59e2f5ed4c3e95f702d2a955055c1fb2dca13658fd91cb30e9303c0cf71c33b6bb9f5fc1e SHA512 af0b615ba78d8c7692061bdbdf7d0cb179917e5d608716ad962e83b528c3f973b7a4d1b85f360ce6295e5ec225232e8c2afd3e43bb0b91dd1b216db33251a867
+DIST linux-5.4.112.tar.xz 109098024 BLAKE2B c8a50b84ba2fea5b1efa6643634042ac60d19b4acb2996e914df99bbddb91a90e772cf8c7a3e38963f1ac2547363c7b203dd1b0ede1571f9e4e685d7e79d419b SHA512 364550a20f91caca3b6f754fba00aee940b20305e9e880899633cef26a5f4ac3641b8817f4ccb615ab084551f4616654bee70558354bb66c924d1e989c8b5db4
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.26.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.26.ebuild
deleted file mode 100644
index fafae29a72c3..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.26.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.28.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.28.ebuild
deleted file mode 100644
index fafae29a72c3..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.28.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.24.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.30.ebuild
similarity index 100%
rename from sys-kernel/vanilla-kernel/vanilla-kernel-5.10.24.ebuild
rename to sys-kernel/vanilla-kernel/vanilla-kernel-5.10.30.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.10.ebuild
deleted file mode 100644
index 647cc29e2bc0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.7
-CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.12.ebuild
deleted file mode 100644
index d190f2b32342..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.11
-CONFIG_HASH=b2a0f449a2f5ccf83289b2817faba55e484a4c61
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.14.ebuild
similarity index 100%
rename from sys-kernel/vanilla-kernel/vanilla-kernel-5.11.11.ebuild
rename to sys-kernel/vanilla-kernel/vanilla-kernel-5.11.14.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.5.ebuild
deleted file mode 100644
index 6b3981828643..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.1
-CONFIG_HASH=07992209452cd7ba529ffdbdd83d01d44cd8ae14
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.6.ebuild
deleted file mode 100644
index 6b3981828643..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.1
-CONFIG_HASH=07992209452cd7ba529ffdbdd83d01d44cd8ae14
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.7.ebuild
deleted file mode 100644
index 647cc29e2bc0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.7
-CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.9.ebuild
deleted file mode 100644
index 647cc29e2bc0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.11.9.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.11.7
-CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
-GENTOO_CONFIG_VER=5.10.18
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.106.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.106.ebuild
deleted file mode 100644
index 0a544ed36171..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.106.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.89
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.108.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.108.ebuild
deleted file mode 100644
index 0a544ed36171..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.108.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.89
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.110.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.110.ebuild
deleted file mode 100644
index 0a544ed36171..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.110.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=5.4.89
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )
-	verify-sig? ( app-crypt/openpgp-keys-kernel )"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.105.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.112.ebuild
similarity index 100%
rename from sys-kernel/vanilla-kernel/vanilla-kernel-5.4.105.ebuild
rename to sys-kernel/vanilla-kernel/vanilla-kernel-5.4.112.ebuild
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index a264e98b0d12..381ae4f9478c 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,9 +6,9 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST patch-4.14.230.xz 4208492 BLAKE2B 6ef752d6b868882fc7851653f85665a9d5b40fe848755642dc5c2aa2e5ed177da941793f9230aad031a64f6b71f1c76b4a471bf4ea5444c0fd340c55ee131307 SHA512 004330e676b64927d01dd864b7458d0be72a7e869083cfb2914eb5d037fe89707f5fd42eb85c944c3b15bbb8dd629140326a02959b6b65a6fefef301a3184239
-DIST patch-4.19.186.xz 3892172 BLAKE2B f219f86c97143809e996abd7ed295ff4370eed08ea593c0ff6a97677587031c4e2eff7dfac404defecebfcf92ef76389873804bd96006f9619a28892a03196e4 SHA512 c74bd131637196b453da4cfcc7a46605d7e6d2630702ed67c65914c67b0e4c1eba0f157a61fb06d40c0ae02436526b01aedae40159cffa4a5351c6c8db9995ea
+DIST patch-4.19.187.xz 3900980 BLAKE2B a09a80846fecaccef6b509a80054d65d4aaaf4ce56e40f40004f8ad5e0e99a5694b5b965d0fd901408a5897ce3522c206048f7b550106c550ad598810d07e71a SHA512 f3982bb3c760c2a0542020b4ac7c9451cfa0c7c258be858859e6951710b92cbcbc719dc4e1960dfb3e917486b8bc49b4e0c617fe82d103fd2f79fa02ede19da4
 DIST patch-4.4.266.xz 3519116 BLAKE2B f354e27aa6c54b7defaee30bcb8f68d5dcf56698fd15b576c0ad767dda00e1169cf7d13eae5e10d5eb3a06128aa12b16742996ded019d6254978f7c47be2e5ab SHA512 cc9dfa983a80b87a73ef4a3c5ba5b2e65a63718c285a6ef3995f73e7fcde0fbbab2f70e5d0c809975c0b5701f7df5163b1f28eb9b576f7c97e64402001ff7890
 DIST patch-4.9.266.xz 3929640 BLAKE2B 835b82584f4ece9a2af3e961e690504f69548a317367d20d337603a445903d6c51c9c8ec1469fe7c00d651ef630e76b238b8310d8a6bca4c4643969eeb072810 SHA512 4223ce90caf7ef9c5df1aaa952159d713b6c508c3de1c09cba153762861ca9e1ebd425343252bd14a76ddb0d926885b862ec14e18a8d0d4e854536ebd064b4d1
-DIST patch-5.10.29.xz 991924 BLAKE2B b58887028336890992bc406cce47d925982e73d3c52b167e1ffeb151e44530857c06917d878a612e9ece3da04903dd1fb2bcaf63f9112e3162b4cdaca9f4d007 SHA512 94c404004734884ed880250f074778e75483815529cc19f12030bed54012b0ca081fe6e6618f7643b9d673d9b7bd649a597ec52f71f9c7f336a682e00d52b2e8
-DIST patch-5.11.13.xz 550404 BLAKE2B 9a25f222abd3e57e743ca2bbea109d1096e4101796e8919143fb6ba3e5fe07736dd95de36f95549557567af9d82c981726e458401d93cbe426df486d4bb8d2f1 SHA512 8834921928521fbc16b01a5833c5afc032e47c9abf0a2e2ccb0248fa8c67ed1050afc43d82b18a56c960872693ef86c9dd5c33fa6be38566546f13da88307f79
-DIST patch-5.4.111.xz 2802500 BLAKE2B e8afd7017279e2a8d3220a839f9db32b597d74beb227918c00229d8ecae2e62fdb6a65d5434f26e23516c833e83039ef2e72e26c99f22d6a13f15d2b150c70b2 SHA512 6ea6441cfe82713a6426d7dc9ce0dfdbe48db1a6c898eb80f5f687f9866d3bd066c141704cd79ea5894e8b2d09e63ac94465fae8d6316cd963ca35e1c779f9c8
+DIST patch-5.10.30.xz 1037532 BLAKE2B 0ec1aa0ea4ab96933f413236f45974084dc43ef80598afdf43675ce679ba4611e45b22bd4db93e02f5a7167865aeceb620df373dbf8de2ed4de67378993ddecc SHA512 7a806161b905090759694a33432ae5a1be96ddf7f6b27c0619ff542c67c9e2c6859694751fc1e5d920dcbd96a0f6b05d0aaec71767ea4c0880afda6b71806d76
+DIST patch-5.11.14.xz 606132 BLAKE2B 6e5115e7a673d3e90597f8531e05b42e8879b0bbc2dec0c1586aff35c8ec7966c8c730923ef8d5647470f6b8fbd2f7c37541e4c9a262123e8ef5bb792433a4ab SHA512 3efb7aabd14dcea42e1ae5635fc3209045279d112df858addadbb2f92d5b1e0d9aefd4eaccb6af96102c289acd455c4a77ba42712d71db61f2f6224b79afc3fc
+DIST patch-5.4.112.xz 2825456 BLAKE2B b98630d960390f03d7bb8236ea2797a6553424b074d903b71b9d9c1eb2808ce95fcd59435d1a86797a3bb627f6c1628711abd699eb8d599c8864783e4407b58f SHA512 6b84c823fcc0670ed67506d2c939303d978920322d6f724ca63600c8eaade276077a5237b1fd63a268112af968969b05af75614258ff32b11e899a87386cff9a
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.186.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.187.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.186.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.187.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.29.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.30.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.29.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.30.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.11.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.11.14.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.11.13.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.11.14.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.111.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.112.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.111.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.112.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 4c98e27c0701..42983c39d605 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libosinfo/libosinfo-1.9.0.ebuild b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
index b019a119ace7..5b789d710cba 100644
--- a/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.9.0.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk-doc +introspection +vala test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Unsure about osinfo-db-tools rdep, but at least fedora does it too
 RDEPEND="
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index f5caba8f2133..27fd29876f66 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/dist-kernel-5.10.28.ebuild b/virtual/dist-kernel/dist-kernel-5.10.28.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.28.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.24.ebuild b/virtual/dist-kernel/dist-kernel-5.10.30.ebuild
similarity index 100%
rename from virtual/dist-kernel/dist-kernel-5.10.24.ebuild
rename to virtual/dist-kernel/dist-kernel-5.10.30.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.11.10.ebuild b/virtual/dist-kernel/dist-kernel-5.11.10.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.11.11.ebuild b/virtual/dist-kernel/dist-kernel-5.11.11.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.11.12.ebuild b/virtual/dist-kernel/dist-kernel-5.11.12.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.26.ebuild b/virtual/dist-kernel/dist-kernel-5.11.14.ebuild
similarity index 100%
rename from virtual/dist-kernel/dist-kernel-5.10.26.ebuild
rename to virtual/dist-kernel/dist-kernel-5.11.14.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.11.5.ebuild b/virtual/dist-kernel/dist-kernel-5.11.5.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.11.6.ebuild b/virtual/dist-kernel/dist-kernel-5.11.6.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.11.7.ebuild b/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.11.9.ebuild b/virtual/dist-kernel/dist-kernel-5.11.9.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.105.ebuild b/virtual/dist-kernel/dist-kernel-5.4.105.ebuild
deleted file mode 100644
index 98a5bc7d0b98..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.105.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.108.ebuild b/virtual/dist-kernel/dist-kernel-5.4.108.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.108.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.109.ebuild b/virtual/dist-kernel/dist-kernel-5.4.109.ebuild
index 972af7365848..98a5bc7d0b98 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.109.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.109.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.4.110.ebuild b/virtual/dist-kernel/dist-kernel-5.4.110.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.110.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.106.ebuild b/virtual/dist-kernel/dist-kernel-5.4.112.ebuild
similarity index 100%
rename from virtual/dist-kernel/dist-kernel-5.4.106.ebuild
rename to virtual/dist-kernel/dist-kernel-5.4.112.ebuild
diff --git a/virtual/jpeg-compat/metadata.xml b/virtual/jpeg-compat/metadata.xml
index 7a38bb900964..733f9c60ae69 100644
--- a/virtual/jpeg-compat/metadata.xml
+++ b/virtual/jpeg-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml
index 7a38bb900964..733f9c60ae69 100644
--- a/virtual/jpeg/metadata.xml
+++ b/virtual/jpeg/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 14e3576d6ede..5e4c4e2915ce 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/anyterm/metadata.xml b/www-apache/anyterm/metadata.xml
index 2b9b44f73497..7a38bb900964 100644
--- a/www-apache/anyterm/metadata.xml
+++ b/www-apache/anyterm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7305699afaaa..eac5ffb06cfd 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 4764ef0a1c3c..92edda8cff07 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1 +1 @@
-DIST chromedriver-bin-89.0.4389.23.linux64.zip 5845152 BLAKE2B 84c6c31498144ea9f8e76df29ca87d49ed8c079bf618d12ae2ed7b68d34bd9018476be32f84e59e5620652a0a259ce576c34de49850eefd5785e31802858a56c SHA512 1ad51b0b75525975166a63b0fe9527b0e9729aeefa6d3855cc2312e5f341e6457ead2d235353ebd046ecbaddb1ac7587e9daa18c5fe6650b2015953506bedf30
+DIST chromedriver-bin-90.0.4430.24.linux64.zip 5795569 BLAKE2B e4dfd2c8452631916e4d11f115fa6c1e4281d2f9350b32566779e288855318e3996d3954256e5bdc6fc8f842197aa817b694788de1b4ae8491dc075a9137e5da SHA512 b85313de6abc1b44f26a0e12e20cb66657b840417f5ac6018946de0c8392b05c11d2c22d35f0526b26c35cf8d6134348e5b6c54a28a3955c5b22cc247ae2ce4a
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-89.0.4389.23.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-90.0.4430.24.ebuild
similarity index 98%
rename from www-apps/chromedriver-bin/chromedriver-bin-89.0.4389.23.ebuild
rename to www-apps/chromedriver-bin/chromedriver-bin-90.0.4430.24.ebuild
index 3d245b3e146a..894c3d02983e 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-89.0.4389.23.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-90.0.4430.24.ebuild
@@ -10,7 +10,6 @@ SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver
 LICENSE="google-chrome"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 RESTRICT="bindist mirror strip"
 
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 5e1c2e2f4db1..ed8fb25b5deb 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,3 +1,4 @@
 DIST grafana-bin-7.4.5.tar.gz 51268864 BLAKE2B c59e16dd8cde882c8f7ffaa3352aeaf38f2fa1e5da3d340796403b0719d33b9eeb5fb7d8ac54b8321f2617d534a3121d2f8a86462e7cf07019baf2a08b141cc2 SHA512 8ad7e2fa9ca92a406690f5a14ea111ff329e6abb4330d4ede5bb34870c3d28cdec940db4c849bb99c097276ad10a3d4c70cf6b73ed8286d45fdf056673d0892f
 DIST grafana-bin-7.5.1.tar.gz 55420645 BLAKE2B 1100f68eeaeda5dd4d7928c0e16bcefe686427866472a750228eaa5612bc7c7d40db24d8767ae8e9766d70593de2504c57cb8a145efa1ff81074d38c69452ca7 SHA512 bee8b95820a8d8983aa430ee1e7de65da0b90ecfe0eeab8d8a5486af818a4bede73846bcc5aae2c9735204be004171ae98bccd7546d3c0220030260f1f1ed203
 DIST grafana-bin-7.5.2.tar.gz 52181388 BLAKE2B 7203ffb42169d9b92b2f251015195373abe58619ec7da7e65037d30a7a856e02dd07abc93c41b4f911fa1bd8b382d29e753f75b6717e65f211687127f0ce7ad9 SHA512 4eeff81371149f22f0c708d467623ace32ef1c9cd812d232c21323eeeb9bfa4e54658bca875b6c40c9b25caa4a56ea43e39b5389753348cc79710228ae135309
+DIST grafana-bin-7.5.4.tar.gz 52194914 BLAKE2B d2a6666d0d45116fe8b3241d38bef837e306c621fd9eb1b4e3b99ece17465e93643a9a0ba98504255b32826a97d91559bc04ba2eed9bfa9398d7346e8147439e SHA512 690038d39269341f435b79d430e11d8e1a54367ae2ccf3b5f625b8e7b87bbce2f9c650e1b446522a475c7c3b7da91786e93d5964150c9c208471febc1e498300
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.4.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.4.ebuild
new file mode 100644
index 000000000000..229e2a789b9e
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-7.5.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 7b98572257f0..6f93df2e58ef 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index dd4f2d01e1ef..f9fb0b1150b1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
 DIST chromium-89-patchset-7.tar.xz 4640 BLAKE2B 6150f92a4cb83025b7521c573e9a14bfcb26f7a5ff4ebe79cfc819b214ae05d0e986b9db561a99b4f9c7b4a8e4adf1c8ee966011bb0791ef11fc2be89b03b216 SHA512 6ef5be9e56b82c70d3d1a0596e74af3bab97ea82a8247b6d0ba736411779be10b17c7cd9ccd9eae5fac27af3907fd3b56e301e73011f58b2c4052bbc03390b1c
 DIST chromium-89.0.4389.114.tar.xz 890898912 BLAKE2B b9590f83eb54fc1b524a7893f8ce0317cb5648aae84853b8958f2a0f65ae2f8331e65732322f4956fb5bc58ef3691755ae66ed901567e2b5a9749a99fc6096c4 SHA512 5b8d92ecde3ab35847dc4981caa12434334f81fc576e8809c5832a18989b6d1465ae8c43f0ad0ea8a3da7a5876c52679c57ec8323109de2b81ac467419fa1a4c
+DIST chromium-89.0.4389.128.tar.xz 890850492 BLAKE2B 24a6437024994c5fbefc059b966e1bd6dd3d11ad827ba2dc0e010e5503a7a93579d0cb23acc0c00f687c7f21372bb04eae875e555abb933a4a9afe813b8b727c SHA512 37f694dea7a1f398082c5c0f02579c9e2c855a424cf4e09ebc94cac9313836e604dcc52bd1fbc105ac3d5e54bb056da3e62daec1e3bbd11c00f466125ef4bdc1
 DIST chromium-90-patchset-7.tar.xz 3892 BLAKE2B 3ba169baaaf74b548749be3f845f505256cc9573f798e10929b5d1f0f534d739e657e3fa134c78ec3f7987a3b89adfc4bee0d1a6585ad8fe4bdc3ffd1181042c SHA512 5e1aa834ee5668ee40fc3af5cda7325da710dd1a0dea7ce535e89e36fd7d321db63d520a9b6ce6372ed941473dff18d1276316567af810c18e1478a04d3f23f8
 DIST chromium-90.0.4430.70.tar.xz 917490588 BLAKE2B 335bd7cca22b691dce110ca838c71abc8971423be1f74709f2f95dbd6c5c9cfb79dca9391ceb11e2571ef0ce66e727bcaadef044923d2df7720873db71e48e72 SHA512 c75bd3b0078d90aa28d0542c845fbae1ac7a478ca70386ad74f98f4541186e3d5f5ceafd4f447ee541dfff2cc4cb5bec9be5d8d510cb52fcf2d188c3fc666311
 DIST chromium-91-patchset-4.tar.xz 3188 BLAKE2B 34d64f4124cb5c020d7d20c883c3409f710b96d5412f8881936e86d78ed034c1d70bd16f9324c5af21f735c3c5f98b4b4cd28cbd7f86f9513df2a5f1ff404772 SHA512 79c1640a7248d628c31fdbf3df296aa888e80f3c90cc6a74be56ac1389d9748b7cce88641e626cd4a5ae298e82fb325a8604fda68378706f0f26a2570e8983a2
diff --git a/www-client/chromium/chromium-89.0.4389.128.ebuild b/www-client/chromium/chromium-89.0.4389.128.ebuild
new file mode 100644
index 000000000000..db9c25d44cb1
--- /dev/null
+++ b/www-client/chromium/chromium-89.0.4389.128.ebuild
@@ -0,0 +1,910 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="7"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libxcb:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			dev-libs/libffi:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+			x11-libs/libxkbcommon:=
+		)
+	)
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-10"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-10"
+	DEPEND+=" >=sys-libs/libcxx-10"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-68.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
+		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
+			die "Component build with tcmalloc requires FEATURES=-usersandbox."
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			if use component-build; then
+				die "Component build with clang requires fuzzer headers."
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-89-webcodecs-deps.patch"
+		"${FILESDIR}/chromium-89-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	# seccomp sandbox is broken if compiled against >=sys-libs/glibc-2.33, bug #769989
+	if has_version -d ">=sys-libs/glibc-2.33"; then
+		ewarn "Adding experimental glibc-2.33 sandbox patch. Seccomp sandbox might"
+		ewarn "still not work correctly. In case of issues, try to disable seccomp"
+		ewarn "sandbox by adding --disable-seccomp-filter-sandbox to CHROMIUM_FLAGS"
+		ewarn "in /etc/chromium/default."
+		PATCHES+=(
+			"${FILESDIR}/chromium-glibc-2.33.patch"
+		)
+	fi
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/schema_org
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tint
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	if use wayland || use headless; then
+		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+		myconf_gn+=" ozone_platform_headless=true"
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	else
+		myconf_gn+=" use_ozone=false"
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-accelerated-video-decode"
+		elog "inside Chromium or add --enable-accelerated-video-decode"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 3a89cd9a94cb..9fefdd5332c3 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_90.0.4430.70-1_amd64.deb 77663604 BLAKE2B 3363b360af632f41e623c7315bb87da12620388394171c65ee2d98c7ea01e2e0e8a0d38bf4572779a7f915b1f133f200cda7213d00286b33e45d53db34784acc SHA512 5c1c07f184ec68588aa762e6767703cc37c411ab1da0f0e4db9b901c49df73d73c1df3ffac69ea262084636ea83166f8d8a2497f267ecad79c6a1fed5e935b73
+DIST google-chrome-beta_90.0.4430.72-1_amd64.deb 77768092 BLAKE2B 4403a03cd1cd82854f63cae69aa08049f1e0e31a848c3289fe24bf7b17de4baafac2a1ebe580c680e7f90a5f5d3b9bd12581432797b763608eff31b3e78999b4 SHA512 cfc44c18ecd21826617091bcf85309f5a0d1a23a86dd4167f7fde6783932ed68c30bc6932843a049d72fb39ccef6c1a228a799cb5643fc765c0edad837866c29
diff --git a/www-client/google-chrome-beta/google-chrome-beta-90.0.4430.70.ebuild b/www-client/google-chrome-beta/google-chrome-beta-90.0.4430.72.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-90.0.4430.70.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-90.0.4430.72.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index acba947565c2..f5401952c2f2 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_89.0.4389.128-1_amd64.deb 75863124 BLAKE2B 1609d599ad60d9b1a2fb8faf8ef258943b53a5204b83b764d309646a1aab3c7a250ee429209ce3f61f2a249cb55bb16d01dcb5d2643f1d5c9325bc12c1139b15 SHA512 5f118650ab8b88bd7a0e04c65f110359c02a17a4402c2a99520ab8fcb8d884b9d26fef48e40a3ec4c44245b76a3c2747108c52cc742a9d4c16129472c267916c
+DIST google-chrome-stable_90.0.4430.72-1_amd64.deb 77750116 BLAKE2B 2178ca802bc9cb618996af93379032f09e4d905811899d0f4136e405005075129422c49a98b0a1c3bb511d625183146e4356cbb6262a868c3317fb9313e7f0b1 SHA512 0acd31b97475124ebebe2a72528c7e9a06ccb3beacb8c42793c0b51453a96ac545bee6cd7017f0009d1550ea7889f5a6ced8adb7f2939ab293b733eece492065
diff --git a/www-client/google-chrome/google-chrome-89.0.4389.128.ebuild b/www-client/google-chrome/google-chrome-90.0.4430.72.ebuild
similarity index 100%
rename from www-client/google-chrome/google-chrome-89.0.4389.128.ebuild
rename to www-client/google-chrome/google-chrome-90.0.4430.72.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 4b0abd077ae2..b2c33db65370 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -2,5 +2,7 @@ DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a
 DIST seamonkey-2.53.6.source-l10n.tar.xz 13520676 BLAKE2B cae6fad22f30c0e685ef3829e4a67f09420a1114e259e71a998819e7bf33ecf7428959aa99bb4299482e5d149fe85575e8f4ea5ba254dae0fe10e2a634be2aa5 SHA512 aabbe7a93c2a78ad5dde819265540ea7516f0bc1cbc876a64b81969697e6389467d3ea682a02d15ebdd182a5d0c5ae122ecce9ce18874910ab968ee7664fe501
 DIST seamonkey-2.53.6.source.tar.xz 283905464 BLAKE2B 77ecb3df1b4f0a8f2fd4fa1899d3f4459d3630fc7f0dacd050ba53709d9db5af1ab49c465ba6ef264036aaac834897c0f035c1ca49a3ab34250eb4f3b244d220 SHA512 1854862b5b4781e21cb14bdb6be95e219195459202f55cde3800594174307a9ff23e8b29304494489e947a2749765cdb75ca56633f2fcff8afaf277da972a573
 DIST seamonkey-2.53.6_beta1-patches-01.tar.xz 44160 BLAKE2B f6a959a983e726cd919ab5004b27cd496a78cd58759168d6dd64e155059c7b52f269bc42143ddb69a1e8880c72779257216d942a1abc58800491fde9eaaea061 SHA512 710e668209f76f2ca4112923c61219e435123791dfcfcb202af1f7975436d17f13ab025722e9725f219e9de9d024091514d23c71a851d68f750c11ea8d56c2b9
+DIST seamonkey-2.53.7.1.source-l10n.tar.xz 13540652 BLAKE2B a42471ee8d2c4c57158291a9770aa6759a620e4b9a38a1bedcf17495332924839d65f1a12dce3c7452137fd6d176c576ec0da639f20be29621b10406c0e9bd4f SHA512 d4bde45e0dfdbd1eb316ef3f3d2e611a1a3314a1144ad7075f96ad35c961bc07fd82bbfd7959aa9bee0034cbf081427670d7da3eb3b3aac85b5db7aab92b32a5
+DIST seamonkey-2.53.7.1.source.tar.xz 283452108 BLAKE2B 4f0a73c5d57c708e4b5d5af6ddee1c9515b6bf401b0181da17c03cdeee1afb9d120c0157cdf2a07e8fa6495462e8bbb4b85e3e6646dbbead123934c565732926 SHA512 21f52b2668b8cb31670a80f3fbcd04d714527545ddd36fa5782999be398428cfeac989da4e3e7e049202249d43c71228ebc8640dd0b594150c8cff0b587caf7e
 DIST seamonkey-2.53.7.source-l10n.tar.xz 13540652 BLAKE2B a42471ee8d2c4c57158291a9770aa6759a620e4b9a38a1bedcf17495332924839d65f1a12dce3c7452137fd6d176c576ec0da639f20be29621b10406c0e9bd4f SHA512 d4bde45e0dfdbd1eb316ef3f3d2e611a1a3314a1144ad7075f96ad35c961bc07fd82bbfd7959aa9bee0034cbf081427670d7da3eb3b3aac85b5db7aab92b32a5
 DIST seamonkey-2.53.7.source.tar.xz 283282204 BLAKE2B a0e239381b6f1dbd41042ab1daf1ed986d6ea9f6fb68cb38b41e05e579937d1754f4293f1d3b9ded7ce6f05f3ca8cd292addfd06fe6405777c440ded2804d4c1 SHA512 175bf010f5279f07e0cccaf2d8caf4d6e0368de035aba7b5bc4c5da301de19aa7fc8c0125b2ee3d1c1a859e94c8f7985c977bafe48cd6f453d609270891887e5
diff --git a/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch b/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch
new file mode 100644
index 000000000000..c0ae11ff076b
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch
@@ -0,0 +1,236 @@
+--- seamonkey-2.53.7/comm/suite/app/profile/suite-prefs.js
++++ seamonkey-2.53.7/comm/suite/app/profile/suite-prefs.js
+@@ -225,16 +225,17 @@ pref("browser.tabs.autoHide", false);
+ pref("browser.tabs.forceHide", false);
+ pref("browser.tabs.closeWindowWithLastTab", true);
+ pref("browser.tabs.warnOnClose", true);
+ pref("browser.tabs.warnOnCloseOther", true);
+ pref("browser.tabs.warnOnOpen", true);
+ pref("browser.tabs.maxOpenBeforeWarn", 15);
+ pref("browser.tabs.insertRelatedAfterCurrent", true);
+ pref("browser.tabs.insertAllTabsAfterCurrent", false);
++pref("browser.tabs.selectOwnerOnClose", true);
+ 
+ // For future use
+ pref("browser.tabs.loadBookmarksInBackground", false);
+ 
+ // how many browsers can be saved in the DOM (by the tabbed browser)
+ pref("browser.tabs.max_tabs_undo", 3);
+ // should popups by saved in the DOM (by the tabbed browser)
+ pref("browser.tabs.cache_popups", false);
+--- seamonkey-2.53.7/comm/suite/base/content/utilityOverlay.js
++++ seamonkey-2.53.7/comm/suite/base/content/utilityOverlay.js
+@@ -1624,21 +1624,23 @@ function openLinkIn(url, where, params)
+     // forces tab to be focused
+     loadInBackground = true;
+     // fall through
+   case "tabshifted":
+     loadInBackground = !loadInBackground;
+     // fall through
+   case "tab":
+     var browser = w.getBrowser();
++    var owner = loadInBackground ? null : browser.selectedTab;
+     var tab = browser.addTab(url, {
+                 referrerURI: aReferrerURI,
+                 referrerPolicy: aReferrerPolicy,
+                 charset: aCharset,
+                 postData: aPostData,
++                ownerTab: owner,
+                 allowThirdPartyFixup: aAllowThirdPartyFixup,
+                 relatedToCurrent: aRelatedToCurrent,
+                 allowMixedContent: aAllowMixedContent,
+                 noReferrer: aNoReferrer,
+                 userContextId: aUserContextId,
+                 originPrincipal: aPrincipal,
+                 triggeringPrincipal: aTriggeringPrincipal,
+               });
+--- seamonkey-2.53.7/comm/suite/browser/tabbrowser.xml
++++ seamonkey-2.53.7/comm/suite/browser/tabbrowser.xml
+@@ -1151,16 +1151,28 @@
+             newBrowser.docShellIsActive = this.mCurrentTab.linkedBrowser.docShellIsActive;
+             if (this.mCurrentBrowser) {
+               this.mCurrentBrowser.droppedLinkHandler = null;
+               this.mCurrentBrowser.docShellIsActive = false;
+               this.mCurrentBrowser.removeAttribute("primary");
+               this.finder.mListeners.forEach(l => this.mCurrentBrowser.finder.removeResultListener(l));
+             }
+ 
++            var oldTab = this.mCurrentTab;
++
++            // Preview mode should not reset the owner
++            if (!this._previewMode && !oldTab.selected)
++              oldTab.owner = null;
++
++            let lastRelatedTab = this.mLastRelatedIndex ? this.tabs[this.mLastRelatedIndex] : null;
++            if (lastRelatedTab) {
++              if (!lastRelatedTab.selected)
++                lastRelatedTab.owner = null;
++            }
++
+             newBrowser.setAttribute("primary", "true");
+             this.mCurrentBrowser = newBrowser;
+             this.mCurrentTab = this.selectedTab;
+             this.mCurrentTab.removeAttribute("unread");
+             this.finder.mListeners.forEach(l => this.mCurrentBrowser.finder.addResultListener(l));
+ 
+             var tabListener = this.mTabListeners[this.tabContainer.selectedIndex];
+ 
+@@ -1445,16 +1457,19 @@
+                 opener: null,
+               };
+             }
+ 
+             params.focusNewTab = params.inBackground != null ?
+                 !params.inBackground :
+                 !Services.prefs.getBoolPref("browser.tabs.loadInBackground");
+ 
++            if (params.focusNewTab)
++              params.ownerTab = this.selectedTab;
++
+             return this.addTab(aURI, params);
+          ]]>
+         </body>
+       </method>
+ 
+       <method name="loadTabs">
+         <parameter name="aURIs"/>
+         <parameter name="aLoadInBackground"/>
+@@ -1556,43 +1571,49 @@
+         <parameter name="aPostData"/>
+         <parameter name="aFocusNewTab"/>
+         <parameter name="aAllowThirdPartyFixup"/>
+         <body>
+           <![CDATA[
+             var aTriggeringPrincipal;
+             var aReferrerPolicy;
+             var aFromExternal;
++            var aOwner;
+             var aRelatedToCurrent;
+             var aAllowMixedContent;
+             var aNoReferrer;
+             var aUserContextId;
+             var aOriginPrincipal;
+             var aOpener;
+             if (arguments.length == 2 &&
+                 arguments[1] != null &&
+                 typeof arguments[1] == "object" &&
+                 !(arguments[1] instanceof Ci.nsIURI)) {
+               let params = arguments[1];
+               aTriggeringPrincipal  = params.triggeringPrincipal;
+               aReferrerURI          = params.referrerURI;
+               aReferrerPolicy       = params.referrerPolicy;
+               aCharset              = params.charset;
+               aPostData             = params.postData;
++              aOwner                = params.ownerTab;
+               aFocusNewTab          = params.focusNewTab;
+               aAllowThirdPartyFixup = params.allowThirdPartyFixup;
+               aFromExternal         = params.fromExternal;
+               aRelatedToCurrent     = params.relatedToCurrent;
+               aAllowMixedContent    = params.allowMixedContent;
+               aNoReferrer           = params.noReferrer;
+               aUserContextId        = params.userContextId;
+               aOriginPrincipal      = params.originPrincipal;
+               aOpener               = params.opener;
+             }
+ 
++            // if we're adding tabs, we're past interrupt mode, ditch the owner
++            if (this.mCurrentTab.owner)
++              this.mCurrentTab.owner = null;
++
+             this._browsers = null; // invalidate cache
+ 
+             var t = this.referenceTab.cloneNode(true);
+ 
+             var blank = !aURI || aURI == "about:blank";
+ 
+             if (!blank)
+               t.setAttribute("label", aURI);
+@@ -1640,16 +1661,20 @@
+ 
+             // We start our browsers out as inactive.
+             b.docShellIsActive = false;
+ 
+             this.mStrip.collapsed = false;
+ 
+             Services.prefs.setBoolPref("browser.tabs.forceHide", false);
+ 
++            // If this new tab is owned by another, assert that relationship
++            if (aOwner)
++              t.owner = aOwner;
++
+             // wire up a progress listener for the new browser object.
+             var position = this.tabs.length - 1;
+             var tabListener = this.mTabProgressListener(t, b, blank);
+             const filter = Cc["@mozilla.org/appshell/component/browser-status-filter;1"]
+                              .createInstance(Ci.nsIWebProgress);
+             filter.addProgressListener(tabListener, Ci.nsIWebProgress.NOTIFY_ALL);
+             b.webProgress.addProgressListener(filter, Ci.nsIWebProgress.NOTIFY_ALL);
+             this.mTabListeners[position] = tabListener;
+@@ -1689,16 +1714,20 @@
+             // aReferrerURI is null or undefined if the tab is opened from
+             // an external application or bookmark, i.e. somewhere other
+             // than the current tab.
+             if ((aRelatedToCurrent || aReferrerURI ||
+                  Services.prefs.getBoolPref("browser.tabs.insertAllTabsAfterCurrent")) &&
+                 Services.prefs.getBoolPref("browser.tabs.insertRelatedAfterCurrent")) {
+               var lastRelatedIndex = this.mLastRelatedIndex ||
+                                      this.tabContainer.selectedIndex;
++              if (this.mLastRelatedIndex)
++                  this.tabs[this.mLastRelatedIndex].owner = null;
++              else
++                  t.owner = this.selectedTab;
+               this.moveTabTo(t, ++lastRelatedIndex);
+               this.mLastRelatedIndex = lastRelatedIndex;
+             }
+ 
+             if (aFocusNewTab) {
+               var parentTab = this.selectedTab;
+               this.selectedTab = t;
+               this.mPreviousTab = parentTab;
+@@ -2007,16 +2036,23 @@
+             oldBrowser.webProgress.removeProgressListener(filter);
+             filter.removeProgressListener(this.mTabListeners[index]);
+             this.mTabFilters.splice(index, 1);
+             this.mTabListeners.splice(index, 1);
+ 
+             // We are no longer the primary content area
+             oldBrowser.removeAttribute("primary");
+ 
++            // Remove this tab as the owner of any other tabs, since it's going away.
++            for (let tab of this.tabs) {
++              if ("owner" in tab && tab.owner == aTab)
++                // |tab| is a child of the tab we're removing, make it an orphan
++                tab.owner = null;
++            }
++
+             // Now select the new tab before nuking the old one.
+             var currentIndex = this.tabContainer.selectedIndex;
+ 
+             var newIndex = -1;
+             if (currentIndex > index)
+               newIndex = currentIndex - 1;
+             else if (currentIndex < index)
+               newIndex = currentIndex;
+@@ -2033,17 +2069,21 @@
+             this._browsers = null;
+ 
+             // Clean up before/afterselected attributes before removing the tab
+             aTab._selected = false;
+             aTab.remove();
+ 
+             // When the current tab is removed select a new tab
+             // and fire select events on tabpanels and tabs
+-            if (this.mPreviousTab && (aTab == this.mCurrentTab))
++            if (aTab.owner && !aTab.owner.hidden && !aTab.owner.closing &&
++                Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")) {
++              this.selectedTab = aTab.owner;
++            }
++            else if (this.mPreviousTab && (aTab == this.mCurrentTab))
+               this.selectedTab = this.mPreviousTab;
+             else {
+               this.tabContainer.selectedIndex = newIndex;
+ 
+               // We need to explicitly clear this, because updateCurrentBrowser
+               // doesn't get called for a background tab
+               this.mPreviousTab = null;
+             }
diff --git a/www-client/seamonkey/seamonkey-2.53.7.1.ebuild b/www-client/seamonkey/seamonkey-2.53.7.1.ebuild
new file mode 100644
index 000000000000..6bc46b25eded
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.7.1.ebuild
@@ -0,0 +1,557 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+fi
+
+SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+S="${WORKDIR}/${MY_MOZ_P}"
+
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit autotools check-reqs desktop flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="https://www.seamonkey-project.org/"
+
+PATCH="${PN}-2.53.6_beta1-patches-01"
+SRC_URI+="
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
+"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
+lto minimal pulseaudio +roaming selinux startup-notification test wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+	dev-lang/perl
+	sys-apps/findutils
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	>=virtual/rust-1.34.0
+	amd64? ( ${ASM_DEPEND} )
+	lto? ( sys-devel/binutils[gold] )
+	x86? ( ${ASM_DEPEND} )
+"
+COMMON_DEPEND="
+	>=app-text/hunspell-1.5.4:=
+	dev-libs/atk
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libffi-3.0.10:=
+	>=dev-libs/nspr-4.23
+	>=dev-libs/nss-3.47.1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=media-libs/libpng-1.6.31:0=[apng]
+	>=media-libs/mesa-10.2:=
+	>=sys-libs/zlib-1.2.3
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	>=x11-libs/pixman-0.19.2
+	media-video/ffmpeg
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=dev-libs/dbus-glib-0.72
+		>=sys-apps/dbus-0.60
+	)
+	jack? ( virtual/jack )
+	crypt? ( <x11-plugins/enigmail-2.1.0 )
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	pulseaudio? ( || (
+		media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9
+	) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.9-r1
+		>=media-libs/harfbuzz-1.3.3:0=
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
+	wifi? (
+		kernel_linux? (
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+			>=sys-apps/dbus-0.60
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )
+"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+[[ -z ${GMP_PLUGIN_LIST} ]] && GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+spkg_setup() {
+	# Ensure we have enough disk space to compile
+	if use debug || use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local l10n_sources="${P}.source-l10n.tar.xz"
+	unpack ${A/ ${l10n_sources}}
+
+	mkdir "${S}/${P}-l10n" || die
+	cd "${S}/${P}-l10n" || die
+	unpack ${l10n_sources}
+}
+
+src_prepare() {
+	rm "${WORKDIR}/mozilla/6009_musl_sandbox_membarrier.patch" || die
+
+	# Apply our patches
+	eapply "${WORKDIR}"/mozilla
+
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1623054
+	eapply "${FILESDIR}/${PN}-2.53.7-ownertab.patch"
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	use system-libvpx \
+		&& eapply -p2 "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Don't error for format with gcc-9
+	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			build/unix/run-mozilla.sh || die
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \
+		xpcom/io/nsAppFileLocationProvider.cpp || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i comm/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	if ! use chatzilla ; then
+		sed '/extensions\/irc\/locales libs-/s@^@#@' \
+			-i comm/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	######################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	######################################
+
+	mozconfig_init
+
+	##################################
+	# Former mozconfig_config() part #
+	##################################
+
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' --with-system-bz2
+	mozconfig_annotate 'system_libs' --with-system-zlib
+
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Must pass release in order to properly select linker via gold useflag
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Must pass --enable-gold if using ld.gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
+
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+
+	mozconfig_use_enable startup-notification
+
+	# wifi pulls in dbus so manage both here
+	mozconfig_use_enable wifi necko-wifi
+	if use kernel_linux && use wifi && ! use dbus ; then
+		echo "Enabling dbus support due to wifi request"
+		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]] ; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# default toolkit is cairo-gtk3, optional use flags can change this
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# For testing purpose only
+	mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-av1
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die
+		fi
+	fi
+
+	if use lto ; then
+		# Linking only works when using ld.gold when LTO is enabled
+		mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		# ThinLTO is currently broken, see bmo#1644409
+		mozconfig_annotate '+lto' --enable-lto=full
+	else
+		if tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	##################################
+	# Former mozconfig_config() end  #
+	##################################
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Linking fails without this due to memory exhaustion
+	use x86 && append-ldflags "-Wl,--no-keep-memory"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# use startup-cache for faster startup time
+	mozconfig_annotate '' --enable-startupcache
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+	# Use system's Python environment
+	#export MACH_USE_SYSTEM_PYTHON=1
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	emake V=1 -f client.mk configure
+	#./mach configure || die
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+	#./mach build --verbose || die
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				dist/bin/defaults/pref/all-gentoo.js || die
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	emake DESTDIR="${D}" install
+	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
+
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/comm/suite/branding/${PN}/default64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -r "${ED}"/usr/include "${ED}/${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || die
+	fi
+
+	if use chatzilla ; then
+		emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Provide a place for plugins
+	keepdir "${MOZILLA_FIVE_HOME}/plugins"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+
+}
+
+pkg_preinst() {
+	SEAMONKEY_PLUGINS_DIR="${ROOT}/usr/$(get_libdir)/${PN}/plugins"
+
+	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
+		rm "${SEAMONKEY_PLUGINS_DIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 8b659b15defb..633fa09ab0c5 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 7eae1e2491f6..b57e281eac17 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_90.0.4430.70-1_amd64.deb 77663604 BLAKE2B 3363b360af632f41e623c7315bb87da12620388394171c65ee2d98c7ea01e2e0e8a0d38bf4572779a7f915b1f133f200cda7213d00286b33e45d53db34784acc SHA512 5c1c07f184ec68588aa762e6767703cc37c411ab1da0f0e4db9b901c49df73d73c1df3ffac69ea262084636ea83166f8d8a2497f267ecad79c6a1fed5e935b73
-DIST google-chrome-stable_89.0.4389.114-1_amd64.deb 75857544 BLAKE2B b39c6db6aba2686f73ec31e7299f5bae3ed4b7abd074e28ea976b7f0f9beb515fe6faa89978a4eb20f2a87ebcea58b0e0fe152a1bf9b377f781dc692b7a42d90 SHA512 33813521e2ad77f261d91ce3d13480c76c7d4d4e58b2d3f1dc2201c9aa0caed51ea4e4470a539b39d6f4ce38d11c318243e02642d44979c636a8e83d12f79a10
+DIST google-chrome-beta_90.0.4430.72-1_amd64.deb 77768092 BLAKE2B 4403a03cd1cd82854f63cae69aa08049f1e0e31a848c3289fe24bf7b17de4baafac2a1ebe580c680e7f90a5f5d3b9bd12581432797b763608eff31b3e78999b4 SHA512 cfc44c18ecd21826617091bcf85309f5a0d1a23a86dd4167f7fde6783932ed68c30bc6932843a049d72fb39ccef6c1a228a799cb5643fc765c0edad837866c29
+DIST google-chrome-stable_90.0.4430.72-1_amd64.deb 77750116 BLAKE2B 2178ca802bc9cb618996af93379032f09e4d905811899d0f4136e405005075129422c49a98b0a1c3bb511d625183146e4356cbb6262a868c3317fb9313e7f0b1 SHA512 0acd31b97475124ebebe2a72528c7e9a06ccb3beacb8c42793c0b51453a96ac545bee6cd7017f0009d1550ea7889f5a6ced8adb7f2939ab293b733eece492065
 DIST google-chrome-unstable_91.0.4469.4-1_amd64.deb 79111896 BLAKE2B d32edcec7e723a37fd50a6ba5565acc72d8c859a84762271ed94438830880afea7a246c35c7c387aa58848b326e2689043dccd03dea334df5cdee545e1dc08f9 SHA512 42439166e19f0c798dfcc8bbcb00252cc132360c38eb293f7b9a83a2f35278882102ad65f844f77d65b9233b18b4fd8668d7e8f597cb0e02d80f875b32004c81
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.114.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.72.ebuild
similarity index 99%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.114.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.72.ebuild
index 2e17df9a1303..575d76b0e179 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4389.114.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.72.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit multilib unpacker
 
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.70_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.72_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.70_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.72_beta.ebuild
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index b1c874e2b4b0..7879dfb0511c 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
index ec7b55085f10..e49f0d877c31 100644
--- a/x11-base/xorg-server/xorg-server-1.20.11.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ccc44061d6ce..b75d3cfb8ef5 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild
index a87909bef1c9..a42781906f2e 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
index 392f0d732dea..2ed5aa52ec25 100644
--- a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2+"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f3f1288548af..8c66e8f2651f 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/dclock/dclock-2.2.2_p12.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
index f716d8cf1f53..aa4f9a6f28fd 100644
--- a/x11-misc/dclock/dclock-2.2.2_p12.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 "
 BDEPEND="
 	app-text/rman
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	xft? ( virtual/pkgconfig )
 "
 S=${WORKDIR}/${P/_p*/}
@@ -53,7 +53,8 @@ src_configure() {
 		sed -i -e '/EXTRA_LIBRARIES/s|^|#|g' Imakefile || die
 	fi
 
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/imake/files/imake-1.0.8-cpp-args.patch b/x11-misc/imake/files/imake-1.0.8-cpp-args.patch
new file mode 100644
index 000000000000..4fb382b0a19c
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-cpp-args.patch
@@ -0,0 +1,18 @@
+Copy code from IMAKEINCLUDE to IMAKECPP to handle arguments
+such as -E. Lets IMAKECPP=$(tc-getCPP) be usable.
+--- a/imake.c
++++ b/imake.c
+@@ -532,6 +532,12 @@
+ 			}
+ 	}
+-	if ((p = getenv("IMAKECPP")))
++	if ((p = getenv("IMAKECPP"))) {
+ 		cpp = p;
++		for (; *p; p++)
++			if (*p == ' ') {
++				*p++ = '\0';
++				AddCppArg(p);
++			}
++	}
+ 	if ((p = getenv("IMAKEMAKE")))
+ 		make_argv[0] = p;
diff --git a/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch b/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch
new file mode 100644
index 000000000000..155200461157
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch
@@ -0,0 +1,37 @@
+If /usr/bin/cc exists then get_gcc() is always true on Linux (and many
+others), but will fail in the event it's missing (-native-symlinks).
+
+get_gcc_version does not execute gcc and merely sets defines, so
+call it without using get_gcc(). Validity of using NULL should be
+verified if there's ever a new version.
+--- a/imake.c
++++ b/imake.c
+@@ -1341,4 +1341,5 @@
+ #endif
+ 
++#if defined CROSSCOMPILE
+ static boolean
+ get_gcc(char *cmd)
+@@ -1394,5 +1395,4 @@
+ }
+ 
+-#ifdef CROSSCOMPILE
+ static void
+ get_gcc_incdir(FILE *inFile, char* name)
+@@ -1640,12 +1640,14 @@
+ #  endif
+ 	{
++#  if defined CROSSCOMPILE
+ 	  char name[PATH_MAX];
+ 	  if (get_gcc(name)) {
+ 	      get_gcc_version (inFile,name);
+-#  if defined CROSSCOMPILE
+ 	      if (sys != emx)
+ 		  get_gcc_incdir(inFile,name);
+-#  endif
+ 	  }
++#  else
++	  get_gcc_version(inFile,NULL);
++#  endif
+ 	}
+ # endif
diff --git a/x11-misc/imake/files/imake-1.0.8-respect-LD.patch b/x11-misc/imake/files/imake-1.0.8-respect-LD.patch
new file mode 100644
index 000000000000..a53808625c95
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-respect-LD.patch
@@ -0,0 +1,15 @@
+Use LD env if available, other tests already do similar for CC.
+https://bugs.gentoo.org/729630
+--- a/imake.c
++++ b/imake.c
+@@ -1110,5 +1110,9 @@
+   signed char c;
+   int ldmajor, ldminor;
+-  const char *ld = "ld -v";
++  char ld[PATH_MAX];
++  const char *ldenv;
++  if (!(ldenv = getenv("LD")))
++    ldenv = "ld";
++  snprintf(ld, PATH_MAX, "%s -v", ldenv);
+ 
+ # ifdef CROSSCOMPILE
diff --git a/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch b/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch
new file mode 100644
index 000000000000..a27c1ac04ba0
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch
@@ -0,0 +1,15 @@
+Makefile calls imake again but with ignored CC/LD.
+Passing only if set rather than use defaults.
+--- a/xmkmf.cpp
++++ b/xmkmf.cpp
+@@ -56,7 +56,7 @@
+     echo "make Makefiles" &&
+-    make Makefiles &&
++    make ${CC:+CC="$CC"} ${LD:+LD="$LD"} Makefiles &&
+     echo "make includes" &&
+-    make includes &&
++    make ${CC:+CC="$CC"} ${LD:+LD="$LD"} includes &&
+     echo "make depend" &&
+-    make depend
++    make ${CC:+CC="$CC"} ${LD:+LD="$LD"} depend
+     ;;
diff --git a/x11-misc/imake/imake-1.0.8-r1.ebuild b/x11-misc/imake/imake-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..288d12c0a9cd
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.8-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xorg-3
+
+DESCRIPTION="C preprocessor interface to the make utility"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="x11-misc/xorg-cf-files"
+BDEPEND="x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cpp-args.patch
+	"${FILESDIR}"/${P}-no-get-gcc.patch
+	"${FILESDIR}"/${P}-respect-LD.patch
+	"${FILESDIR}"/${P}-xmkmf-pass-cc-ld.patch
+)
+
+src_configure() {
+	econf CPP="$(tc-getPROG CPP cpp)" #722046
+}
diff --git a/x11-misc/tdrop/Manifest b/x11-misc/tdrop/Manifest
index cdd596c316d8..de7426df1868 100644
--- a/x11-misc/tdrop/Manifest
+++ b/x11-misc/tdrop/Manifest
@@ -1 +1,2 @@
 DIST tdrop-0.3.0.tar.gz 19495 BLAKE2B 5f72090e6ccacaa4f708715cb1a2eb43bb8acec79f43301da67dbe0a8d81637806603d06b9ad0b2815e8aea1f481271f5b8f8adddba60079ad48ec621f8e8e8f SHA512 3e1c30e42ce96570fabd43b89fd9f17a23d74c4943ef9ab5d1edb4967ffa6c4c0259df4449ef2a18b396d1057f4a19a413fec817ff708d3e41906695cebb67ca
+DIST tdrop-0.4.0.tar.gz 21550 BLAKE2B 673ad98aa294410b4547fce842d191fd3c5512cca79361cae35fcb646afd328615daab1fa112bcba9e28cdea6bbeb2ca696bcc78d54c0302d32a91324a8a16d9 SHA512 679fed509e29752ebe3df378e68d9701c9edb53c9162854a8cb623f2da53499b933dad59fa6fc865ac44c67544cd6bcb779316ee4312e87c39559ade1ab313d8
diff --git a/x11-misc/tdrop/tdrop-0.4.0.ebuild b/x11-misc/tdrop/tdrop-0.4.0.ebuild
new file mode 100644
index 000000000000..695b437b87d3
--- /dev/null
+++ b/x11-misc/tdrop/tdrop-0.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WM-Independent Dropdown Creator"
+HOMEPAGE="https://github.com/noctuid/tdrop"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/noctuid/tdrop"
+else
+	SRC_URI="https://github.com/noctuid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash
+	sys-process/procps
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xwininfo
+	x11-misc/xdotool
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin tdrop
+	doman tdrop.1
+	dodoc README.org
+}
diff --git a/x11-misc/tdrop/tdrop-9999.ebuild b/x11-misc/tdrop/tdrop-9999.ebuild
index 1031384a291e..695b437b87d3 100644
--- a/x11-misc/tdrop/tdrop-9999.ebuild
+++ b/x11-misc/tdrop/tdrop-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
index 4c02869b428b..3fa95a9e0e9a 100644
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,10 +20,11 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-base/xorg-proto
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 PATCHES=(
 	# Patch from Debian to add -north and -south, among other fixes
@@ -45,7 +46,8 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
index bfd5bdfe3a6c..7ffba8cfdf6e 100644
--- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
@@ -19,11 +19,11 @@ KEYWORDS="amd64 ~arm ~arm64 ppc sparc x86"
 RDEPEND="
 	x11-libs/libXScrnSaver
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
@@ -37,7 +37,8 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index 75a3899848d4..df26d01cbd2c 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,15 +24,19 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
 )
 S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+}
+
 src_compile() {
-	xmkmf || die
 	emake \
 		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index b89bdea80b70..a6ccd1896657 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	x11-misc/gccmakedep
 	motif? ( >=x11-libs/motif-2.3:0 )"
 
@@ -35,9 +35,16 @@ src_prepare() {
 		-i XCalendar.sed || die
 }
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+}
+
 src_compile() {
-	xmkmf -a || die
-	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index 52016d87ae19..cbd3a60f818d 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	app-text/rman
 "
 
@@ -31,12 +31,14 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index 7ef03d5d699d..cda06f5cd4d6 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
@@ -18,17 +18,16 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 "
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
-	x11-misc/imake
+	x11-base/xorg-proto
+	>=x11-misc/imake-1.0.8-r1
 "
 S=${WORKDIR}/${PN}
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index bef2b91b62d2..cbac2508a679 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -23,11 +23,11 @@ RDEPEND="
 	x11-libs/libXt
 	x11-misc/xbitmaps
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-apps/sed-4
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
 DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
@@ -46,7 +46,8 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 	sed -i \
 		-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
 		Makefile || die
diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
new file mode 100644
index 000000000000..52e07f319544
--- /dev/null
+++ b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
@@ -0,0 +1,20 @@
+l argument was formerly ignored by binutils, but since 2.36 is used
+for something other than what was intended here (tmp files location).
+https://bugs.gentoo.org/782514
+--- a/Imake.tmpl
++++ b/Imake.tmpl
+@@ -1083,3 +1083,3 @@
+ #else
+-#define ArCmd ArCmdBase clq
++#define ArCmd ArCmdBase cq
+ #endif
+@@ -1090,3 +1090,3 @@
+ #else
+-#define ArAddCmd ArCmdBase rul
++#define ArAddCmd ArCmdBase ru
+ #endif
+@@ -1097,3 +1097,3 @@
+ #else
+-#define ArExtCmd ArCmdBase xl
++#define ArExtCmd ArCmdBase x
+ #endif
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
similarity index 98%
rename from x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
rename to x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
index b674d2cf2e0a..c44c96e2fa9e 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
@@ -21,6 +21,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-no-ar-l.patch
 	"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
 )
 
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
index e28502a5b0ca..dd43dcab6432 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
@@ -24,12 +24,12 @@ RDEPEND="
 	${COMMON_DEPEND}
 	media-fonts/font-misc-misc
 "
-DEPEND="
-	${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
 	app-text/rman
 	dev-lang/perl
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 DOCS=( AUTHORS Changelog README )
 PATCHES=( "${FILESDIR}"/${P}-root_name.patch )
@@ -46,21 +46,18 @@ src_prepare() {
 	sed -i \
 		-e '/^LOCALEDIR=/d' \
 		po/Makefile || die
+}
 
-	xmkmf || die
-
-	sed -i \
-		-e '/ CC = /d' \
-		-e '/ LD = /d' \
-		-e '/ CDEBUGFLAGS = /d' \
-		-e '/ CCOPTIONS = /d' \
-		-e 's|CPP = cpp|CPP = $(CC)|g' \
-		Makefile || die
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
-	tc-export CC
-	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-misc/xtitle/xtitle-1.0.4.ebuild b/x11-misc/xtitle/xtitle-1.0.4.ebuild
index c5e8c66d85a6..db79ece8e4ad 100644
--- a/x11-misc/xtitle/xtitle-1.0.4.ebuild
+++ b/x11-misc/xtitle/xtitle-1.0.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Set window title and icon name for an X11 terminal window"
 HOMEPAGE="https://kinzler.com/me/xtitle/"
 SRC_URI="https://kinzler.com/me/${PN}/${P}.tgz"
@@ -12,14 +14,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="x11-misc/imake"
+DEPEND=">=x11-misc/imake-1.0.8-r1"
 RDEPEND=""
 
 HTML_DOCS=( xtitle.html )
 
-src_compile() {
-	xmkmf || die
-	emake
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_install() {
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index 386962ee9765..379b2beb3faf 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,23 +16,21 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
-	x11-misc/imake"
+	x11-base/xorg-proto
+	>=x11-misc/imake-1.0.8-r1"
 
 src_configure() {
-	xmkmf || die
-	sed -i \
-		-e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \
-		Makefile || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		CCOPTIONS="${CFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/x11-misc/xtrlock/xtrlock-2.13.ebuild b/x11-misc/xtrlock/xtrlock-2.13.ebuild
index 48d686600b3c..75993d78c0cd 100644
--- a/x11-misc/xtrlock/xtrlock-2.13.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.13.ebuild
@@ -12,17 +12,19 @@ SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+}
+
 src_compile() {
-	xmkmf || die
 	emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \
 		EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock
 }
diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
index bd8c8243f121..f95535a71bf9 100644
--- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	svg? ( virtual/pkgconfig )
 "
 
@@ -48,7 +48,9 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" \
+		xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
 }
 
 src_compile() {
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 1e3c90638001..ec8fa4905e2b 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index 21b7b7b3f0d1..df7520120959 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="WMnet is a dock.app network monitor"
 HOMEPAGE="https://www.dockapps.net/wmnet"
 SRC_URI="https://www.dockapps.net/download/${P}.tar.gz
@@ -15,16 +17,24 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	app-text/rman"
 
 PATCHES=( "${WORKDIR}"/${P}-misc.patch )
 
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die "xmkmf failed"
+}
+
 src_compile() {
-	xmkmf || die "xmkmf failed."
-	emake CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}"
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 17279b07a578..602b4263d0c6 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index 8edbe912ce77..008593f28790 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -27,7 +27,7 @@ RDEPEND="app-text/rman
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-misc/gccmakedep
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
 PATCHES=(
@@ -45,7 +45,8 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
diff --git a/x11-terms/root-tail/root-tail-1.2-r4.ebuild b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
index 410af2e42979..ea4f261a0a94 100644
--- a/x11-terms/root-tail/root-tail-1.2-r4.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,10 +16,10 @@ IUSE="kde debug"
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libX11"
-DEPEND="x11-misc/imake
+DEPEND="${RDEPEND}"
+BDEPEND=">=x11-misc/imake-1.0.8-r1
 	app-text/rman
 	x11-base/xorg-proto
-	x11-libs/libX11
 	x11-misc/gccmakedep"
 
 src_prepare() {
@@ -28,15 +28,16 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf -a
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	sed -i 's:/usr/X11R6/bin:/usr/bin:' Makefile || die "sed Makefile failed"
 	use debug && append-flags -DDEBUG
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 7325a477795c..afc472df6f4f 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index e0e49d08476e..eca3b7514751 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,3 +1,3 @@
 DIST icewm-2.2.1.tar.lz 1697220 BLAKE2B a1c236c5aa3f2b958f3ad53c6d757abbce344da3c1c9c8f49bd4c986c68aef7421e799100dfabcb03e612d4c6a44af6a063080730b054e96ee054c85c21d5d1e SHA512 700122ace9a120300a06f17f334b76c12395154693583587527254903f53d12feb6e991754fc714960cc78b0d7809202879e43f2508f4d7ffa3fc7af84e628d6
-DIST icewm-2.3.0.tar.lz 1698169 BLAKE2B 76cde9084cc727ca3174ba839478a9981dac41ea45daf546ea70759ac56b20e80c858eea8a1472b2be750c34b852bf6e4495e88e6bc07b783777e5406e28acb4 SHA512 b744f0771b2ce364fb3d8c9c659cc1128a48aca34040eda9d86aec11dee4b012b8d36865f58f3c396c3302bab5f189505837085b9fc81fbfacfaa2d3cad6110d
 DIST icewm-2.3.1.tar.lz 1697840 BLAKE2B 8b51a9159e7b58989d7d63e8745e3cc8024211b81dc352bbd6753ba0b8cefbce7603ed11fe7874d91dc9ead37a19bca8e1541044d661f50098e9eb78a1c6739b SHA512 8194b375e6565f8d895a93e7315c9da0634c737a99ab91fe78ef50b298cef73c894688155635e79435f862fa30cfb988abe4b0374c22d65e4e496f2a8a0df6cb
+DIST icewm-2.3.2.tar.lz 1699944 BLAKE2B 4be59088ea1aaa4dce7a284efc766b082eb0a8f923a4a915de9d9d658a7eda4ccbaeb3c746918218058f062ba92ce29f715b8e9a42f6351e96cfb0df4261254f SHA512 1288f02aca7210051603a77f37126cda3750f8eeeef848ea3acf28ffbc82b1ea69b69a9b68df9750c58c067e5029093cb20f77c631521c568fb7f45a83dd320d
diff --git a/x11-wm/icewm/icewm-2.3.0.ebuild b/x11-wm/icewm/icewm-2.3.2.ebuild
similarity index 100%
rename from x11-wm/icewm/icewm-2.3.0.ebuild
rename to x11-wm/icewm/icewm-2.3.2.ebuild
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
index 532c9a439f77..6506e3b2921d 100644
--- a/x11-wm/larswm/larswm-7.5.3-r2.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,20 +17,22 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	x11-misc/gccmakedep
 	app-text/rman"
 
 src_configure() {
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index 563b885460e9..c42e35e0988d 100644
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 
 DOCS=( AUTHORS BUGS ChangeLog )
@@ -31,7 +31,11 @@ DOCS=( AUTHORS BUGS ChangeLog )
 src_prepare() {
 	default
 	sed -i -e "s#(SMLIB)#& -lICE#g" Imakefile || die #370127
-	xmkmf || die
+}
+
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-wm/mutter/mutter-3.38.4.ebuild b/x11-wm/mutter/mutter-3.38.4.ebuild
index 37c6c25aa950..745df2da3847 100644
--- a/x11-wm/mutter/mutter-3.38.4.ebuild
+++ b/x11-wm/mutter/mutter-3.38.4.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index e2c87e29d8c8..67ac8de4a833 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,12 +20,13 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm
 	rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
 	x11-base/xorg-proto
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-do-not-rm.patch
@@ -45,14 +46,14 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die "xmkmf failed"
-	emake depend
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf failed"
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 4d4a5b6234e4..a2bbd8128f29 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/exo/exo-4.16.2.ebuild b/xfce-base/exo/exo-4.16.2.ebuild
index 108ffa996c52..9e74f608f7a9 100644
--- a/xfce-base/exo/exo-4.16.2.ebuild
+++ b/xfce-base/exo/exo-4.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.50
 	>=x11-libs/gtk+-3.22:3